# HG changeset patch
# User Søren Løvborg <kwi@kwi.dk>
# Date 2015-07-14 13:59:59
# Node ID 04798ed1e1a7632ed5e34d3aeff7ef03f2ef9602
# Parent  a45113998d07aad2eb2f483c02111cbb257ba1e8

AuthSettingsController: rename dictionary key for consistency

Rename 'auth_plugins_shortnames' to 'plugin_shortnames' for consistency
with 'plugin_settings', and to emphasize that it's not one of the values
retrieved from the database using get_auth_settings (all of which start
with 'auth_').

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
@@ -67,13 +67,13 @@ class AuthSettingsController(BaseControl
         formglobals = {}
         formglobals.update(Setting.get_auth_settings())
         formglobals["plugin_settings"] = {}
-        formglobals["auth_plugins_shortnames"] = {}
+        formglobals["plugin_shortnames"] = {}
         _defaults["auth_plugins"] = formglobals["auth_plugins"]
 
         for module in formglobals["auth_plugins"]:
             plugin = auth_modules.loadplugin(module)
             plugin_name = plugin.name
-            formglobals["auth_plugins_shortnames"][module] = plugin_name
+            formglobals["plugin_shortnames"][module] = plugin_name
             formglobals["plugin_settings"][module] = plugin.plugin_settings()
             for v in formglobals["plugin_settings"][module]:
                 fullname = ("auth_" + plugin_name + "_" + v["name"])
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
@@ -47,7 +47,7 @@
     </div>
 
     %for cnt, module in enumerate(c.auth_plugins):
-        <% pluginName = c.auth_plugins_shortnames[module] %>
+        <% pluginName = c.plugin_shortnames[module] %>
         <h1>${_('Plugin')}: ${pluginName}</h1>
         <div class="fields">
         ## autoform generation, based on plugin definition from it's settings