##// END OF EJS Templates
fixed problem with caching
marcink -
r1033:e2ebbb27 beta
parent child Browse files
Show More
@@ -282,10 +282,9 b' class ReposController(BaseController):'
282 """GET /repos/repo_name/edit: Form to edit an existing item"""
282 """GET /repos/repo_name/edit: Form to edit an existing item"""
283 # url('edit_repo', repo_name=ID)
283 # url('edit_repo', repo_name=ID)
284 repo_model = RepoModel()
284 repo_model = RepoModel()
285 r = ScmModel().get(repo_name)
285 c.repo_info = repo_model.get_by_repo_name(repo_name)
286 c.repo_info = repo_model.get_by_repo_name(repo_name)
286
287
287 r = ScmModel().get(repo_name)
288
289 if c.repo_info is None:
288 if c.repo_info is None:
290 h.flash(_('%s repository is not mapped to db perhaps'
289 h.flash(_('%s repository is not mapped to db perhaps'
291 ' it was created or renamed from the filesystem'
290 ' it was created or renamed from the filesystem'
@@ -201,7 +201,7 b' class Repository(Base, BaseModel):'
201 user = relationship('User')
201 user = relationship('User')
202 fork = relationship('Repository', remote_side=repo_id)
202 fork = relationship('Repository', remote_side=repo_id)
203 group = relationship('Group')
203 group = relationship('Group')
204 repo_to_perm = relationship('RepoToPerm', cascade='all')
204 repo_to_perm = relationship('RepoToPerm', cascade='all', order_by='RepoToPerm.repo_to_perm_id')
205 users_group_to_perm = relationship('UsersGroupToPerm', cascade='all')
205 users_group_to_perm = relationship('UsersGroupToPerm', cascade='all')
206 stats = relationship('Statistics', cascade='all', uselist=False)
206 stats = relationship('Statistics', cascade='all', uselist=False)
207
207
@@ -209,11 +209,21 b' class ScmModel(BaseModel):'
209 .filter(Repository.repo_name == repo_name)\
209 .filter(Repository.repo_name == repo_name)\
210 .scalar()
210 .scalar()
211
211
212 self.sa.expunge_all()
213 log.debug('making transient %s', dbrepo)
212 make_transient(dbrepo)
214 make_transient(dbrepo)
213 if dbrepo.user:
215
214 make_transient(dbrepo.user)
216 for attr in ['user', 'forks', 'followers', 'group', 'repo_to_perm',
215 if dbrepo.fork:
217 'users_group_to_perm', 'stats', 'logs']:
216 make_transient(dbrepo.fork)
218 attr = getattr(dbrepo, attr, False)
219 if attr:
220 if isinstance(attr, list):
221 for a in attr:
222 log.debug('making transient %s', a)
223 make_transient(a)
224 else:
225 log.debug('making transient %s', attr)
226 make_transient(attr)
217
227
218 repo.dbrepo = dbrepo
228 repo.dbrepo = dbrepo
219 return repo
229 return repo
General Comments 0
You need to be logged in to leave comments. Login now