Changeset - 7d86b9876ac9
Parent rev.
Child rev.
[Not reviewed]
default
0 2 0
domruf - 9 years ago 2017-04-02 13:38:08
dominikruf@gmail.com
auth: refactor auth plugin importing - rename enabled_plugin to enabled_plugin_names

Patch modified by Mads Kiilerich.
2 files changed with 9 insertions and 9 deletions:
kallithea/controllers/admin/auth_settings.py
6
6
kallithea/templates/admin/auth/auth_settings.html
3
3
0 comments (0 inline, 0 general)
kallithea/controllers/admin/auth_settings.py
➞
Show inline comments
 
@@ -56,34 +56,34 @@ class AuthSettingsController(BaseControl
 
            '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()
 
        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

			




	
	
	
		
 
                setting = Setting.get_by_name(fullname)

			




	
	
	
		
 
                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)

			




	
	
	
		
 

			




	
	
	
		
 
        log.debug(formatted_json(defaults))

			




	
	
	
		
 
        return formencode.htmlfill.render(

			




	
	
		
 
@@ -115,16 +115,16 @@ class AuthSettingsController(BaseControl

			




	
	
	
		
 
        else:

			




	
	
	
		
 
            # Hide plugins that the user has asked to be disabled, but

			




	
	
	
		
 
            # do not show plugins that the user has asked to be enabled

			




	
	
	
		
 
            # (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))

			




	
	
	
		
 
            for k, v in form_result.items():

			




	
	
	
		
 
                if k == 'auth_plugins':

			




	
	
	
		
 
                    # we want to store it comma separated inside our settings

			




        

    


    
    

    

        

                

                    kallithea/templates/admin/auth/auth_settings.html
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
		
 
@@ -36,24 +36,24 @@

			




	
	
	
		
 
        <div class="form-group">

			




	
	
	
		
 
            <label>${_('Available built-in plugins')}</label>

			




	
	
	
		
 
            <div>

			




	
	
	
		
 
                <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>

			




	
	
	
		
 
                %endfor

			




	
	
	
		
 
                </ul>

			




	
	
	
		
 
            </div>

			




	
	
	
		
 
        </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">

			




	
	
	
		
 
        ## autoform generation, based on plugin definition from it's settings

			




	
	
	
		
 
        %for setting in c.plugin_settings[module]:

			




	
	
	
		
 
            <% fullsetting = "auth_%s_%s" % (pluginName, setting["name"]) %>

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







  


    




    








    
        
    
    
        This site is powered by
            Kallithea 0.7.0,
        which is
        © 2010–2025 by various authors & licensed under GPLv3.