Changeset 15125 for main

Timestamp:

5 Sep 2018, 11:10:00 (6 years ago)

Author:

Henrik Bettermann

Message:

Simplify pagetemplate.

Location:

main/waeup.uniben/trunk/src/waeup/uniben/applicants

Files:

• browser.py (modified) (2 diffs)
• browser_templates/applicantdisplaypage.pt (modified) (1 diff)

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

@@ -272 +272 @@
            admitted.
         """
-        course_admitted = self.context.course_admitted
-        if getattr(course_admitted, '__parent__',None) and \
-            self.context.admchecking_fee_paid():
-            url = self.url(course_admitted)
-            title = course_admitted.title
-            code = course_admitted.code
-            return '<a href="%s">%s - %s</a>' %(url,code,title)
-        return ''
+        if self.admission_checking_info:
+            return '<span class="hint">%s</span>' % self.admission_checking_info
+        return super(CustomApplicantDisplayFormPage, self).getCourseAdmitted()
 
     @property
@@ -286 +281 @@
             not self.context.admchecking_fee_paid():
             return _('You must pay the admission checking fee '
-                     'to view your screening results and course admitted.')
+                     'to view your screening results and your course admitted.')
         return
 

main/waeup.uniben/trunk/src/waeup/uniben/applicants/browser_templates/applicantdisplaypage.pt

@@ -73 +73 @@
       </td>
     </tr>
-    <tr tal:condition="view/admission_checking_info">
-      <td class="fieldname" i18n:translate="">
-          Admitted Course of Study:
-      </td>
-      <td>
-        <span class="hint" tal:content="view/admission_checking_info" />
-      </td>
-    </tr>
     <tr>
       <td class="fieldname" i18n:translate="">