Changeset 6459

Timestamp:

23 Jun 2011, 06:25:59 (14 years ago)

Author:

Henrik Bettermann

Message:

Change structure of history messages (not sure if unicode strings are appropriate here).

Location:

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

Files:

• accesscodes/browser.py (modified) (2 diffs)
• accesscodes/tests/test_accesscodes.py (modified) (2 diffs)
• accesscodes/workflow.py (modified) (1 diff)
• applicants/browser.py (modified) (3 diffs)

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

@@ -139 +139 @@
             if 'disable' in form:
                 try:
-                    self.context.disable(entry, self.request.principal.id)
+                    comment = u"Disabled by %s" % self.request.principal.id
+                    self.context.disable(entry, comment)
                     self.flash('%s disabled.' % entry)
                 except InvalidTransitionError:
@@ -145 +146 @@
             elif 'enable' in form:
                 try:
-                    self.context.enable(entry, self.request.principal.id)
+                    comment = u"Re-enabled by %s" % self.request.principal.id
+                    self.context.enable(entry, comment)
                     self.flash('%s (re-)enabled.' % entry)
                 except InvalidTransitionError:

main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/tests/test_accesscodes.py

@@ -192 +192 @@
         history = IObjectHistory(self.ac1)
         msgs = history.messages
-        assert msgs[-1].endswith(' - Used (new state: used)')
+        assert msgs[-1].endswith('Used by system')
 
 class AccessCodeTests(FunctionalTestCase):
@@ -236 +236 @@
         # Access codes have a history.
         match = re.match(
-            '^../../.... ..:..:.. - Initialized \(new state: initialized\)',
+            '^../../.... ..:..:.. - Initialized by system',
             self.ac1.history)
         assert match is not None

main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/workflow.py

@@ -121 +121 @@
     # append message to history
     timestamp = datetime.now().strftime("%d/%m/%Y %H:%M:%S")
-    msg = '%s - %s (new state: %s)' % (
-        timestamp, event.destination.title(), event.destination)
+    msg = '%s -' % timestamp
     if event.comment is not None:
-        msg = '%s, %s' % (msg, event.comment)
+        msg = '%s %s' % (msg, event.comment)
+    else:
+        msg = '%s %s by system' % (msg,event.destination.title())
+
     history = IObjectHistory(obj)
     history.addMessage(msg)

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

@@ -425 +425 @@
 
         # Mark pin as used (this also fires a pin related transition)
-        invalidate_accesscode(pin)
+        comment = u"Invalidated by applicant"
+        invalidate_accesscode(pin, comment)
 
         if not pin in self.context.keys():
@@ -473 +474 @@
         ac_number = self.request.form.get('form.ac_number', None)
         pin = '%s-%s-%s' % (self.ac_prefix,ac_series,ac_number)
-        if not invalidate_accesscode(pin):
+        if not invalidate_accesscode(pin, comment=u"Invalidated by system"):
             self.flash('%s is not a valid access code.' % pin)
             self.redirect(self.url(self.context, '@@manage')+'#tab-2')
@@ -740 +741 @@
     grok.name('edit')
     grok.require('waeup.handleApplication')
-    form_fields = grok.AutoFields(IApplicantEdit).omit('locked')
+    form_fields = grok.AutoFields(IApplicantEdit).omit(
+        'locked', 'course_admitted', 'application_date', 'student_id',
+        'screening_score',
+        )
     form_fields['passport'].custom_widget = EncodingImageFileWidget
     form_fields['date_of_birth'].custom_widget = FriendlyDateWidget('le-year')