Dev: global permissions for surveymenu entires

LimeSurvey · Nov 12, 2018 · 8c944b4 · 8c944b4
1 parent 758748d
commit 8c944b4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/application/core/plugins/GroupSpecificActivation b/application/core/plugins/GroupSpecificActivation
diff --git a/application/models/Permission.php b/application/models/Permission.php
@@ -744,7 +744,7 @@ protected function getOwnerId($iEntityID, $sEntityName)
     }
 
     public static function getPermissionList(){
-        $aPermissions = self::getSurveyBasePermissions();
+        $aPermissions = array_merge(self::getSurveyBasePermissions(),self::getGlobalBasePermissions());
         return array_map(function($aPermission){
             return $aPermission['title'];
         }, $aPermissions);

diff --git a/application/models/Survey.php b/application/models/Survey.php
@@ -799,10 +799,17 @@ private function _createSurveymenuArray($oSurveyMenuObjects, $collapsed=false)
                 }
 
                 //Skip menu if no permission
-                if ((!empty($aEntry['permission']) && !empty($aEntry['permission_grade'])
-                    && !Permission::model()->hasSurveyPermission($this->sid, $aEntry['permission'], $aEntry['permission_grade']))
-                ) {
-                    continue;
+                 if (!empty($aEntry['permission']) && !empty($aEntry['permission_grade'])){
+                     $inArray = array_search($aEntry['permission'],array_keys(Permission::getGlobalBasePermissions()));
+                    if($inArray) {
+                        $hasPermission = Permission::model()->hasGlobalPermission($aEntry['permission'], $aEntry['permission_grade']);
+                    } else {
+                        $hasPermission = Permission::model()->hasSurveyPermission($this->sid, $aEntry['permission'], $aEntry['permission_grade']);
+                    }
+
+                    if(!$hasPermission) {
+                        continue;
+                    }
                 }
 
                 // Check if a specific user owns this menu.