[z3-checkins] r40535 - in z3/deliverance/zdeliverance: . tests www

[chrism at codespeak.net]

Author: chrism
Date: Thu Mar 15 15:26:22 2007
New Revision: 40535

Added:
   z3/deliverance/zdeliverance/www/
   z3/deliverance/zdeliverance/www/rule.gif   (contents, props changed)
Modified:
   z3/deliverance/zdeliverance/__init__.py
   z3/deliverance/zdeliverance/tests/test_traversal.py
   z3/deliverance/zdeliverance/traversal.py
Log:
Make rules addable via ZMI.



Modified: z3/deliverance/zdeliverance/__init__.py
==============================================================================
--- z3/deliverance/zdeliverance/__init__.py	(original)
+++ z3/deliverance/zdeliverance/__init__.py	Thu Mar 15 15:26:22 2007
@@ -1 +1,12 @@
-# this is a package
+from Products.zdeliverance.traversal import DeliveranceRule
+from Products.zdeliverance.traversal import manage_addDeliveranceRule
+
+def initialize(context):
+    context.registerClass(
+        DeliveranceRule,
+        icon="www/rule.gif",
+        permission='Add Deliverance Rules',
+        constructors=(manage_addDeliveranceRule,),
+        )
+    
+    

Modified: z3/deliverance/zdeliverance/tests/test_traversal.py
==============================================================================
--- z3/deliverance/zdeliverance/tests/test_traversal.py	(original)
+++ z3/deliverance/zdeliverance/tests/test_traversal.py	Thu Mar 15 15:26:22 2007
@@ -10,8 +10,8 @@
         from Products.zdeliverance.traversal import DeliveranceRule
         return DeliveranceRule
 
-    def _makeOne(self, id='therule'):
-        return self._getTargetClass()(id)
+    def _makeOne(self):
+        return self._getTargetClass()()
 
     def test_manage_afterAdd(self):
         rule = self._makeOne()
@@ -52,8 +52,8 @@
     pass
 
 class DummyResponse:
-    def setBody(self, body, title):
-        self.body = body
+    def setBody(self, *arg, **kw):
+        self.body = arg[0]
 
 class DummyRequest:
     def __init__(self):

Modified: z3/deliverance/zdeliverance/traversal.py
==============================================================================
--- z3/deliverance/zdeliverance/traversal.py	(original)
+++ z3/deliverance/zdeliverance/traversal.py	Thu Mar 15 15:26:22 2007
@@ -12,16 +12,15 @@
     meta_type = 'Deliverance Rule'
     theme_url = ''
     rule = ''
+    id = 'deliverance_rule'
 
     _properties = (
         {'id':'title', 'type':'string', 'mode':'w'},
         {'id':'theme_url', 'type':'string', 'mode':'w', 'label':'Theme URL'},
         {'id':'rule', 'type':'text', 'mode':'w', 'label':'Rule'},
         )
+    manage_options = PropertyManager.manage_options
     
-    def __init__(self, id):
-        self.id = id
-
     def manage_afterAdd(self, item, container):
         existing = queryBeforeTraverse(container, 'Deliverance')
         if existing:
@@ -35,18 +34,18 @@
     def __call__(self, container, request):
         response = request.RESPONSE
         orig_setBody = response.setBody
-        def setBody(body, title=''):
-            orig_setBody(body, title)
+        def setBody(*arg, **kw):
+            orig_setBody(*arg, **kw)
             # XXX do work
-            orig_setBody(body, title)
+            orig_setBody(*arg, **kw)
         response.setBody = setBody
         request.set('DELIVERANCE_THEME', {'theme_url':self.theme_url,
                                           'rule':self.rule})
     
-def manage_addDeliveranceRule(self, id, REQUEST=None):
+def manage_addDeliveranceRule(self, REQUEST=None):
     """ Add a deliverance rule """
-    rule = DeliveranceRule(id)
-    self._setObject(id, rule)
+    rule = DeliveranceRule()
+    self._setObject(rule.getId(), rule)
     rule_url = rule.absolute_url() + '/manage_main'
     if REQUEST is not None:
         REQUEST.RESPONSE.redirect(rule_url)

Added: z3/deliverance/zdeliverance/www/rule.gif
==============================================================================
Binary file. No diff available.