Author: tmckay
Date: 2013-01-04 23:30:15 +0000 (Fri, 04 Jan 2013)
New Revision: 5641
Added:
branches/elephant/cumin/python/cumin/usergrid/grid/
branches/elephant/cumin/python/cumin/usergrid/grid/__init__.py
branches/elephant/cumin/python/cumin/usergrid/grid/main.py
Modified:
branches/elephant/cumin/model/access/persona.xml
branches/elephant/cumin/python/cumin/usergrid/widgets.py
Log:
Modify usergrid module to just set up an empty page.
Add usergrid.grid as a submodule that adds user grid ui,
distinct from usergrid.hadoop to set up hadoop ui.
More refinement comming..likely rename usergrid to "user"
and add auto initialization of "package" when a persona
imports "package.module".
Modified: branches/elephant/cumin/model/access/persona.xml
===================================================================
--- branches/elephant/cumin/model/access/persona.xml 2013-01-04 21:47:12 UTC (rev 5640)
+++ branches/elephant/cumin/model/access/persona.xml 2013-01-04 23:30:15 UTC (rev 5641)
@@ -6,6 +6,7 @@
<Module name="grid"/>
<Module name="inventory"/>
<Module name="usergrid"/>
+ <Module name="usergrid.grid"/>
<GroupAccess name="nogroup">
<MainPage name="login.html"/>
@@ -15,6 +16,7 @@
<MainPage name="usergrid.html"/>
<ModuleAccess name="account"/>
<ModuleAccess name="usergrid"/>
+ <ModuleAccess name="usergrid.grid"/>
</GroupAccess>
<GroupAccess name="admin">
@@ -29,6 +31,7 @@
<Module name="grid"/>
<Module name="inventory"/>
<Module name="usergrid"/>
+ <Module name="usergrid.grid"/>
<GroupAccess name="nogroup">
<MainPage name="login.html"/>
@@ -38,6 +41,7 @@
<MainPage name="usergrid.html"/>
<ModuleAccess name="account"/>
<ModuleAccess name="usergrid"/>
+ <ModuleAccess name="usergrid.grid"/>
</GroupAccess>
<GroupAccess name="admin">
@@ -53,6 +57,7 @@
<Module name="inventory"/>
<Module name="gridhadoop"/>
<Module name="usergrid"/>
+ <Module name="usergrid.grid"/>
<Module name="usergrid.hadoop"/>
<GroupAccess name="nogroup">
@@ -63,6 +68,7 @@
<MainPage name="usergrid.html"/>
<ModuleAccess name="account"/>
<ModuleAccess name="usergrid"/>
+ <ModuleAccess name="usergrid.grid"/>
<ModuleAccess name="usergrid.hadoop"/>
</GroupAccess>
Added: branches/elephant/cumin/python/cumin/usergrid/grid/__init__.py
===================================================================
--- branches/elephant/cumin/python/cumin/usergrid/grid/__init__.py
(rev 0)
+++ branches/elephant/cumin/python/cumin/usergrid/grid/__init__.py 2013-01-04 23:30:15 UTC
(rev 5641)
@@ -0,0 +1 @@
+from main import Module
Added: branches/elephant/cumin/python/cumin/usergrid/grid/main.py
===================================================================
--- branches/elephant/cumin/python/cumin/usergrid/grid/main.py
(rev 0)
+++ branches/elephant/cumin/python/cumin/usergrid/grid/main.py 2013-01-04 23:30:15 UTC
(rev 5641)
@@ -0,0 +1,26 @@
+from cumin.main import CuminModule
+from wooly.util import StringCatalog
+
+strings = StringCatalog(__file__)
+
+from cumin.usergrid.widgets import *
+
+class Module(CuminModule):
+ def __init__(self, app, name):
+ super(Module, self).__init__(app, name)
+
+ def init(self):
+ super(Module, self).init()
+
+ if hasattr(self.app, "user_grid_page") and self.app.user_grid_page:
+
+ page = self.app.user_grid_page
+
+ o = OverviewFrame(self.app, "overview", page.user)
+ page.main.overview = o
+ page.main.add_tab(o)
+
+ s = SubmissionsFrame(self.app, "submissions", page.user)
+ page.main.submissions = s
+ page.main.add_tab(s)
+
Modified: branches/elephant/cumin/python/cumin/usergrid/widgets.py
===================================================================
--- branches/elephant/cumin/python/cumin/usergrid/widgets.py 2013-01-04 21:47:12 UTC (rev
5640)
+++ branches/elephant/cumin/python/cumin/usergrid/widgets.py 2013-01-04 23:30:15 UTC (rev
5641)
@@ -40,12 +40,6 @@
def __init__(self, app, name, user):
super(MainView, self).__init__(app, name)
- self.overview = OverviewFrame(app, "overview", user)
- self.add_tab(self.overview)
-
- self.submissions = SubmissionsFrame(app, "submissions", user)
- self.add_tab(self.submissions)
-
class OverviewFrame(CuminFrame):
def __init__(self, app, name, user):
super(OverviewFrame, self).__init__(app, name)
Show replies by date