changeset 825:81ca8a76d055 beta

dirty fix for issue #87
author Marcin Kuzminski <marcin@python-works.com>
date Thu, 09 Dec 2010 22:20:18 +0100
parents ceb9f419b7fe
children 9205fa080554
files rhodecode/controllers/admin/admin.py rhodecode/model/scm.py
diffstat 2 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/controllers/admin/admin.py	Thu Dec 09 20:39:11 2010 +0100
+++ b/rhodecode/controllers/admin/admin.py	Thu Dec 09 22:20:18 2010 +0100
@@ -3,7 +3,8 @@
     package.rhodecode.controllers.admin.admin
     ~~~~~~~~~~~~~~
 
-    Controller for Admin pannel of Rhodecode
+    Controller for Admin panel of Rhodecode
+    
     :created_on: Apr 7, 2010
     :author: marcink
     :copyright: (C) 2009-2010 Marcin Kuzminski <marcin@python-works.com>    
--- a/rhodecode/model/scm.py	Thu Dec 09 20:39:11 2010 +0100
+++ b/rhodecode/model/scm.py	Thu Dec 09 22:20:18 2010 +0100
@@ -144,7 +144,13 @@
                 tmp_d['tip'] = tip.raw_id
                 tmp_d['tip_sort'] = tip.revision
                 tmp_d['rev'] = tip.revision
-                tmp_d['contact'] = repo.dbrepo.user.full_contact
+
+                #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_sort'] = tmp_d['contact']
                 tmp_d['repo_archives'] = list(repo._get_archives())
                 tmp_d['last_msg'] = tip.message