projects
/
cascardo
/
ipsilon.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix E713 with stricter pep8 error checker
[cascardo/ipsilon.git]
/
ipsilon
/
root.py
diff --git
a/ipsilon/root.py
b/ipsilon/root.py
index
19a47a4
..
c5fc5ae
100755
(executable)
--- a/
ipsilon/root.py
+++ b/
ipsilon/root.py
@@
-22,6
+22,9
@@
from ipsilon.util import errors
from ipsilon.login.common import Login
from ipsilon.login.common import Logout
from ipsilon.admin.common import Admin
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.login import LoginPlugins
+from ipsilon.admin.providers import ProviderPlugins
import cherrypy
sites = dict()
import cherrypy
sites = dict()
@@
-30,7
+33,7
@@
sites = dict()
class Root(Page):
def __init__(self, site, template_env):
class Root(Page):
def __init__(self, site, template_env):
- if
not site
in sites:
+ if
site not
in sites:
sites[site] = dict()
if template_env:
sites[site]['template_env'] = template_env
sites[site] = dict()
if template_env:
sites[site]['template_env'] = template_env
@@
-45,8
+48,13
@@
class Root(Page):
self.login = Login(self._site)
self.logout = Logout(self._site)
self.login = Login(self._site)
self.logout = Logout(self._site)
+ # set up idp providers now
+ LoadProviders(self, self._site)
+
# after all plugins are setup we can instantiate the admin pages
# after all plugins are setup we can instantiate the admin pages
- self.admin = Admin(self._site)
+ self.admin = Admin(self._site, 'admin')
+ LoginPlugins(self._site, self.admin)
+ ProviderPlugins(self._site, self.admin)
def root(self):
return self._template('index.html', title='Ipsilon')
def root(self):
return self._template('index.html', title='Ipsilon')