Changeset 9486 for main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py

Timestamp:

31 Oct 2012, 16:30:02 (12 years ago)

Author:

Henrik Bettermann

Message:

Rename clearance_comment to officer_comment. That's more appropriate since the comment can also be used by other officers.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py (modified) (5 diffs)

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

@@ -587 +587 @@
             form_fields = grok.AutoFields(
                 IUGStudentClearance).omit('clearance_locked')
-        if not getattr(self.context, 'clearance_comment'):
-            form_fields = form_fields.omit('clearance_comment')
-        else:
-            form_fields['clearance_comment'].custom_widget = BytesDisplayWidget
+        if not getattr(self.context, 'officer_comment'):
+            form_fields = form_fields.omit('officer_comment')
+        else:
+            form_fields['officer_comment'].custom_widget = BytesDisplayWidget
         return form_fields
 
@@ -615 +615 @@
             form_fields = grok.AutoFields(
                 IUGStudentClearance).omit('clearance_locked')
-        if not getattr(self.context, 'clearance_comment'):
-            form_fields = form_fields.omit('clearance_comment')
+        if not getattr(self.context, 'officer_comment'):
+            form_fields = form_fields.omit('officer_comment')
         return form_fields
 
@@ -709 +709 @@
     grok.require('waeup.clearStudent')
     form_fields = grok.AutoFields(
-        IUGStudentClearance).select('clearance_comment')
+        IUGStudentClearance).select('officer_comment')
 
     @action(_('Save comment and reject clearance now'), style='primary')
@@ -726 +726 @@
             return
         self.applyData(self.context, **data)
-        comment = data['clearance_comment']
+        comment = data['officer_comment']
         self.context.writeLogMessage(
             self, 'comment: %s' % comment.replace('\n', '<br>'))
@@ -1953 +1953 @@
         if self.context.is_postgrad:
             form_fields = grok.AutoFields(IPGStudentClearance).omit(
-                'clearance_locked', 'clr_code', 'clearance_comment')
+                'clearance_locked', 'clr_code', 'officer_comment')
         else:
             form_fields = grok.AutoFields(IUGStudentClearance).omit(
-                'clearance_locked', 'clr_code', 'clearance_comment')
+                'clearance_locked', 'clr_code', 'officer_comment')
         return form_fields