Changeset 9211 for main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/applicants/browser.py

Timestamp:

21 Sep 2012, 08:19:35 (12 years ago)

Author:

uli

Message:

Rollback r9209. Looks like multiple merges from trunk confuse svn when merging back into trunk.

Location:

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

Files:

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

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

@@ -309 +309 @@
     pnav = 3
 
-    @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
+    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
@@ -501 +494 @@
     grok.template('applicantdisplaypage')
     form_fields = grok.AutoFields(IApplicant).omit(
-        'locked', 'course_admitted', 'password', 'suspended')
+        'locked', 'course_admitted', 'password')
     label = _('Applicant')
     pnav = 3
-    hide_hint = False
 
     @property
@@ -547 +539 @@
     grok.name('base')
     form_fields = grok.AutoFields(IApplicant).select(
-        'applicant_id','email', 'course1')
+        'applicant_id', 'firstname', 'lastname','email', 'course1')
 
 class CreateStudentPage(UtilityView, grok.View):
@@ -716 +708 @@
 
     def update(self):
-        if self.context.state in ('initialized', 'started', 'paid'):
+        if self.context.state in ('initialized', 'started'):
             self.flash(
-                _('Please pay and submit before trying to download the application slip.'))
+                _('Please pay before trying to download the application slip.'))
             return self.redirect(self.url(self.context))
         return
@@ -890 +882 @@
     form_fields = grok.AutoFields(IApplicantEdit).omit(
         'locked', 'course_admitted', 'student_id',
-        'suspended'
+        'screening_score',
         )
     form_fields['applicant_id'].for_display = True
@@ -1042 +1034 @@
         return
 
-    @action(_('Send login credentials to email address'), style='primary')
+    @action(_('Get login credentials'), style='primary')
     def register(self, **data):
         if not self.captcha_result.is_valid:
@@ -1093 +1085 @@
         # 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, url_info, msg):
+            password, login_url, msg):
             email_sent = applicant.email
         else: