Index: /main/waeup.kofa/trunk/src/waeup/kofa/permissions.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/permissions.py	(revision 9258)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/permissions.py	(revision 9259)
@@ -196,13 +196,16 @@
     grok.name('waeup.UsersManager')
     grok.title(u'Users Manager')
-    grok.permissions('waeup.manageUsers')
+    grok.permissions('waeup.manageUsers',
+                     'waeup.editUser')
 
 class PortalManager(grok.Role):
     grok.name('waeup.PortalManager')
     grok.title(u'Portal Manager')
-    grok.permissions('waeup.managePortal', 'waeup.manageUsers',
+    grok.permissions('waeup.managePortal',
+                     'waeup.manageUsers',
                      'waeup.viewAcademics', 'waeup.manageAcademics',
                      'waeup.manageACBatches',
-                     'waeup.manageDataCenter', 'waeup.importData',
+                     'waeup.manageDataCenter',
+                     'waeup.importData',
                      'waeup.managePortalConfiguration', 'waeup.viewApplication',
                      'waeup.manageApplication', 'waeup.handleApplication',
@@ -216,4 +219,29 @@
                      'waeup.viewHostels', 'waeup.manageHostels',
                      'waeup.editUser'
+                     )
+
+class CCOfficer(grok.Role):
+    """The Computer Center Officer gets the same permissions as the
+    Portal Manager except the most dangerous ones.
+    """
+    grok.name('waeup.CCOfficer')
+    grok.title(u'Computer Center Officer')
+    grok.permissions(#'waeup.managePortal',
+                     #'waeup.manageUsers',
+                     'waeup.viewAcademics', 'waeup.manageAcademics',
+                     #'waeup.manageACBatches',
+                     'waeup.manageDataCenter',
+                     #'waeup.importData',
+                     'waeup.managePortalConfiguration', 'waeup.viewApplication',
+                     'waeup.manageApplication', 'waeup.handleApplication',
+                     'waeup.viewApplicantsTab', 'waeup.payApplicant',
+                     'waeup.viewApplicationStatistics',
+                     'waeup.viewStudent', 'waeup.manageStudent',
+                     'waeup.clearStudent', 'waeup.payStudent',
+                     'waeup.uploadStudentFile', 'waeup.showStudents',
+                     'waeup.viewStudentsContainer','waeup.viewStudentsTab',
+                     'waeup.handleAccommodation',
+                     'waeup.viewHostels', 'waeup.manageHostels',
+                     #'waeup.editUser'
                      )
 
Index: /main/waeup.kofa/trunk/src/waeup/kofa/permissions.txt
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/permissions.txt	(revision 9258)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/permissions.txt	(revision 9259)
@@ -39,8 +39,8 @@
     >>> from waeup.kofa.permissions import get_waeup_roles
     >>> len(list(get_waeup_roles()))
-    15
+    16
 
     >>> len(list(get_waeup_roles(also_local=True)))
-    29
+    30
 
 
@@ -59,4 +59,5 @@
      u'waeup.Applicant',
      u'waeup.ApplicationsOfficer',
+     u'waeup.CCOfficer',
      u'waeup.DataCenterManager',
      u'waeup.ImportManager',
