# HG changeset patch
# User Marcin Kuzminski <marcin@python-works.com>
# Date 1277754126 -7200
# Node ID 3a66e7421a990cd2fc2be9bba5c521f41ac62297
# Parent  779dabcaae2858e66aea726ad16c7fa866abcfe1
db model fix, added repo instance to cached repos list

diff -r 779dabcaae28 -r 3a66e7421a99 pylons_app/model/db.py
--- a/pylons_app/model/db.py	Mon Jun 28 21:39:48 2010 +0200
+++ b/pylons_app/model/db.py	Mon Jun 28 21:42:06 2010 +0200
@@ -10,7 +10,7 @@
     username = Column("username", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     password = Column("password", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     active = Column("active", BOOLEAN(), nullable=True, unique=None, default=None)
-    admin = Column("admin", BOOLEAN(), nullable=True, unique=None, default=None)
+    admin = Column("admin", BOOLEAN(), nullable=True, unique=None, default=False)
     name = Column("name", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     lastname = Column("lastname", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     email = Column("email", TEXT(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
diff -r 779dabcaae28 -r 3a66e7421a99 pylons_app/model/hg_model.py
--- a/pylons_app/model/hg_model.py	Mon Jun 28 21:39:48 2010 +0200
+++ b/pylons_app/model/hg_model.py	Mon Jun 28 21:42:06 2010 +0200
@@ -2,6 +2,7 @@
 # encoding: utf-8
 # Model for hg app
 # Copyright (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>
+from sqlalchemy.orm import joinedload
  
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -116,6 +117,7 @@
                     repos_list[name].name = name
                     dbrepo = sa.query(Repository).get(name)
                     if dbrepo:
+                        repos_list[name].dbrepo = dbrepo
                         repos_list[name].description = dbrepo.description
                         repos_list[name].contact = dbrepo.user.full_contact
             except OSError:
@@ -149,7 +151,7 @@
             tmp_d['contact_sort'] = tmp_d['contact']
             tmp_d['repo_archives'] = list(repo._get_archives())
             tmp_d['last_msg'] = tip.message
-            
+            tmp_d['repo'] = repo
             yield tmp_d
 
     def get_repo(self, repo_name):