kallithea Changeset - 717ccea6df18

Changeset - 717ccea6df18

Parent rev.

Child rev.

[Not reviewed]

beta

0 2 0

Marcin Kuzminski - 15 years ago 2011-02-19 07:39:01
marcin@python-works.com

fixed some very strange issue with htmlfill import - don't know why but this needs to be imported as separate module

2 files changed with 5 insertions and 5 deletions:

rhodecode/controllers/admin/settings.py

rhodecode/controllers/settings.py

0 comments (0 inline, 0 general)

rhodecode/controllers/admin/settings.py

➞

Show inline comments

@@ @@ -48,7 +48,6 @@ from rhodecode.model.forms import UserFo @@
 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__)

rhodecode/controllers/settings.py

➞

Show inline comments

@@ @@ -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 @@ class SettingsController(BaseRepoControl @@
             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 @@ class SettingsController(BaseRepoControl @@
             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 @@ class SettingsController(BaseRepoControl @@
             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 {},

0 comments (0 inline, 0 general)