Mercurial > kallithea
changeset 6561:7d86b9876ac9
auth: refactor auth plugin importing - rename enabled_plugin to enabled_plugin_names
Patch modified by Mads Kiilerich.
| author | domruf <dominikruf@gmail.com> |
|---|---|
| date | Sun, 02 Apr 2017 13:38:08 +0200 |
| parents | b5a0ae670b8a |
| children | f58ed40c9a72 |
| files | kallithea/controllers/admin/auth_settings.py kallithea/templates/admin/auth/auth_settings.html |
| diffstat | 2 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/admin/auth_settings.py Sat Mar 18 20:21:18 2017 +0100 +++ b/kallithea/controllers/admin/auth_settings.py Sun Apr 02 13:38:08 2017 +0200 @@ -59,20 +59,20 @@ 'kallithea.lib.auth_modules.auth_crowd', 'kallithea.lib.auth_modules.auth_pam' ] - c.enabled_plugins = Setting.get_auth_plugins() + c.enabled_plugin_names = Setting.get_auth_plugins() def __render(self, defaults, errors): c.defaults = {} c.plugin_settings = {} c.plugin_shortnames = {} - for module in c.enabled_plugins: + for module in c.enabled_plugin_names: plugin = auth_modules.loadplugin(module) plugin_name = plugin.name 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"]) + fullname = "auth_%s_%s" % (plugin_name, v["name"]) if "default" in v: c.defaults[fullname] = v["default"] # Current values will be the default on the form, if there are any @@ -80,7 +80,7 @@ if setting is not None: c.defaults[fullname] = setting.app_settings_value # we want to show , separated list of enabled plugins - c.defaults['auth_plugins'] = ','.join(c.enabled_plugins) + c.defaults['auth_plugins'] = ','.join(c.enabled_plugin_names) if defaults: c.defaults.update(defaults) @@ -118,10 +118,10 @@ # (yet), since that'll cause validation errors and/or wrong # settings being applied (e.g. checkboxes being cleared), # since the plugin settings will not be in the POST data. - c.enabled_plugins = [ p for p in c.enabled_plugins if p in new_enabled_plugins ] + c.enabled_plugin_names = [p for p in c.enabled_plugin_names if p in new_enabled_plugins] # Next, parse everything including plugin settings. - _form = AuthSettingsForm(c.enabled_plugins)() + _form = AuthSettingsForm(c.enabled_plugin_names)() try: form_result = _form.to_python(dict(request.POST))
--- a/kallithea/templates/admin/auth/auth_settings.html Sat Mar 18 20:21:18 2017 +0100 +++ b/kallithea/templates/admin/auth/auth_settings.html Sun Apr 02 13:38:08 2017 +0200 @@ -39,8 +39,8 @@ <ul class="list-group"> %for plugin_path in c.available_plugins: <li class="list-group-item"> - <span data-plugin_id="${plugin_path}" class="toggle-plugin btn btn-default btn-xs ${'active' if plugin_path in c.enabled_plugins else ''}"> - ${_('Enabled') if plugin_path in c.enabled_plugins else _('Disabled')} + <span data-plugin_id="${plugin_path}" class="toggle-plugin btn btn-default btn-xs ${'active' if plugin_path in c.enabled_plugin_names else ''}"> + ${_('Enabled') if plugin_path in c.enabled_plugin_names else _('Disabled')} </span> ${plugin_path} </li> @@ -50,7 +50,7 @@ </div> </div> - %for cnt, module in enumerate(c.enabled_plugins): + %for cnt, module in enumerate(c.enabled_plugin_names): <% pluginName = c.plugin_shortnames[module] %> <h1>${_('Plugin')}: ${pluginName}</h1> <div class="form-horizontal">