Changeset 12346 for main/waeup.ikoba/trunk

Timestamp:

30 Dec 2014, 17:47:58 (10 years ago)

Author:

Henrik Bettermann

Message:

First batch of UI improvements.

Location:

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

Files:

• browser.py (modified) (4 diffs)
• contracts.py (modified) (1 diff)
• viewlets.py (modified) (3 diffs)

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

@@ -685 +685 @@
         return
 
+    @action(_('Cancel'), validator=NullValidator)
+    def cancel(self, **data):
+        self.redirect(self.url(self.context))
+
 
 class CustomerChangePasswordPage(IkobaEditFormPage):
@@ -711 +715 @@
                 self.flash(' '.join(errors), type="warning")
         return
+
+    @action(_('Cancel'), validator=NullValidator)
+    def cancel(self, **data):
+        self.redirect(self.url(self.context))
+
 
 class CustomerBasePDFFormPage(IkobaDisplayFormPage):
@@ -1226 +1235 @@
     pnav = 4
 
-    form_fields = grok.AutoFields(IContract).select('product_object')
+    form_fields = grok.AutoFields(IContractEdit).select('product_object')
 
     def update(self):
@@ -1293 +1302 @@
     def save(self, **data):
         msave(self, **data)
+        return
+
+    @action(_('Final Submit'), warning=WARNING)
+    def finalsubmit(self, **data):
+        msave(self, **data)
+        IWorkflowInfo(self.context).fireTransition('submit')
+        self.flash(_('Form has been submitted.'))
+        self.redirect(self.url(self.context))
         return
 

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

@@ -61 +61 @@
     """This is a customer contract baseclass.
     """
+    grok.implements(IContractEdit)  # Necesary for the selectproduct page
 
     grok.baseclass()

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

@@ -20 +20 @@
 from zope.i18n import translate
 from zope.interface import Interface
+from zope.component import getUtility
 from waeup.ikoba.interfaces import IIkobaObject
 from waeup.ikoba.interfaces import MessageFactory as _
@@ -28 +29 @@
     ICustomer, ICustomersContainer,
     ICustomerDocumentsContainer, ICustomerDocument,
-    IContractsContainer, IContract)
+    IContractsContainer, IContract, ICustomersUtils)
 from waeup.ikoba.customers.browser import (
     CustomersContainerPage, CustomersContainerManagePage,
@@ -297 +298 @@
     target = 'change_portrait'
 
+    @property
+    def target_url(self):
+        CUSTMANAGE_STATES = getUtility(
+            ICustomersUtils).CUSTMANAGE_CUSTOMER_STATES
+        if self.context.state not in CUSTMANAGE_STATES:
+            return ''
+        return self.view.url(self.view.context, self.target)
+
 
 # Viewlets for customer documents