Fixed issue #17185: Template permissions deleted when editing global …

…permissions Dev: template didn't have entity_id
LimeSurvey · Mar 16, 2021 · 6b4e12c · 6b4e12c
1 parent 54d2ef6
commit 6b4e12c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/application/controllers/UserManagementController.php b/application/controllers/UserManagementController.php
@@ -1455,11 +1455,15 @@ public function generateAdminCreationEmail($fullname, $username, $password, $iNe
      */
     protected function applyPermissionFromArray($iUserId, $aPermissionArray)
     {
+        //Delete all current Permissions
         $oCriteria = new CDbCriteria();
         $oCriteria->compare('uid', $iUserId);
+        // without entity
         $oCriteria->compare('entity_id', 0);
-        //Delete all Permissions without entity.
+        // except for template entity (no entity_id is set here)
+        $oCriteria->compare('entity', "<>template");
         Permission::model()->deleteAll($oCriteria);
+
         $results = [];
         //Apply the permission array
         foreach ($aPermissionArray as $sPermissionKey => $aPermissionSettings) {