Index: /main/waeup.uniben/trunk/src/waeup/uniben/students/browser.py
===================================================================
--- /main/waeup.uniben/trunk/src/waeup/uniben/students/browser.py	(revision 17806)
+++ /main/waeup.uniben/trunk/src/waeup/uniben/students/browser.py	(revision 17807)
@@ -874,18 +874,4 @@
     form_fields['email'].field.required = True
 
-class CustomStudentFilesUploadPage(NigeriaStudentFilesUploadPage):
-    """ View to upload passport picture.
-    """
-
-    def update(self):
-        # Postgrad students should allowed to change their picture whenever they want.
-        if self.context.is_postgrad:
-            return
-        if self.context.is_jupeb:
-            emit_lock_message(self)
-            return            
-        super(StudentFilesUploadPage, self).update()
-        return
-
 
 
Index: /main/waeup.uniben/trunk/src/waeup/uniben/students/utils.py
===================================================================
--- /main/waeup.uniben/trunk/src/waeup/uniben/students/utils.py	(revision 17806)
+++ /main/waeup.uniben/trunk/src/waeup/uniben/students/utils.py	(revision 17807)
@@ -817,5 +817,14 @@
     #: A tuple containing the names of registration states in which changing of
     #: passport pictures is allowed.
-    PORTRAIT_CHANGE_STATES = (CLEARANCE, REQUESTED)
+    PORTRAIT_CHANGE_STATES = (CLEARANCE, ADMITTED)
+
+    def allowPortraitChange(self, student):
+        """Check if student is allowed to change the portrait file.
+        """
+        if student.is_jupeb:
+            return False
+        if student.state not in self.PORTRAIT_CHANGE_STATES:
+            return False
+        return True
 
     #: A tuple containing the names of registration states in which changing of
Index: /main/waeup.uniben/trunk/src/waeup/uniben/students/viewlets.py
===================================================================
--- /main/waeup.uniben/trunk/src/waeup/uniben/students/viewlets.py	(revision 17806)
+++ /main/waeup.uniben/trunk/src/waeup/uniben/students/viewlets.py	(revision 17807)
@@ -53,14 +53,4 @@
     grok.require('waeup.viewStudent')
 
-class StudentPassportActionButton(StudentPassportActionButton):
-
-    @property
-    def target_url(self):
-        if self.context.is_jupeb:
-            return ''
-        PORTRAIT_CHANGE_STATES = getUtility(IStudentsUtils).PORTRAIT_CHANGE_STATES
-        if self.context.state not in PORTRAIT_CHANGE_STATES and not self.context.is_postgrad:
-            return ''
-        return self.view.url(self.view.context, self.target)
 
 class SwitchLibraryAccessActionButton(ManageActionButton):
