diff --git a/kallithea/controllers/admin/auth_settings.py b/kallithea/controllers/admin/auth_settings.py --- a/kallithea/controllers/admin/auth_settings.py +++ b/kallithea/controllers/admin/auth_settings.py @@ -63,15 +63,11 @@ class AuthSettingsController(BaseControl def index(self, defaults=None, errors=None, prefix_error=False): self.__load_defaults() - # Import all auth settings into the template context. - for k, v in Setting.get_auth_settings().iteritems(): - setattr(c, k, v) - c.defaults = {} c.plugin_settings = {} c.plugin_shortnames = {} - for module in c.auth_plugins: + for module in c.enabled_plugins: plugin = auth_modules.loadplugin(module) plugin_name = plugin.name c.plugin_shortnames[module] = plugin_name @@ -85,7 +81,7 @@ class AuthSettingsController(BaseControl if setting: c.defaults[fullname] = setting.app_settings_value # we want to show , separated list of enabled plugins - c.defaults['auth_plugins'] = ','.join(c.auth_plugins) + c.defaults['auth_plugins'] = ','.join(c.enabled_plugins) if defaults: c.defaults.update(defaults) diff --git a/kallithea/templates/admin/auth/auth_settings.html b/kallithea/templates/admin/auth/auth_settings.html --- a/kallithea/templates/admin/auth/auth_settings.html +++ b/kallithea/templates/admin/auth/auth_settings.html @@ -46,7 +46,7 @@ - %for cnt, module in enumerate(c.auth_plugins): + %for cnt, module in enumerate(c.enabled_plugins): <% pluginName = c.plugin_shortnames[module] %>