kallithea Changeset - e2ebbb27df4e

Changeset - e2ebbb27df4e

Parent rev.

Child rev.

[Not reviewed]

beta

0 3 0

Marcin Kuzminski - 15 years ago 2011-02-12 16:06:12
marcin@python-works.com

fixed problem with caching

3 files changed with 16 insertions and 7 deletions:

rhodecode/controllers/admin/repos.py

rhodecode/model/db.py

rhodecode/model/scm.py

0 comments (0 inline, 0 general)

rhodecode/controllers/admin/repos.py

➞

Show inline comments

@@ @@ -273,28 +273,27 @@ class ReposController(BaseController): @@
         return redirect(url('edit_repo', repo_name=repo_name))
     @HasPermissionAllDecorator('hg.admin')
     def show(self, repo_name, format='html'):
         """GET /repos/repo_name: Show a specific item"""
         # url('repo', repo_name=ID)
     @HasPermissionAllDecorator('hg.admin')
     def edit(self, repo_name, format='html'):
         """GET /repos/repo_name/edit: Form to edit an existing item"""
         # url('edit_repo', repo_name=ID)
         repo_model = RepoModel()
         r = ScmModel().get(repo_name)
         c.repo_info = repo_model.get_by_repo_name(repo_name)
         r = ScmModel().get(repo_name)
         if c.repo_info is None:
             h.flash(_('%s repository is not mapped to db perhaps'
                       ' it was created or renamed from the filesystem'
                       ' please run the application again'
                       ' in order to rescan repositories') % repo_name,
                       category='error')
             return redirect(url('repos'))
         if c.repo_info.stats:
             last_rev = c.repo_info.stats.stat_on_revision
         else:

rhodecode/model/db.py

➞

Show inline comments

@@ @@ -192,25 +192,25 @@ class Repository(Base, BaseModel): @@
     repo_type = Column("repo_type", String(length=None, convert_unicode=False, assert_unicode=None), nullable=False, unique=False, default='hg')
     user_id = Column("user_id", Integer(), ForeignKey('users.user_id'), nullable=False, unique=False, default=None)
     private = Column("private", Boolean(), nullable=True, unique=None, default=None)
     enable_statistics = Column("statistics", Boolean(), nullable=True, unique=None, default=True)
     enable_downloads = Column("downloads", Boolean(), nullable=True, unique=None, default=True)
     description = Column("description", String(length=None, convert_unicode=False, assert_unicode=None), nullable=True, unique=None, default=None)
     fork_id = Column("fork_id", Integer(), ForeignKey('repositories.repo_id'), nullable=True, unique=False, default=None)
     group_id = Column("group_id", Integer(), ForeignKey('groups.group_id'), nullable=True, unique=False, default=None)
     user = relationship('User')
     fork = relationship('Repository', remote_side=repo_id)
     group = relationship('Group')
     repo_to_perm = relationship('RepoToPerm', cascade='all')
+    repo_to_perm = relationship('RepoToPerm', cascade='all', order_by='RepoToPerm.repo_to_perm_id')
     users_group_to_perm = relationship('UsersGroupToPerm', cascade='all')
     stats = relationship('Statistics', cascade='all', uselist=False)
     repo_followers = relationship('UserFollowing', primaryjoin='UserFollowing.follows_repo_id==Repository.repo_id', cascade='all')
     logs = relationship('UserLog', cascade='all')
     def __repr__(self):
         return "<%s('%s:%s')>" % (self.__class__.__name__,
                                   self.repo_id, self.repo_name)
 class Group(Base, BaseModel):

rhodecode/model/scm.py

➞

Show inline comments

@@ @@ -200,29 +200,39 @@ class ScmModel(BaseModel): @@
                 #skip hidden web repository
                 if repo._get_hidden():
                     return
             else:
                 repo = backend(repo_path, create=False)
             dbrepo = self.sa.query(Repository)\
                 .options(joinedload(Repository.fork))\
                 .options(joinedload(Repository.user))\
                 .filter(Repository.repo_name == repo_name)\
                 .scalar()
             self.sa.expunge_all()
             log.debug('making transient %s', dbrepo)
             make_transient(dbrepo)
             if dbrepo.user:
                 make_transient(dbrepo.user)
             if dbrepo.fork:
                 make_transient(dbrepo.fork)
             for attr in ['user', 'forks', 'followers', 'group', 'repo_to_perm',
                          'users_group_to_perm', 'stats', 'logs']:
                 attr = getattr(dbrepo, attr, False)
                 if attr:
                     if isinstance(attr, list):
                         for a in attr:
                             log.debug('making transient %s', a)
                             make_transient(a)
                     else:
                         log.debug('making transient %s', attr)
                         make_transient(attr)
             repo.dbrepo = dbrepo
             return repo
         pre_invalidate = True
         if invalidation_list is not None:
             pre_invalidate = repo_name in invalidation_list
         if pre_invalidate:
             invalidate = self._should_invalidate(repo_name)
             if invalidate:

0 comments (0 inline, 0 general)