Mercurial > kallithea
changeset 829:9caca00de2b0 beta
fixes #87, stupid __dict__ call on sqlalchemy session followed by update() for this dict object rewrote an object to string.
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Fri, 10 Dec 2010 19:15:51 +0100 |
parents | f78f4b8052e2 |
children | e46d25e5921b |
files | rhodecode/controllers/admin/repos.py rhodecode/controllers/admin/settings.py rhodecode/controllers/admin/users.py rhodecode/controllers/settings.py |
diffstat | 4 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/controllers/admin/repos.py Fri Dec 10 15:25:42 2010 +0100 +++ b/rhodecode/controllers/admin/repos.py Fri Dec 10 19:15:51 2010 +0100 @@ -266,12 +266,14 @@ # url('edit_repo', repo_name=ID) repo_model = RepoModel() c.repo_info = repo_model.get_by_repo_name(repo_name) + r = ScmModel().get(repo_name) + if c.repo_info.stats: last_rev = c.repo_info.stats.stat_on_revision else: last_rev = 0 c.stats_revision = last_rev - r = ScmModel().get(repo_name) + c.repo_last_rev = r.revisions[-1] if r.revisions else 0 if last_rev == 0: @@ -280,7 +282,6 @@ c.stats_percentage = '%.2f' % ((float((last_rev)) / c.repo_last_rev) * 100) - if not c.repo_info: h.flash(_('%s repository is not mapped to db perhaps' ' it was created or renamed from the filesystem' @@ -290,7 +291,7 @@ return redirect(url('repos')) - defaults = c.repo_info.__dict__ + defaults = c.repo_info.__dict__.copy() if c.repo_info.user: defaults.update({'user':c.repo_info.user.username}) else:
--- a/rhodecode/controllers/admin/settings.py Fri Dec 10 15:25:42 2010 +0100 +++ b/rhodecode/controllers/admin/settings.py Fri Dec 10 19:15:51 2010 +0100 @@ -258,7 +258,7 @@ " crucial for entire application"), category='warning') return redirect(url('users')) - defaults = c.user.__dict__ + defaults = c.user.__dict__.copy() return htmlfill.render( render('admin/users/user_edit_my_account.html'), defaults=defaults,
--- a/rhodecode/controllers/admin/users.py Fri Dec 10 15:25:42 2010 +0100 +++ b/rhodecode/controllers/admin/users.py Fri Dec 10 19:15:51 2010 +0100 @@ -158,7 +158,7 @@ h.flash(_("You can't edit this user"), category='warning') return redirect(url('users')) - defaults = c.user.__dict__ + defaults = c.user.__dict__.copy() return htmlfill.render( render('admin/users/user_edit.html'), defaults=defaults,
--- a/rhodecode/controllers/settings.py Fri Dec 10 15:25:42 2010 +0100 +++ b/rhodecode/controllers/settings.py Fri Dec 10 19:15:51 2010 +0100 @@ -56,7 +56,7 @@ category='error') return redirect(url('home')) - defaults = c.repo_info.__dict__ + defaults = c.repo_info.__dict__.copy() defaults.update({'user':c.repo_info.user.username}) c.users_array = repo_model.get_users_js()