Changeset 8498 for main/waeup.kofa/trunk/src/waeup

Timestamp:

23 May 2012, 07:44:04 (13 years ago)

Author:

Henrik Bettermann

Message:

items_changes must include state, password and transition (like in applicants).

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/batching.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/students/batching.py

@@ -181 +181 @@
 
         # Update password
-        passwd = row.get('password', IGNORE_MARKER)
-        if passwd not in ('', IGNORE_MARKER):
-            if passwd.startswith('{SSHA}'):
-                # already encrypted password
-                obj.password = passwd
-            else:
-                # not yet encrypted password
-                IUserAccount(obj).setPassword(passwd)
+        if row.has_key('password'):
+            passwd = row.get('password', IGNORE_MARKER)
+            if passwd not in ('', IGNORE_MARKER):
+                if passwd.startswith('{SSHA}'):
+                    # already encrypted password
+                    obj.password = passwd
+                else:
+                    # not yet encrypted password
+                    IUserAccount(obj).setPassword(passwd)
+                items_changed += ('%s=%s, ' % ('password', passwd))
             row.pop('password')
 
         # Update registration state
-        state = row.get('state', IGNORE_MARKER)
-        if state not in (IGNORE_MARKER, ''):
-            value = row['state']
-            IWorkflowState(obj).setState(value)
-            msg = _("State '${a}' set", mapping = {'a':value})
-            history = IObjectHistory(obj)
-            history.addMessage(msg)
+        if row.has_key('state'):
+            state = row.get('state', IGNORE_MARKER)
+            if state not in (IGNORE_MARKER, ''):
+                value = row['state']
+                IWorkflowState(obj).setState(value)
+                msg = _("State '${a}' set", mapping = {'a':value})
+                history = IObjectHistory(obj)
+                history.addMessage(msg)
+                items_changed += ('%s=%s, ' % ('state', state))
             row.pop('state')
-        transition = row.get('transition', IGNORE_MARKER)
-        if transition not in (IGNORE_MARKER, ''):
-            value = row['transition']
-            IWorkflowInfo(obj).fireTransition(value)
+
+        if row.has_key('transition'):
+            transition = row.get('transition', IGNORE_MARKER)
+            if transition not in (IGNORE_MARKER, ''):
+                value = row['transition']
+                IWorkflowInfo(obj).fireTransition(value)
+                items_changed += ('%s=%s, ' % ('transition', transition))
             row.pop('transition')
 
         # apply other values...
-        items_changed = super(StudentProcessor, self).updateEntry(
+        items_changed += super(StudentProcessor, self).updateEntry(
             obj, row, site)