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

Timestamp:

14 Sep 2011, 14:20:40 (13 years ago)

Author:

Henrik Bettermann

Message:

Turn list of lists into single list with Uli's technique.

Do not log changes made by students. During clearance this would be too much.

Location:

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

Files:

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

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

@@ -44 +44 @@
     ob_class = view.__implemented__.__name__.replace('waeup.sirp.','')
     changed_fields = view.applyData(view.context, **data)
-    changed_fields = changed_fields.values()
-    fields_string = '+'.join(' + '.join(str(i) for i in b) for b in changed_fields)
+    # 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.context._p_changed = True
     view.flash('Form has been saved.')
@@ -335 +337 @@
             IUserAccount(self.context).setPassword(form['password'])
             self.context.loggerInfo(ob_class, 'password changed')
+        # Turn list of lists into single list
         changed_fields = self.applyData(self.context, **data)
-        changed_fields = changed_fields.values()
-        fields_string = '+'.join(' + '.join(str(i) for i in b) for b in changed_fields)
+        if changed_fields:
+            changed_fields = reduce(lambda x,y: x+y, changed_fields.values())
+            changed_fields = [x for x in changed_fields
+                              if not x.startswith('password')]
+        fields_string = ' + '.join(changed_fields)
         self.context._p_changed = True
         if form.has_key('transition') and form['transition']:
@@ -587 +593 @@
     @grok.action('Save', failure=onFailure)
     def save(self, **data):
-        form = self.request.form
-        ob_class = self.__implemented__.__name__.replace('waeup.sirp.','')
-        changed_fields = self.applyData(self.context, **data)
-        # Turn list of lists into single list
-        changed_fields = reduce(lambda x,y: x+y, changed_fields.values())
-        changed_fields = [x for x in changed_fields
-                          if not x.startswith('password')]
-        if form.get('form.password', u'') != u'':
-            self.context.loggerInfo(ob_class, 'password changed')
-            self.flash('Form has been saved.')
-        fields_string = ' + '.join(changed_fields)
-        if fields_string:
-            self.context.loggerInfo(ob_class, 'saved: % s' % fields_string)
+        self.applyData(self.context, **data)
+        self.flash('Form has been saved.')
         return
 
@@ -652 +647 @@
             self.context.clr_code = pin
         IWorkflowInfo(self.context).fireTransition('start_clearance')
-        self.flash('Clearance process is started.')
+        self.flash('Clearance process has been started.')
         self.redirect(self.url(self.context,'cedit'))
         return
@@ -698 +693 @@
     def save(self, **data):
         self.applyData(self.context, **data)
-        self.flash('Form has been saved.')
+        self.flash('Clearance form has been saved.')
         return
 
@@ -708 +703 @@
         #    self.flash(self.dataNotComplete())
         #    return
+        self.flash('Clearance form has been saved.')
         self.redirect(self.url(self.context,'request_clearance'))
         return

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

@@ -122 +122 @@
 
     adm_code = schema.TextLine(
-        title = u'PWD access code',
+        title = u'PWD Access Code',
         default = u'',
         required = False,
@@ -143 +143 @@
 
     clr_code = schema.TextLine(
-        title = u'CLR access code',
+        title = u'CLR Access Code',
         default = u'',
         required = False,

main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_browser.py

@@ -402 +402 @@
         self.browser.getControl(name="ac_number").value = self.existing_clrnumber
         self.browser.getControl("Start clearance now").click()
-        self.assertMatches('...Clearance process is started...',
+        self.assertMatches('...Clearance process has been started...',
                            self.browser.contents)
         self.browser.getControl(name="form.date_of_birth").value = '09/10/1961'