summaryrefslogtreecommitdiffstats
path: root/ipsilon/root.py
diff options
context:
space:
mode:
authorSimo Sorce <simo@redhat.com>2015-03-31 16:35:15 -0400
committerRob Crittenden <rcritten@redhat.com>2015-04-29 13:30:04 -0400
commit99b52607ee7ab82cc2b166f99c077ee53375fe1a (patch)
tree56f0a9279a5d637fb09e294f6ab62ee832d4d751 /ipsilon/root.py
parent68b9e1d3138784c3793f0a04c411f14168748692 (diff)
downloadipsilon.git-99b52607ee7ab82cc2b166f99c077ee53375fe1a.tar.gz
ipsilon.git-99b52607ee7ab82cc2b166f99c077ee53375fe1a.tar.xz
ipsilon.git-99b52607ee7ab82cc2b166f99c077ee53375fe1a.zip
Merge the login and info plugins configurations
Having separate login and info plugins configuration pages doesn't really make a lot of sense. As a first step moving towards login stacks put login and info plugin configuration into a common "Login Stack" menu item. https://fedorahosted.org/ipsilon/ticket/117 Signed-off-by: Simo Sorce <simo@redhat.com> Reviewed-by: Rob Crittenden <rcritten@redhat.com>
Diffstat (limited to 'ipsilon/root.py')
-rw-r--r--ipsilon/root.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/ipsilon/root.py b/ipsilon/root.py
index 93b6cd4..6326436 100644
--- a/ipsilon/root.py
+++ b/ipsilon/root.py
@@ -21,6 +21,7 @@ from ipsilon.login.common import Login
from ipsilon.login.common import Logout
from ipsilon.admin.common import Admin
from ipsilon.providers.common import LoadProviders
+from ipsilon.admin.loginstack import LoginStack
from ipsilon.admin.info import InfoPlugins
from ipsilon.admin.login import LoginPlugins
from ipsilon.admin.providers import ProviderPlugins
@@ -57,8 +58,9 @@ class Root(Page):
# after all plugins are setup we can instantiate the admin pages
self.admin = Admin(self._site, 'admin')
self.rest = Rest(self._site, 'rest')
- InfoPlugins(self._site, self.admin)
- LoginPlugins(self._site, self.admin)
+ self.stack = LoginStack(self._site, self.admin)
+ LoginPlugins(self._site, self.stack)
+ InfoPlugins(self._site, self.stack)
ProviderPlugins(self._site, self.admin)
RestProviderPlugins(self._site, self.rest)