Index: /main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/viewlets.py
===================================================================
--- /main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/viewlets.py	(revision 10021)
+++ /main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/students/viewlets.py	(revision 10022)
@@ -18,4 +18,6 @@
 
 import grok
+from zope.component import getUtility
+from waeup.kofa.students.interfaces import IStudentsUtils
 from waeup.kofa.students.viewlets import (
     FileDisplay, FileUpload, Image)
@@ -23,4 +25,13 @@
 
 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,8 +200,5 @@
     @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,8 +288,5 @@
     @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,8 +320,5 @@
     @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,8 +436,5 @@
     @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,8 +468,5 @@
     @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,8 +528,5 @@
     @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):
