Changeset 7141 for main/waeup.sirp/trunk/src/waeup

Timestamp:

19 Nov 2011, 14:32:24 (13 years ago)

Author:

uli

Message:

Flatten failure method of password view a bit and check for empty
passwords in save action.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py (modified) (2 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py

@@ -1545 +1545 @@
     def update(self):
         super(StudentPasswordFormPage, self).update()
-        #self.wf_info = IWorkflowInfo(self.context)
         return
 
@@ -1554 +1553 @@
             msg = getattr(error, 'message', '')
             if isinstance(msg, basestring) and msg != '':
+                # invariant error
                 new_status.append(msg)
             else:
-                other_errors = True
-        if other_errors:
-            if new_status:
-                new_status.append('see below for further errors')
-            else:
-                new_status.append('See below for details.')
-        if new_status:
-            self.status = u'There were errors: %s' % ', '.join(new_status)
+                # field error
+                new_status.append('see below for details')
+                continue
+        self.status = u'Error: %s' % ', '.join(new_status)
         return
 
     @grok.action('Save', failure=onFailure)
     def save(self, **data):
+        if not isinstance(data.get('password', None), basestring):
+            self.flash('Password unchanged.')
+            return
         self.applyData(self.context, **data)
-        self.flash('Form has been saved.')
+        self.flash('Password has been set.')
         return