Changeset 11971

Timestamp:

16 Nov 2014, 17:50:55 (10 years ago)

Author:

Henrik Bettermann

Message:

Add file upload and display components.

Adjust workflow.

Location:

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

Files:

• app.txt (modified) (3 diffs)
• browser/templates/default_waeup_edit_form.pt (modified) (1 diff)
• customers/browser.py (modified) (4 diffs)
• customers/browser_templates/basemanagepage.pt (added)
• customers/browser_templates/basepage.pt (modified) (1 diff)
• customers/browser_templates/change_password.pt (added)
• customers/browser_templates/filesuploadpage.pt (added)
• customers/browser_templates/imagedisplay.pt (added)
• customers/browser_templates/imageupload.pt (added)
• customers/files.py (added)
• customers/tests/test_browser.py (added)
• customers/utils.py (modified) (2 diffs)
• customers/workflow.py (modified) (1 diff)

main/waeup.ikoba/trunk/src/waeup/ikoba/app.txt

@@ -1 +1 @@
 :mod:`waeup.ikoba.app` -- central components for Ikoba
-****************************************************
+******************************************************
 
 .. :doctest:
@@ -25 +25 @@
 
 Creating `Company` instances
-===============================
+============================
 
 As :class:`Company` instances make use of the Zope Component
@@ -69 +69 @@
 
 Ikoba plugins
-============
+=============
 
 waeup.ikoba provides an API to 'plugin' components. Things that should

main/waeup.ikoba/trunk/src/waeup/ikoba/browser/templates/default_waeup_edit_form.pt

@@ -5 +5 @@
     <tbody>
       <tal:widgets content="structure provider:widgets" />
+      <tal:files content="structure provider:files" />
     </tbody>
   </table>

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

@@ -33 +33 @@
 from hurry.workflow.interfaces import IWorkflowInfo, IWorkflowState
 from waeup.ikoba.interfaces import MessageFactory as _
-from waeup.ikoba.interfaces import IContactForm, IObjectHistory, IIkobaObject
+from waeup.ikoba.interfaces import (
+    IContactForm, IObjectHistory, IIkobaObject, IIkobaUtils,
+    IPasswordValidator, IUserAccount)
 from waeup.ikoba.browser.layout import (
     IkobaPage, IkobaEditFormPage, IkobaAddFormPage, IkobaDisplayFormPage,
@@ -39 +41 @@
 from waeup.ikoba.browser.pages import ContactAdminForm
 from waeup.ikoba.browser.breadcrumbs import Breadcrumb
+from waeup.ikoba.browser.interfaces import ICaptchaManager
 from waeup.ikoba.utils.helpers import get_current_principal, to_timezone, now
 from waeup.ikoba.customers.interfaces import (
@@ -485 +488 @@
             return
 
-        kofa_utils = getUtility(IKofaUtils)
+        kofa_utils = getUtility(IIkobaUtils)
         password = kofa_utils.genPassword()
         mandate = PasswordMandate()
@@ -523 +526 @@
         self.customer_id = customer_id
         return
+
+class CustomerFilesUploadPage(IkobaPage):
+    """ View to upload files by customer
+    """
+    grok.context(ICustomer)
+    grok.name('change_portrait')
+    grok.require('waeup.uploadCustomerFile')
+    grok.template('filesuploadpage')
+    label = _('Upload files')
+    pnav = 4
+
+    def update(self):
+        PWCHANGE_STATES = getUtility(ICustomersUtils).PWCHANGE_STATES
+        if self.context.customer.state not in PWCHANGE_STATES:
+            emit_lock_message(self)
+            return
+        super(CustomerFilesUploadPage, self).update()
+        return
+
+# Pages for customers only
+
+class CustomerBaseEditFormPage(IkobaEditFormPage):
+    """ View to edit customer base data
+    """
+    grok.context(ICustomer)
+    grok.name('edit_base')
+    grok.require('waeup.handleCustomer')
+    form_fields = grok.AutoFields(ICustomer).select(
+        'email', 'phone')
+    label = _('Edit base data')
+    pnav = 4
+
+    @action(_('Save'), style='primary')
+    def save(self, **data):
+        msave(self, **data)
+        return
+
+class CustomerChangePasswordPage(IkobaEditFormPage):
+    """ View to edit customer passords
+    """
+    grok.context(ICustomer)
+    grok.name('change_password')
+    grok.require('waeup.handleCustomer')
+    grok.template('change_password')
+    label = _('Change password')
+    pnav = 4
+
+    @action(_('Save'), style='primary')
+    def save(self, **data):
+        form = self.request.form
+        password = form.get('change_password', None)
+        password_ctl = form.get('change_password_repeat', None)
+        if password:
+            validator = getUtility(IPasswordValidator)
+            errors = validator.validate_password(password, password_ctl)
+            if not errors:
+                IUserAccount(self.context).setPassword(password)
+                self.context.writeLogMessage(self, 'saved: password')
+                self.flash(_('Password changed.'))
+            else:
+                self.flash( ' '.join(errors), type="warning")
+        return
+

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

@@ -19 +19 @@
       </td>
     </tr>
+    <tal:files content="structure provider:files" />
   </tbody>
   <tfoot>

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

@@ -19 +19 @@
 """
 import grok
+from waeup.ikoba.interfaces import STARTED
 from waeup.ikoba.customers.interfaces import ICustomersUtils
 
@@ -34 +35 @@
     #: start with this string. The default is 'K'.
     CUSTOMER_ID_PREFIX = u'K'
+
+    PWCHANGE_STATES = (STARTED,)

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

@@ -66 +66 @@
 
     Transition(
+        transition_id = 'reject',
+        title = _('Reject customer'),
+        msg = _('Customer registration rejected'),
+        source = REQUESTED,
+        destination = STARTED),
+
+    Transition(
         transition_id = 'reset1',
         title = _('Reset customer'),