remove Einrichtungsbezogener Evaluationsadmin

2 files changed, 4 insertions, 8 deletions

diff --git a/db/migrations/6.3.1_central_evaluations.php b/db/migrations/6.3.1_central_evaluations.php
index 673585a..03d0067 100644
--- a/db/migrations/6.3.1_central_evaluations.php
+++ b/db/migrations/6.3.1_central_evaluations.php
@@ -5,7 +5,7 @@ class CentralEvaluations extends Migration
 {
     public function description()
     {
-        return 'Adds new roles (Zentraler Evaluationsadmin, Einrichtungsbezogener Evaluationsadmin) and the possibility of evaluation courses with questionnaires.';
+        return 'Adds new role (Zentraler Evaluationsadmin) and functionality for evaluating courses.';
     }
 
     protected function up()
@@ -67,8 +67,7 @@ class CentralEvaluations extends Migration
 
         DBManager::get()->exec("
             INSERT INTO `roles` (`rolename`, `system`)
-            VALUES ('Zentraler Evaluationsadmin', 'n'),
-            ('Einrichtungsbezogener Evaluationsadmin', 'n')
+            VALUES ('Zentraler Evaluationsadmin', 'n')
         ");
 
         DBManager::get()->exec("INSERT INTO plugins (pluginclassname, pluginname, plugintype, enabled, navigationpos)
@@ -170,8 +169,7 @@ class CentralEvaluations extends Migration
 
         DBManager::get()->exec("
             DELETE FROM `roles`
-            WHERE (`rolename` = 'Zentraler Evaluationsadmin' OR `rolename` = 'Einrichtungsbezogener Evaluationsadmin')
-                AND `system` = 'n'
+            WHERE `rolename` = 'Zentraler Evaluationsadmin' AND `system` = 'n'
         ");
 
         DBManager::get()->exec("
diff --git a/lib/models/Questionnaire.php b/lib/models/Questionnaire.php
index 0f97280..0372c46 100644
--- a/lib/models/Questionnaire.php
+++ b/lib/models/Questionnaire.php
@@ -268,9 +268,7 @@ class Questionnaire extends SimpleORMap implements PrivacyObject
 
         if ($this->eval_assignment) {
             $user = User::findCurrent();
-            if ($user->hasPermissionLevel('root')
-                || $user->hasRole('Zentraler Evaluationsadmin')
-                || $user->hasRole('Einrichtungsbezogener Evaluationsadmin', Course::findCurrent()->institut_id)) {
+            if ($user->hasPermissionLevel('root') || $user->hasRole('Zentraler Evaluationsadmin')) {
                 return true;
             }