Changeset 15835 for main

Timestamp:

21 Nov 2019, 12:53:50 (5 years ago)

Author:

Henrik Bettermann

Message:

Show files at the top.

Provide application slip for all types of applications.

Location:

main/waeup.aaue/trunk/src/waeup/aaue/applicants

Files:

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

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

@@ -343 +343 @@
     @property
     def target_url(self):
-        if self.context.state in ('initialized', 'started', 'paid') \
-            or self.context.special or self.view.target in ('trans', 'cert'):
+        if self.context.state in ('initialized', 'started', 'paid'):
+            # or self.context.special or self.view.target in ('trans', 'cert'):
             return
         return self.view.url(self.view.context, self.target)
@@ -370 +370 @@
         if note:
             return '<br /><br />' + note
+        if self.target is not None and self.target in (
+            'trans', 'cert', 'ver', 'send'):
+            return
         if self.context.sex == 'm':
             pronoun = 'he'
@@ -396 +399 @@
             for field in UDE_OMIT_PDF_FIELDS:
                 form_fields = form_fields.omit(field)
+        elif self.target is not None and self.target == 'trans':
+            form_fields = grok.AutoFields(ITranscriptApplicant).omit(
+                'locked', 'suspended')
+        elif self.target is not None and self.target == 'ver':
+            form_fields = grok.AutoFields(IVerificationRequest).omit(
+                'locked', 'suspended')
+        elif self.target is not None and self.target == 'send':
+            form_fields = grok.AutoFields(ISendByEmailRequest).omit(
+                'locked', 'suspended')
+        elif self.target is not None and self.target == 'cert':
+            form_fields = grok.AutoFields(ICertificateRequest).omit(
+                'locked', 'suspended')
         else:
             for field in UG_OMIT_PDF_FIELDS:

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

@@ -20 +20 @@
 <table i18n:domain="waeup.kofa" class="form-table">
   <tbody>
+    <tal:files tal:condition="python: view.target in ('trans', 'cert', 'ver', 'send')">
+      <tr>
+        <td class="separator" colspan=2>
+          Files
+        </td>
+      </tr>
+      <tr>
+        <td colspan=2>
+ 
+          <span tal:replace="structure view/file_links" />
+
+        </td>
+      </tr>
+    </tal:files>
     <tal:widgets content="structure provider:widgets" />
     <tr tal:condition="view/getCourseAdmitted">
@@ -37 +51 @@
       </td>
     <tr>
-    <tr tal:condition="python: view.target in ('trans', 'cert', 'ver', 'send')">
-      <td class="fieldname" i18n:translate="">
-        Files:
-      </td>
-      <td>
-        <span tal:replace="structure view/file_links" />
-      </td>
-    </tr>
   </tbody>
 </table>