Changeset 10022

Timestamp:

13 Mar 2013, 06:25:17 (12 years ago)

Author:

Henrik Bettermann

Message:

show_viewlet must take the new SKIP_UPLOAD_VIEWLETS list into consideration.

File:

• main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/viewlets.py (modified) (8 diffs)

main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/viewlets.py

@@ -18 +18 @@
 
 import grok
+from zope.component import getUtility
+from waeup.kofa.students.interfaces import IStudentsUtils
 from waeup.kofa.students.viewlets import (
     FileDisplay, FileUpload, Image)
@@ -23 +25 @@
 
 from kofacustom.nigeria.interfaces import MessageFactory as _
+
+def show_viewlet(viewlet):
+    students_utils = getUtility(IStudentsUtils)
+    if viewlet.__name__ in students_utils.SKIP_UPLOAD_VIEWLETS:
+        return False
+    cm = getattr(viewlet.context,'current_mode', None)
+    if cm is not None and cm.startswith('pg'):
+        return True
+    return False
 
 # Acceptance Letter
@@ -189 +200 @@
     @property
     def show_viewlet(self):
-        cm = getattr(self.context,'current_mode', None)
-        if cm is not None and cm.startswith('pg'):
-            return True
-        return False
+        return show_viewlet(self)
 
 class SecondHigherQualificationResultImage(Image):
@@ -280 +288 @@
     @property
     def show_viewlet(self):
-        cm = getattr(self.context,'current_mode', None)
-        if cm is not None and cm.startswith('pg'):
-            return True
-        return False
+        return show_viewlet(self)
 
 class SecondCertificateImage(Image):
@@ -315 +320 @@
     @property
     def show_viewlet(self):
-        cm = getattr(self.context,'current_mode', None)
-        if cm is not None and cm.startswith('pg'):
-            return True
-        return False
+        return show_viewlet(self)
 
 class ThirdCertificateImage(Image):
@@ -434 +436 @@
     @property
     def show_viewlet(self):
-        cm = getattr(self.context,'current_mode', None)
-        if cm is not None and cm.startswith('pg'):
-            return True
-        return False
+        return show_viewlet(self)
 
 class SecondRefereeLetterImage(Image):
@@ -469 +468 @@
     @property
     def show_viewlet(self):
-        cm = getattr(self.context,'current_mode', None)
-        if cm is not None and cm.startswith('pg'):
-            return True
-        return False
+        return show_viewlet(self)
 
 class ThirdRefereeLetterImage(Image):
@@ -532 +528 @@
     @property
     def show_viewlet(self):
-        cm = getattr(self.context,'current_mode', None)
-        if cm is not None and cm.startswith('pg'):
-            return True
-        return False
+        return show_viewlet(self)
 
 class LetterAdmissionImage(Image):