kallithea Changeset - e46d25e5921b

Changeset - e46d25e5921b

Parent rev.

Child rev.

[Not reviewed]

Merge beta

0 5 0

Marcin Kuzminski - 15 years ago 2010-12-10 19:46:50
marcin@python-works.com

merge

5 files changed with 8 insertions and 13 deletions:

rhodecode/controllers/admin/repos.py

rhodecode/controllers/admin/settings.py

rhodecode/controllers/admin/users.py

rhodecode/controllers/settings.py

rhodecode/model/scm.py

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()

rhodecode/model/scm.py

➞

Show inline comments

@@ @@ -144,13 +144,7 @@ class ScmModel(BaseModel): @@
                 tmp_d['tip'] = tip.raw_id
                 tmp_d['tip_sort'] = tip.revision
                 tmp_d['rev'] = tip.revision
                 #dirty hack for some problems
                 usr = repo.dbrepo.user
                 if isinstance(usr, basestring):
                     usr = UserModel(self.sa).get_by_username(repo.dbrepo.user)
                 tmp_d['contact'] = usr.full_contact
                 tmp_d['contact'] = repo.dbrepo.user.full_contact
                 tmp_d['contact_sort'] = tmp_d['contact']
                 tmp_d['repo_archives'] = list(repo._get_archives())
                 tmp_d['last_msg'] = tip.message

0 comments (0 inline, 0 general)