kallithea Changeset - 3a66e7421a99

Changeset - 3a66e7421a99

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Marcin Kuzminski - 15 years ago 2010-06-28 21:42:06
marcin@python-works.com

db model fix, added repo instance to cached repos list

2 files changed with 4 insertions and 2 deletions:

pylons_app/model/db.py

pylons_app/model/hg_model.py

0 comments (0 inline, 0 general)

pylons_app/model/db.py

➞

Show inline comments

@@ @@ -10,7 +10,7 @@ class User(Base): @@
     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)

pylons_app/model/hg_model.py

➞

Show inline comments

@@ @@ -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 @@ class HgModel(object): @@
                     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 @@ class HgModel(object): @@
             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):

0 comments (0 inline, 0 general)