Index: main/waeup.kofa/trunk/src/waeup/kofa/students/permissions.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/students/permissions.py	(revision 12836)
+++ main/waeup.kofa/trunk/src/waeup/kofa/students/permissions.py	(revision 12843)
@@ -29,7 +29,4 @@
     grok.name('waeup.viewStudent')
 
-class ViewStudentsTab(grok.Permission):
-    grok.name('waeup.viewStudentsTab')
-
 class ViewMyStudentDataTab(grok.Permission):
     grok.name('waeup.viewMyStudentDataTab')
@@ -59,7 +56,4 @@
     grok.name('waeup.editStudyLevel')
 
-class TriggerTransition(grok.Permission):
-    grok.name('waeup.triggerTransition')
-
 class LoginAsStudent(grok.Permission):
     grok.name('waeup.loginAsStudent')
@@ -69,7 +63,10 @@
     grok.name('waeup.local.StudentRecordOwner')
     grok.title(u'Student Record Owner')
-    grok.permissions('waeup.handleStudent', 'waeup.uploadStudentFile',
-                     'waeup.viewStudent', 'waeup.payStudent',
-                     'waeup.handleAccommodation', 'waeup.editStudyLevel')
+    grok.permissions('waeup.handleStudent',
+                     'waeup.uploadStudentFile',
+                     'waeup.viewStudent',
+                     'waeup.payStudent',
+                     'waeup.handleAccommodation',
+                     'waeup.editStudyLevel')
 
 # Site Roles
@@ -77,5 +74,6 @@
     grok.name('waeup.Student')
     grok.title(u'Student (do not assign)')
-    grok.permissions('waeup.viewAcademics', 'waeup.viewMyStudentDataTab',
+    grok.permissions('waeup.viewAcademics',
+                     'waeup.viewMyStudentDataTab',
                      'waeup.Authenticated')
 
@@ -83,14 +81,16 @@
     grok.name('waeup.StudentsOfficer')
     grok.title(u'Students Officer (view only)')
-    grok.permissions('waeup.viewStudent','waeup.viewStudents',
-          'waeup.viewStudentsTab', 'waeup.viewStudentsContainer')
+    grok.permissions('waeup.viewStudent',
+                     'waeup.viewStudentsContainer')
 
 class StudentsManager(grok.Role):
     grok.name('waeup.StudentsManager')
     grok.title(u'Students Manager')
-    grok.permissions('waeup.viewStudent', 'waeup.viewStudents',
-                     'waeup.manageStudent', 'waeup.viewStudentsContainer',
-                     'waeup.payStudent', 'waeup.uploadStudentFile',
-                     'waeup.viewStudentsTab', 'waeup.handleAccommodation')
+    grok.permissions('waeup.viewStudent',
+                     'waeup.manageStudent',
+                     'waeup.viewStudentsContainer',
+                     'waeup.payStudent',
+                     'waeup.uploadStudentFile',
+                     'waeup.handleAccommodation')
 
 class TranscriptOfficer(grok.Role):
@@ -100,6 +100,4 @@
                      'waeup.viewTranscript',
                      'waeup.viewStudent',
-                     'waeup.viewStudents',
-                     'waeup.viewStudentsTab',
                      'waeup.viewStudentsContainer',
                      )
@@ -108,10 +106,12 @@
     grok.name('waeup.StudentsClearanceOfficer')
     grok.title(u'Clearance Officer (all students)')
-    grok.permissions('waeup.clearStudent','waeup.viewStudent')
+    grok.permissions('waeup.clearStudent',
+                     'waeup.viewStudent')
 
 class StudentsCourseAdviser(grok.Role):
     grok.name('waeup.StudentsCourseAdviser')
     grok.title(u'Course Adviser (all students)')
-    grok.permissions('waeup.validateStudent','waeup.viewStudent',
+    grok.permissions('waeup.validateStudent',
+                     'waeup.viewStudent',
                      'waeup.editStudyLevel')
 
Index: main/waeup.kofa/trunk/src/waeup/kofa/students/viewlets.py
===================================================================
--- main/waeup.kofa/trunk/src/waeup/kofa/students/viewlets.py	(revision 12836)
+++ main/waeup.kofa/trunk/src/waeup/kofa/students/viewlets.py	(revision 12843)
@@ -717,5 +717,5 @@
     grok.context(IKofaObject)
     grok.order(4)
-    grok.require('waeup.viewStudentsTab')
+    grok.require('waeup.viewStudentsContainer')
     grok.name('studentstab')
 
