kallithea Changeset - 79edea9d56dc

Changeset - 79edea9d56dc

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Søren Løvborg - 10 years ago 2015-07-14 13:59:59
kwi@kwi.dk

AuthSettingsController: remove formglobals variable

Since the formglobals variable is used only to populate the template
context, just assign values directly to `c` instead. This does involve
dropping the (very large) debug log entry listing all the formglobals.

1 file changed with 11 insertions and 15 deletions:

kallithea/controllers/admin/auth_settings.py

0 comments (0 inline, 0 general)

kallithea/controllers/admin/auth_settings.py

➞

Show inline comments

@@ @@ -14,25 +14,24 @@ @@
 """
 kallithea.controllers.admin.auth_settings
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 pluggable authentication controller for Kallithea
 This file was forked by the Kallithea project in July 2014.
 Original author and date, and relevant copyright and licensing information is below:
 :created_on: Nov 26, 2010
 :author: akesterson
 """
 import pprint
 import logging
 import formencode.htmlfill
 import traceback
 from pylons import request, tmpl_context as c, url
 from pylons.controllers.util import redirect
 from pylons.i18n.translation import _
 from kallithea.lib import helpers as h
 from kallithea.lib.compat import formatted_json
 from kallithea.lib.base import BaseController, render
 from kallithea.lib.auth import LoginRequired, HasPermissionAllDecorator
@@ @@ -55,54 +54,51 @@ class AuthSettingsController(BaseControl @@
         c.available_plugins = [
             'kallithea.lib.auth_modules.auth_internal',
             'kallithea.lib.auth_modules.auth_container',
             'kallithea.lib.auth_modules.auth_ldap',
             'kallithea.lib.auth_modules.auth_crowd',
             'kallithea.lib.auth_modules.auth_pam'
+        ]
         c.enabled_plugins = Setting.get_auth_plugins()
     def index(self, defaults=None, errors=None, prefix_error=False):
         self.__load_defaults()
         _defaults = {}
         formglobals = {}
         formglobals.update(Setting.get_auth_settings())
         formglobals["plugin_settings"] = {}
         formglobals["plugin_shortnames"] = {}
         _defaults["auth_plugins"] = formglobals["auth_plugins"]
         # Import all auth settings into the template context.
         for k, v in Setting.get_auth_settings().iteritems():
             setattr(c, k, v)
         c.plugin_settings = {}
         c.plugin_shortnames = {}
         _defaults["auth_plugins"] = c.auth_plugins
-        for module in formglobals["auth_plugins"]:
+        for module in c.auth_plugins:
             plugin = auth_modules.loadplugin(module)
             plugin_name = plugin.name
             formglobals["plugin_shortnames"][module] = plugin_name
             formglobals["plugin_settings"][module] = plugin.plugin_settings()
             for v in formglobals["plugin_settings"][module]:
             c.plugin_shortnames[module] = plugin_name
             c.plugin_settings[module] = plugin.plugin_settings()
             for v in c.plugin_settings[module]:
                 fullname = ("auth_" + plugin_name + "_" + v["name"])
                 if "default" in v:
                     _defaults[fullname] = v["default"]
                 # Current values will be the default on the form, if there are any
                 setting = Setting.get_by_name(fullname)
                 if setting:
                     _defaults[fullname] = setting.app_settings_value
         # we want to show , separated list of enabled plugins
         _defaults['auth_plugins'] = ','.join(_defaults['auth_plugins'])
         if defaults:
             _defaults.update(defaults)
         formglobals["defaults"] = _defaults
         # set template context variables
         for k, v in formglobals.iteritems():
             setattr(c, k, v)
         c.defaults = _defaults
         log.debug(pprint.pformat(formglobals, indent=4))
         log.debug(formatted_json(defaults))
         return formencode.htmlfill.render(
             render('admin/auth/auth_settings.html'),
             defaults=_defaults,
             errors=errors,
             prefix_error=prefix_error,
             encoding="UTF-8",
             force_defaults=False)
     def auth_settings(self):
         """POST create and store auth settings"""
         self.__load_defaults()

0 comments (0 inline, 0 general)