Index: /main/waeup.ikoba/trunk/src/waeup/ikoba/customers/files.py
===================================================================
--- /main/waeup.ikoba/trunk/src/waeup/ikoba/customers/files.py	(revision 11987)
+++ /main/waeup.ikoba/trunk/src/waeup/ikoba/customers/files.py	(revision 11988)
@@ -181,37 +181,4 @@
 
 
-class PassportDisplay(FileDisplay):
-    """Passport display viewlet.
-    """
-    grok.order(1)
-    grok.context(ICustomer)
-    grok.view(CustomerBaseDisplayFormPage)
-    grok.require('waeup.viewCustomer')
-    grok.template('imagedisplay')
-    label = _(u'Passport Picture')
-    download_name = u'passport.jpg'
-
-
-class PassportUploadManage(FileUpload):
-    """Passport upload viewlet for officers.
-    """
-    grok.order(1)
-    grok.context(ICustomer)
-    grok.view(CustomerBaseManageFormPage)
-    grok.require('waeup.manageCustomer')
-    grok.template('imageupload')
-    label = _(u'Passport Picture (jpg only)')
-    mus = 1024 * 50
-    download_name = u'passport.jpg'
-    tab_redirect = '#tab2'
-
-
-class PassportUploadEdit(PassportUploadManage):
-    """Passport upload viewlet for customers.
-    """
-    grok.view(CustomerFilesUploadPage)
-    grok.require('waeup.uploadCustomerFile')
-
-
 class Image(grok.View):
     """Renders images for customers.
@@ -219,6 +186,4 @@
     grok.baseclass()
     grok.name('none.jpg')
-    grok.context(ICustomer)
-    grok.require('waeup.viewCustomer')
     download_name = u'none.jpg'
 
@@ -245,4 +210,38 @@
         return image
 
+# File viewlets for customer base page
+
+class PassportDisplay(FileDisplay):
+    """Passport display viewlet.
+    """
+    grok.order(1)
+    grok.context(ICustomer)
+    grok.view(CustomerBaseDisplayFormPage)
+    grok.require('waeup.viewCustomer')
+    grok.template('imagedisplay')
+    label = _(u'Passport Picture')
+    download_name = u'passport.jpg'
+
+
+class PassportUploadManage(FileUpload):
+    """Passport upload viewlet for officers.
+    """
+    grok.order(1)
+    grok.context(ICustomer)
+    grok.view(CustomerBaseManageFormPage)
+    grok.require('waeup.manageCustomer')
+    grok.template('imageupload')
+    label = _(u'Passport Picture (jpg only)')
+    mus = 1024 * 50
+    download_name = u'passport.jpg'
+    tab_redirect = '#tab2'
+
+
+class PassportUploadEdit(PassportUploadManage):
+    """Passport upload viewlet for customers.
+    """
+    grok.view(CustomerFilesUploadPage)
+    grok.require('waeup.uploadCustomerFile')
+
 
 class Passport(Image):
@@ -252,2 +251,5 @@
     download_name = u'passport.jpg'
     grok.context(ICustomer)
+    grok.require('waeup.viewCustomer')
+
+# File viewlets for customer documents
