Author: justi9
Date: 2010-07-09 11:39:44 -0400 (Fri, 09 Jul 2010)
New Revision: 4095
Modified:
mgmt/newdata/cumin/bin/cumin-web
mgmt/newdata/cumin/python/cumin/objecttask.py
mgmt/newdata/cumin/python/cumin/tools.py
mgmt/newdata/wooly/python/wooly/__init__.py
Log:
Pipe debug settings down to cumin; correct objecttaskform class hierarchy
Modified: mgmt/newdata/cumin/bin/cumin-web
===================================================================
--- mgmt/newdata/cumin/bin/cumin-web 2010-07-09 02:34:34 UTC (rev 4094)
+++ mgmt/newdata/cumin/bin/cumin-web 2010-07-09 15:39:44 UTC (rev 4095)
@@ -26,6 +26,7 @@
cumin = Cumin(config.home, opts.broker, opts.database,
opts.host, opts.port)
+ cumin.debug = opts.debug
cumin.user = values.web.user
cumin.check()
Modified: mgmt/newdata/cumin/python/cumin/objecttask.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/objecttask.py 2010-07-09 02:34:34 UTC (rev 4094)
+++ mgmt/newdata/cumin/python/cumin/objecttask.py 2010-07-09 15:39:44 UTC (rev 4095)
@@ -317,12 +317,10 @@
self.task = task
-class ObjectTaskForm(FoldingFieldSubmitForm):
+class ObjectTaskForm(TaskForm):
def __init__(self, app, name, task):
- super(ObjectTaskForm, self).__init__(app, name)
+ super(ObjectTaskForm, self).__init__(app, name, task)
- self.task = task
-
self.id = IntegerParameter(app, "id")
self.add_parameter(self.id)
Modified: mgmt/newdata/cumin/python/cumin/tools.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/tools.py 2010-07-09 02:34:34 UTC (rev 4094)
+++ mgmt/newdata/cumin/python/cumin/tools.py 2010-07-09 15:39:44 UTC (rev 4095)
@@ -218,7 +218,7 @@
def do_run(self, opts, args):
app = Cumin(self.config)
- app.devel_enabled = True
+ app.debug = True
try:
app.check()
Modified: mgmt/newdata/wooly/python/wooly/__init__.py
===================================================================
--- mgmt/newdata/wooly/python/wooly/__init__.py 2010-07-09 02:34:34 UTC (rev 4094)
+++ mgmt/newdata/wooly/python/wooly/__init__.py 2010-07-09 15:39:44 UTC (rev 4095)
@@ -290,7 +290,7 @@
child.save_parameters(session, params)
def process(self, session, *args):
- if self.app.devel_enabled:
+ if self.app.debug:
profile = self.page.profile.get(session)
call = ProcessCall(profile, self, args)
@@ -311,7 +311,7 @@
child.process(session)
def render(self, session, *args):
- if self.app.devel_enabled:
+ if self.app.debug:
profile = self.page.profile.get(session)
call = RenderCall(profile, self, args)
@@ -497,7 +497,7 @@
self.finder = ResourceFinder()
- self.devel_enabled = False
+ self.debug = False
def init(self):
for page in self.pages:
@@ -600,7 +600,7 @@
else:
url = page
- if self.app.devel_enabled:
+ if self.app.debug:
profile = self.page.profile.get(self)
profile.urls.append(url)