Changeset 12356 for main/waeup.ikoba/trunk

Timestamp:

1 Jan 2015, 07:44:44 (10 years ago)

Author:

Henrik Bettermann

Message:

Do not allow to add documents if customer has not yet been approved.

Rename pagetemplate.

Location:

main/waeup.ikoba/trunk/src/waeup/ikoba/customers

Files:

• browser.py (modified) (5 diffs)
• browser_templates/documentaddpage.pt (moved) (moved from main/waeup.ikoba/trunk/src/waeup/ikoba/customers/browser_templates/documentaddform.pt)
• documents.py (modified) (2 diffs)
• tests/test_browser.py (modified) (5 diffs)

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/browser.py

@@ -863 +863 @@
     grok.context(ICustomerDocumentsContainer)
     grok.name('adddoc')
-    grok.template('documentaddform')
+    grok.template('documentaddpage')
     grok.require('waeup.editCustomerDocuments')
     label = _('Add document')
@@ -874 +874 @@
         doctypes = getUtility(ICustomersUtils).SELECTABLE_DOCTYPES_DICT
         return sorted(doctypes.items())
+
+    @property
+    def edit_documents_allowed(self):
+        right_customer_state = self.context.customer.state in getUtility(
+            ICustomersUtils).DOCMANAGE_CUSTOMER_STATES
+        if isCustomer(self.request.principal) and not right_customer_state:
+            return False
+        return True
+
+    def update(self):
+        if not self.edit_documents_allowed:
+            emit_lock_message(self)
+            return
+        return super(DocumentAddFormPage, self).update()
 
     @action(_('Add document'), style='primary')
@@ -889 +903 @@
         self.context.writeLogMessage(
             self,'added: %s %s' % (doctype, document.document_id))
-        self.redirect(self.url(self.context))
+        isCustomer = getattr(
+            self.request.principal, 'user_type', None) == 'customer'
+        if isCustomer:
+            self.redirect(self.url(document, 'edit') + '#tab2')
+        else:
+            self.redirect(self.url(document, 'manage') + '#tab2')
         return
 
@@ -1207 +1226 @@
 
 
-class ContractAddPage(IkobaAddFormPage):
+class ContractAddFormPage(IkobaAddFormPage):
     """ Page to add an contract
 
@@ -1234 +1253 @@
             emit_lock_message(self)
             return
-        return super(ContractAddPage, self).update()
+        return super(ContractAddFormPage, self).update()
 
     @property

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/documents.py

@@ -65 +65 @@
     """This is a customer document baseclass.
     """
-    grok.implements(ICustomerDocument, ICustomerNavigation)
-    grok.provides(ICustomerDocument)
     grok.baseclass()
 
@@ -189 +187 @@
     """This is a sample customer document.
     """
+
+    grok.implements(ICustomerDocument, ICustomerNavigation)
+    grok.provides(ICustomerDocument)
 
     # Ikoba can store any number of files per Document object.

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/tests/test_browser.py

@@ -931 +931 @@
         self.browser.getLink("Documents").click()
         self.browser.getControl("Add document").click()
+        self.assertTrue('The requested form is locked' in self.browser.contents)
+        # Customer is in wrong state
+        IWorkflowState(self.customer).setState(APPROVED)
+        self.browser.getControl("Add document").click()
         self.browser.getControl(name="doctype").value = ['CustomerSampleDocument']
         self.browser.getControl(name="form.title").value = 'My Sample Document'
@@ -937 +941 @@
         docid = [i for i in self.customer['documents'].keys() if len(i) > 10][0]
         document = self.customer['documents'][docid]
-
-        # Document can be edited ...
-        self.browser.getLink(docid[:6]).click()
-        self.browser.open(self.documents_path + '/' + docid + '/edit')
-        #self.browser.getLink("Edit").click()
-        self.assertTrue('The requested form is locked' in self.browser.contents)
-        # Customer is in wrong state
-        IWorkflowState(self.customer).setState(APPROVED)
-        self.browser.open(self.documents_path + '/' + docid + '/edit')
         self.browser.getControl(name="form.title").value = 'My second doc'
         self.browser.getControl("Save").click()
@@ -953 +948 @@
         self.assertEqual(
             self.browser.url, self.documents_path + '/%s/index' % docid)
-        # Costumer can upload a document.
+        # Customer can upload a document.
         self.browser.getLink("Edit").click()
         ctrl = self.browser.getControl(name='samplescaneditupload')
@@ -964 +959 @@
             'href="http://localhost/app/customers/K1000000/documents/%s/sample"'
             % docid in self.browser.contents)
-        # Costumer can submit the form. The form is also saved.
+        # Customer can submit the form. The form is also saved.
         self.browser.getControl(name="form.title").value = 'My third doc'
         self.browser.getControl("Final Submit").click()
@@ -1217 +1212 @@
             in logcontent)
         self.assertTrue(
-            'INFO - zope.mgr - customers.browser.ContractAddPage '
+            'INFO - zope.mgr - customers.browser.ContractAddFormPage '
             '- K1000000 - added: Sample Contract %s'
             % contract.contract_id in logcontent)