Changeset 9169 for main/waeup.kofa/branches/uli-async-update/src/waeup/kofa/applicants/browser.py

Timestamp:

10 Sep 2012, 11:05:07 (12 years ago)

Author:

uli

Message:

Merge changes from trunk, r8786-HEAD

Location:

main/waeup.kofa/branches/uli-async-update

Files:

• . (modified) (1 prop)
• src/waeup/kofa/applicants/browser.py (modified) (6 diffs)

main/waeup.kofa/branches/uli-async-update/src/waeup/kofa/applicants/browser.py

@@ -309 +309 @@
     pnav = 3
 
-    form_fields = grok.AutoFields(IApplicantsContainer).omit('title')
-    form_fields['description'].custom_widget = HTMLDisplayWidget
-    form_fields[
-        'startdate'].custom_widget = FriendlyDatetimeDisplayWidget('le')
-    form_fields[
-        'enddate'].custom_widget = FriendlyDatetimeDisplayWidget('le')
+    @property
+    def form_fields(self):
+        form_fields = grok.AutoFields(IApplicantsContainer).omit('title')
+        form_fields['description'].custom_widget = HTMLDisplayWidget
+        form_fields[
+            'startdate'].custom_widget = FriendlyDatetimeDisplayWidget('le')
+        form_fields[
+            'enddate'].custom_widget = FriendlyDatetimeDisplayWidget('le')
+        if self.request.principal.id == 'zope.anybody':
+            form_fields = form_fields.omit(
+                'code', 'prefix', 'year', 'mode',
+                'strict_deadline', 'application_category')
+        return form_fields
 
     @property
@@ -494 +501 @@
     grok.template('applicantdisplaypage')
     form_fields = grok.AutoFields(IApplicant).omit(
-        'locked', 'course_admitted', 'password')
+        'locked', 'course_admitted', 'password', 'suspended')
     label = _('Applicant')
     pnav = 3
+    hide_hint = False
 
     @property
@@ -539 +547 @@
     grok.name('base')
     form_fields = grok.AutoFields(IApplicant).select(
-        'applicant_id', 'firstname', 'lastname','email', 'course1')
+        'applicant_id','email', 'course1')
 
 class CreateStudentPage(UtilityView, grok.View):
@@ -708 +716 @@
 
     def update(self):
-        if self.context.state in ('initialized', 'started'):
+        if self.context.state in ('initialized', 'started', 'paid'):
             self.flash(
-                _('Please pay before trying to download the application slip.'))
+                _('Please pay and submit before trying to download the application slip.'))
             return self.redirect(self.url(self.context))
         return
@@ -882 +890 @@
     form_fields = grok.AutoFields(IApplicantEdit).omit(
         'locked', 'course_admitted', 'student_id',
-        'screening_score',
+        'suspended'
         )
     form_fields['applicant_id'].for_display = True
@@ -1085 +1093 @@
         # Send email with credentials
         login_url = self.url(grok.getSite(), 'login')
+        url_info = u'Login: %s' % login_url
         msg = _('You have successfully been registered for the')
         if kofa_utils.sendCredentials(IUserAccount(applicant),
-            password, login_url, msg):
+            password, url_info, msg):
             email_sent = applicant.email
         else: