Changeset 11986

Timestamp:

19 Nov 2014, 06:42:39 (10 years ago)

Author:

Henrik Bettermann

Message:

Add missing buttons.

Location:

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

Files:

• browser.py (modified) (1 diff)
• tests/test_browser.py (modified) (2 diffs)
• viewlets.py (modified) (2 diffs)

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

@@ -50 +50 @@
 
 grok.context(IIkobaObject)
+
+
+# Save function used for save methods in pages
+def msave(view, **data):
+    changed_fields = view.applyData(view.context, **data)
+    # Turn list of lists into single list
+    if changed_fields:
+        changed_fields = reduce(lambda x,y: x+y, changed_fields.values())
+    fields_string = ' + '.join(changed_fields)
+    view.flash(_('Form has been saved.'))
+    if fields_string:
+        view.context.writeLogMessage(view, 'saved: %s' % fields_string)
+    return
+
+
+def emit_lock_message(view):
+    """Flash a lock message.
+    """
+    view.flash(_('The requested form is locked (read-only).'), type="warning")
+    view.redirect(view.url(view.context))
+    return
 
 

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

@@ -555 +555 @@
             '...You logged in...', self.browser.contents)
         # Admitted customer can upload a passport picture
-        self.browser.open(self.customer_path + '/change_portrait')
+        self.browser.getLink("Change portrait").click()
         ctrl = self.browser.getControl(name='passportuploadedit')
         file_obj = open(SAMPLE_IMAGE, 'rb')
@@ -565 +565 @@
             'src="http://localhost/app/customers/K1000000/passport.jpg"'
             in self.browser.contents)
+
+    def test_customer_baseedit(self):
+        # Customers can change the password
+        self.customer.personal_updated = datetime.utcnow()
+        self.browser.open(self.login_path)
+        self.browser.getControl(name="form.login").value = self.customer_id
+        self.browser.getControl(name="form.password").value = 'spwd'
+        self.browser.getControl("Login").click()
+        self.assertEqual(self.browser.url, self.customer_path)
+        self.assertTrue('You logged in' in self.browser.contents)
+        self.browser.getLink("Edit").click()
+        self.browser.getControl(name="form.email").value = 'new_email@aa.ng'
+        self.browser.getControl("Save").click()
+        self.assertMatches('...Form has been saved...',
+                           self.browser.contents)
+        # Customer can view history
+        self.browser.getLink("History").click()
+        self.assertMatches('...Customer record created by system...',
+            self.browser.contents)
 
     def test_customer_login(self):

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

@@ -252 +252 @@
 
 
+class CustomerBaseActionButton(ManageActionButton):
+    grok.order(1)
+    grok.context(ICustomer)
+    grok.view(CustomerBaseDisplayFormPage)
+    grok.require('waeup.handleCustomer')
+    text = _('Edit')
+    target = 'edit_base'
+
 class CustomerPasswordActionButton(ManageActionButton):
     grok.order(2)
@@ -260 +268 @@
     text = _('Change password')
     target = 'changepassword'
+
+class CustomerPassportActionButton(ManageActionButton):
+    grok.order(3)
+    grok.context(ICustomer)
+    grok.view(CustomerBaseDisplayFormPage)
+    grok.require('waeup.handleCustomer')
+    icon = 'actionicon_portrait.png'
+    text = _('Change portrait')
+    target = 'change_portrait'