Index: /main/waeup.kofa/trunk/CHANGES.txt
===================================================================
--- /main/waeup.kofa/trunk/CHANGES.txt	(revision 16670)
+++ /main/waeup.kofa/trunk/CHANGES.txt	(revision 16671)
@@ -4,4 +4,6 @@
 1.7.2.dev0 (unreleased)
 =======================
+
+* Ease customization of portrait upload conditions.
 
 * `OutstandingCoursesExporter`: Remove passed courses from outstanding
Index: /main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py	(revision 16670)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/students/browser.py	(revision 16671)
@@ -2935,6 +2935,5 @@
 
     def update(self):
-        PORTRAIT_CHANGE_STATES = getUtility(IStudentsUtils).PORTRAIT_CHANGE_STATES
-        if self.context.student.state not in PORTRAIT_CHANGE_STATES:
+        if not getUtility(IStudentsUtils).allowPortraitChange(self.context):
             emit_lock_message(self,
                 _('This form is locked. You are in the wrong state.'))
Index: /main/waeup.kofa/trunk/src/waeup/kofa/students/interfaces.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/students/interfaces.py	(revision 16670)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/students/interfaces.py	(revision 16671)
@@ -104,4 +104,8 @@
         """
 
+    def allowPortraitChange(student):
+        """Check if student is allowed to change the portrait file.
+        """
+
     def setMatricNumber(student):
         """Set matriculation number of student.
Index: /main/waeup.kofa/trunk/src/waeup/kofa/students/utils.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/students/utils.py	(revision 16670)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/students/utils.py	(revision 16671)
@@ -610,4 +610,11 @@
         return None, matric_number
 
+    def allowPortraitChange(self, student):
+        """Check if student is allowed to change the portrait file.
+        """
+        if student.state not in self.PORTRAIT_CHANGE_STATES:
+            return False
+        return True
+
     def getAccommodationDetails(self, student):
         """Determine the accommodation data of a student.
Index: /main/waeup.kofa/trunk/src/waeup/kofa/students/viewlets.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/students/viewlets.py	(revision 16670)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/students/viewlets.py	(revision 16671)
@@ -617,7 +617,5 @@
     @property
     def target_url(self):
-        PORTRAIT_CHANGE_STATES = getUtility(
-            IStudentsUtils).PORTRAIT_CHANGE_STATES
-        if self.context.state not in PORTRAIT_CHANGE_STATES:
+        if not getUtility(IStudentsUtils).allowPortraitChange(self.context):
             return ''
         return self.view.url(self.view.context, self.target)
