Changeset - 9caca00de2b0
[Not reviewed]
beta
0 4 0
Marcin Kuzminski - 15 years ago 2010-12-10 19:15:51
marcin@python-works.com
fixes #87, stupid __dict__ call on sqlalchemy session followed by update() for this dict object rewrote an object to string.
4 files changed with 7 insertions and 6 deletions:
0 comments (0 inline, 0 general)
rhodecode/controllers/admin/repos.py
Show inline comments
 
@@ -266,12 +266,14 @@ class ReposController(BaseController):
 
        # 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 @@ class ReposController(BaseController):
 
            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 @@ class ReposController(BaseController):
 

	
 
            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:
rhodecode/controllers/admin/settings.py
Show inline comments
 
@@ -258,7 +258,7 @@ class SettingsController(BaseController)
 
              " 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,
rhodecode/controllers/admin/users.py
Show inline comments
 
@@ -158,7 +158,7 @@ class UsersController(BaseController):
 
            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,
rhodecode/controllers/settings.py
Show inline comments
 
@@ -56,7 +56,7 @@ class SettingsController(BaseController)
 
                      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()
 

	
0 comments (0 inline, 0 general)