Changeset 13138 for main

Timestamp:

5 Jul 2015, 07:42:37 (9 years ago)

Author:

Henrik Bettermann

Message:

Repair document manage form pages. Buttons were missing.

Location:

main/waeup.kofa/trunk/src/waeup/kofa/documents

Files:

• batching.py (modified) (1 diff)
• browser.py (modified) (4 diffs)
• tests/test_browser.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/documents/batching.py

@@ -34 +34 @@
 from waeup.kofa.interfaces import (
     IBatchProcessor, FatalCSVError, IObjectConverter, IUserAccount,
-    IObjectHistory, IGNORE_MARKER)
+    IGNORE_MARKER)
 from waeup.kofa.interfaces import IKofaUtils
 from waeup.kofa.interfaces import MessageFactory as _

main/waeup.kofa/trunk/src/waeup/kofa/documents/browser.py

@@ -36 +36 @@
 from waeup.kofa.interfaces import MessageFactory as _
 from waeup.kofa.interfaces import (
-    IContactForm, IObjectHistory, IKofaObject, IKofaUtils)
+    IContactForm, IKofaObject, IKofaUtils)
 from waeup.kofa.browser.layout import (
     KofaPage, KofaEditFormPage, KofaAddFormPage, KofaDisplayFormPage,
@@ -279 +279 @@
     @action(_('Add local role'), validator=NullValidator)
     def addLocalRole(self, **data):
-        return add_local_role(self,2,**data)
+        return add_local_role(self,3,**data)
 
     @action(_('Remove selected local roles'))
     def delLocalRoles(self, **data):
-        return del_local_roles(self,2,**data)
+        return del_local_roles(self,3,**data)
 
 
@@ -300 +300 @@
         return
 
+    # Actions must be repeated. They are not inherited from the parent class.
+
+    @action(_('Cancel'), validator=NullValidator)
+    def cancel(self, **data):
+        self.redirect(self.url(self.context))
+        return
+
+    @action(_('Add local role'), validator=NullValidator)
+    def addLocalRole(self, **data):
+        return add_local_role(self,3,**data)
+
+    @action(_('Remove selected local roles'))
+    def delLocalRoles(self, **data):
+        return del_local_roles(self,3,**data)
 
 class RESTDocumentManageFormPage(DocumentManageFormPage):
@@ -315 +329 @@
         return
 
+    # Actions must be repeated. They are not inherited from the parent class.
+
+    @action(_('Cancel'), validator=NullValidator)
+    def cancel(self, **data):
+        self.redirect(self.url(self.context))
+        return
+
+    @action(_('Add local role'), validator=NullValidator)
+    def addLocalRole(self, **data):
+        return add_local_role(self,3,**data)
+
+    @action(_('Remove selected local roles'))
+    def delLocalRoles(self, **data):
+        return del_local_roles(self,3,**data)
 
 class DocumentTriggerTransitionFormPage(KofaEditFormPage):

main/waeup.kofa/trunk/src/waeup/kofa/documents/tests/test_browser.py

@@ -233 +233 @@
         self.assertTrue('HTML Document added.' in self.browser.contents)
         document = self.app['documents']['DOC2']
-
+        # All form action buttons are there
+        self.assertTrue('value="Add local role"' in self.browser.contents)
+        self.assertTrue('value="Save"' in self.browser.contents)
+        self.assertTrue('value="Cancel"' in self.browser.contents)
         # Document can be edited
         self.browser.getControl(name="form.title").value = 'My second doc'