Changeset 12016

Timestamp:

21 Nov 2014, 05:08:19 (10 years ago)

Author:

Henrik Bettermann

Message:

Add more customer document components.

Location:

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

Files:

• browser.py (modified) (3 diffs)
• browser_templates/documentpage.pt (added)
• browser_templates/documentsmanagepage.pt (modified) (2 diffs)
• tests/test_browser.py (modified) (2 diffs)
• viewlets.py (modified) (4 diffs)

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

@@ -752 +752 @@
     grok.name('index')
     grok.require('waeup.viewCustomer')
+    grok.template('documentpage')
     form_fields = grok.AutoFields(ICustomerDocument)
     pnav = 4
@@ -768 +769 @@
     grok.context(ICustomerDocument)
     grok.name('manage')
-    grok.require('waeup.viewCustomer')
+    grok.require('waeup.manageCustomer')
     form_fields = grok.AutoFields(ICustomerDocument)
     pnav = 4
@@ -778 +779 @@
             'b':self.context.document_id})
         return self.context.document_id
+
+    @action(_('Save'), style='primary')
+    def save(self, **data):
+        msave(self, **data)
+        return

main/waeup.ikoba/trunk/src/waeup/ikoba/customers/browser_templates/documentsmanagepage.pt

@@ -7 +7 @@
       <th>&nbsp;</th>
       <th i18n:translate="">Document Id</th>
+      <th i18n:translate="">Title</th>
     </tr>
     </thead>
@@ -17 +18 @@
          tal:condition="python: not view.unremovable(cl)" />
         </td>
-        <td> <a tal:attributes="href python: view.url(cl)">
-        <span tal:content="cl/document_id">PDID</span></a></td>
+        <td>
+          <a tal:attributes="href python: view.url(cl)">
+          <span tal:content="cl/document_id">DOCID</span></a>
+        </td>
+        <td>
+          <span tal:content="cl/title">TITLE</span>
+        </td>
       </tr>
     </tbody>

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

@@ -790 +790 @@
         document = self.customer['documents']['d102']
 
+        # Document can be edited
+        self.browser.getLink("d102").click()
+        self.browser.getLink("Manage").click()
+        self.browser.getControl(name="form.title").value = 'My second doc'
+        self.browser.getControl("Save").click()
+        self.assertTrue('Form has been saved.' in self.browser.contents)
+        self.browser.getLink("View").click()
+        self.assertEqual(self.browser.url, self.documents_path + '/d102/index')
+
         # Documents can be removed
+        self.browser.getLink("Documents").click()
         ctrl = self.browser.getControl(name='val_id')
         ctrl.getControl(value=document.document_id).selected = True
@@ -802 +812 @@
 
         self.assertTrue(
+            'INFO - zope.mgr - customers.browser.DocumentManageFormPage '
+            '- K1000000 - saved: title'
+            in logcontent)
+
+        self.assertTrue(
             'INFO - zope.mgr - customers.browser.DocumentAddFormPage '
             '- K1000000 - added: Generic Document %s'

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

@@ -27 +27 @@
 from waeup.ikoba.customers.interfaces import (
     ICustomer, ICustomersContainer,
-    ICustomerDocumentsContainer)
+    ICustomerDocumentsContainer, ICustomerDocument)
 from waeup.ikoba.customers.browser import (
     CustomersContainerPage, CustomersContainerManagePage,
     CustomerBaseDisplayFormPage,
-    DocumentsManageFormPage)
+    DocumentsManageFormPage, DocumentDisplayFormPage, DocumentManageFormPage)
 
 grok.context(IIkobaObject)  # Make IIkobaObject the default context
@@ -266 +266 @@
     target = 'edit_base'
 
+
 class CustomerPasswordActionButton(ManageActionButton):
     grok.order(2)
@@ -274 +275 @@
     text = _('Change password')
     target = 'changepassword'
+
 
 class CustomerPassportActionButton(ManageActionButton):
@@ -295 +297 @@
     text = _('Add document')
     target = 'adddoc'
+
+
+class DocumentManageActionButton(ManageActionButton):
+    grok.order(1)
+    grok.context(ICustomerDocument)
+    grok.view(DocumentDisplayFormPage)
+    grok.require('waeup.manageCustomer')
+    text = _('Manage')
+    target = 'manage'
+
+class DocumentViewActionButton(ManageActionButton):
+    grok.order(1)
+    grok.context(ICustomerDocument)
+    grok.view(DocumentManageFormPage)
+    grok.require('waeup.manageCustomer')
+    text = _('View')
+    target = 'index'
+    icon = 'actionicon_view.png'