class LoginPluginsOrder(Page):
def __init__(self, site, parent):
- super(LoginPluginsOrder, self).__init__(site)
+ super(LoginPluginsOrder, self).__init__(site, form=True)
self.url = '%s/order' % parent.url
self.menu = [parent]
@admin_protect
def GET(self, *args, **kwargs):
+ opts = [p.name for p in self._site[FACILITY]['enabled']]
return self._template('admin/login_order.html',
title='login plugins order',
name='admin_login_order_form',
menu=self.menu, action=self.url,
- options=self._site[FACILITY]['enabled'])
+ options=opts)
@admin_protect
def POST(self, *args, **kwargs):
message = "Nothing was modified."
message_type = "info"
- valid = self._site[FACILITY]['enabled']
+ plugins_by_name = {p.name: p for p in self._site[FACILITY]['enabled']}
if 'order' in kwargs:
order = kwargs['order'].split(',')
if len(order) != 0:
- new_values = []
+ new_names = []
+ new_plugins = []
try:
for v in order:
val = v.strip()
- if val not in valid:
+ if val not in plugins_by_name:
error = "Invalid plugin name: %s" % val
raise ValueError(error)
- new_values.append(val)
- if len(new_values) < len(valid):
- for val in valid:
- if val not in new_values:
- new_values.append(val)
+ new_names.append(val)
+ new_plugins.append(plugins_by_name[val])
+ if len(new_names) < len(plugins_by_name):
+ for val in plugins_by_name:
+ if val not in new_names:
+ new_names.append(val)
+ new_plugins.append(plugins_by_name[val])
po = PluginObject()
po.name = "global"
globalconf = dict()
- globalconf['order'] = ','.join(new_values)
+ globalconf['order'] = ','.join(new_names)
po.set_config(globalconf)
po.save_plugin_config(FACILITY)
- # When all is saved update also live config
- self._site[FACILITY]['enabled'] = new_values
+ # When all is saved update also live config. The
+ # live config is a list of the actual plugin
+ # objects.
+ self._site[FACILITY]['enabled'] = new_plugins
message = "New configuration saved."
message_type = "success"
message = "Failed to save data!"
message_type = "error"
+ opts = [p.name for p in self._site[FACILITY]['enabled']]
return self._template('admin/login_order.html',
message=message,
message_type=message_type,
title='login plugins order',
name='admin_login_order_form',
menu=self.menu, action=self.url,
- options=self._site[FACILITY]['enabled'])
-
- def root(self, *args, **kwargs):
- cherrypy.log.error("method: %s" % cherrypy.request.method)
- op = getattr(self, cherrypy.request.method, self.GET)
- if callable(op):
- return op(*args, **kwargs)
+ options=opts)
class LoginPlugins(Page):
self.order = LoginPluginsOrder(self._site, self)
- def root(self, *args, **kwargs):
+ def root_with_msg(self, message=None, message_type=None):
login_plugins = self._site[FACILITY]
+ ordered = []
+ for p in login_plugins['enabled']:
+ ordered.append(p.name)
return self._template('admin/login.html', title=self.title,
+ message=message,
+ message_type=message_type,
available=login_plugins['available'],
- enabled=login_plugins['enabled'],
+ enabled=ordered,
menu=self._master.menu)
+
+ def root(self, *args, **kwargs):
+ return self.root_with_msg()
+
+ def enable(self, plugin):
+ msg = None
+ plugins = self._site[FACILITY]
+ if plugin not in plugins['available']:
+ msg = "Unknown plugin %s" % plugin
+ return self.root_with_msg(msg, "error")
+ obj = plugins['available'][plugin]
+ if obj not in plugins['enabled']:
+ obj.enable(self._site)
+ msg = "Plugin %s enabled" % obj.name
+ return self.root_with_msg(msg, "success")
+ enable.exposed = True
+
+ def disable(self, plugin):
+ msg = None
+ plugins = self._site[FACILITY]
+ if plugin not in plugins['available']:
+ msg = "Unknown plugin %s" % plugin
+ return self.root_with_msg(msg, "error")
+ obj = plugins['available'][plugin]
+ if obj in plugins['enabled']:
+ obj.disable(self._site)
+ msg = "Plugin %s disabled" % obj.name
+ return self.root_with_msg(msg, "success")
+ disable.exposed = True