Mercurial > kallithea

changeset 1067:717ccea6df18 beta

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed some very strange issue with htmlfill import - don't know why but this needs to be imported as separate module
author Marcin Kuzminski <marcin@python-works.com>
date Sat, 19 Feb 2011 07:39:01 +0100
parents fd9cc2a32955
children 41a5fcf3ab65
files rhodecode/controllers/admin/settings.py rhodecode/controllers/settings.py
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/rhodecode/controllers/admin/settings.py	Sat Feb 19 01:16:44 2011 +0100
+++ b/rhodecode/controllers/admin/settings.py	Sat Feb 19 07:39:01 2011 +0100
@@ -48,7 +48,6 @@
 from rhodecode.model.scm import ScmModel
 from rhodecode.model.settings import SettingsModel
 from rhodecode.model.user import UserModel
-from rhodecode.model.repo import RepoModel
 
 log = logging.getLogger(__name__)
 
--- a/rhodecode/controllers/settings.py	Sat Feb 19 01:16:44 2011 +0100
+++ b/rhodecode/controllers/settings.py	Sat Feb 19 07:39:01 2011 +0100
@@ -27,8 +27,9 @@
 
 import logging
 import traceback
+import formencode
 
-import formencode
+from formencode import htmlfill
 
 from pylons import tmpl_context as c, request, url
 from pylons.controllers.util import redirect
@@ -89,7 +90,7 @@
             defaults.update({'g_perm_%s' % p.users_group.users_group_name:
                              p.permission.permission_name})
 
-        return formencode.htmlfill.render(
+        return htmlfill.render(
             render('settings/repo_settings.html'),
             defaults=defaults,
             encoding="UTF-8",
@@ -114,7 +115,7 @@
             c.repo_info = repo_model.get_by_repo_name(repo_name)
             c.users_array = repo_model.get_users_js()
             errors.value.update({'user':c.repo_info.user.username})
-            return formencode.htmlfill.render(
+            return htmlfill.render(
                 render('settings/repo_settings.html'),
                 defaults=errors.value,
                 errors=errors.error_dict or {},
@@ -199,7 +200,7 @@
             c.new_repo = errors.value['fork_name']
             r = render('settings/repo_fork.html')
 
-            return formencode.htmlfill.render(
+            return htmlfill.render(
                 r,
                 defaults=errors.value,
                 errors=errors.error_dict or {},