Changeset 14646

Timestamp:

23 Mar 2017, 04:02:34 (8 years ago)

Author:

Henrik Bettermann

Message:

Omit course_category column from tables if categories are not defined.

Location:

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

Files:

• layout.py (modified) (1 diff)
• pages.py (modified) (1 diff)
• templates/certificatecoursepage.pt (modified) (1 diff)
• templates/certificatemanagepage.pt (modified) (2 diffs)
• templates/certificatepage.pt (modified) (2 diffs)

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

@@ -307 +307 @@
             return None          
 
+    @property
+    def course_cat_used(self):
+        if len(getUtility(IKofaUtils).COURSE_CATEGORY_DICT):
+            return True
+        return False
+
     def render(self):
         if self.isStudent() or self.isApplicant() or not self.isAuthenticated():

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

@@ -2561 +2561 @@
     @property
     def course_category_title(self):
-        return getUtility(IKofaUtils).COURSE_CATEGORY_DICT[
-            self.context.course_category]
+        cc = self.context.course_category
+        if cc:
+            return getUtility(IKofaUtils).COURSE_CATEGORY_DICT[cc]
+        return
 
 class CertificateCourseManageFormPage(KofaEditFormPage):

main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/certificatecoursepage.pt

@@ -27 +27 @@
       <td tal:content="view/leveltitle">LEVEL</td>
     </tr>
-    <tr>
+    <tr tal:condition="layout/course_cat_used">
       <td i18n:translate="">Course Category:</td>
       <td tal:content="view/course_category_title">NONE</td>

main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/certificatemanagepage.pt

@@ -41 +41 @@
             <th i18n:translate="">Dep. Course</th>
             <th i18n:translate="">Title</th>
+            <th i18n:translate="" tal:condition="layout/course_cat_used">Course Cat.</th>
             <th i18n:translate="">Required</th>
           </tr>
@@ -71 +72 @@
               <span tal:content="cc/course/title">
                 COURSE TITLE
+              </span>
+            </td>
+            <td tal:condition="layout/course_cat_used">
+              <span tal:content="cc/course_category">
+                   COURSE CAT
               </span>
             </td>

main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/certificatepage.pt

@@ -31 +31 @@
     <th i18n:translate="">Dep. Course</th>
     <th i18n:translate="">Title</th>
+    <th i18n:translate="" tal:condition="layout/course_cat_used">Course Cat.</th>
     <th i18n:translate="">Required</th>
   </tr>
@@ -58 +59 @@
       </span>
     </td>
+    <td tal:condition="layout/course_cat_used">
+      <span tal:content="cc/course_category">
+           COURSE CAT
+      </span>
+    </td>
     <td>
       <span tal:content="cc/mandatory">