Fixed issue #17378: Missing button: can not set permissions for surve…

…y group - Fixed also on 'Add user', 'Delete user' and 'Add group users' - Also added the green title bar that was recently introduced on Survey Groups but was missing on some pages (so the context was not clear)
LimeSurvey · Jul 2, 2021 · fb70f9a · fb70f9a
1 parent 16525b4
commit fb70f9a
Showing 1 changed file with 45 additions and 18 deletions.
diff --git a/application/controllers/SurveysGroupsPermissionController.php b/application/controllers/SurveysGroupsPermissionController.php
@@ -156,6 +156,7 @@ public function actionIndex(int $id)
         $aData['fullpagebar'] = array(
             'closebutton' => array(
                 'url' => App()->createUrl('surveyAdministration/listsurveys', array('#' => 'surveygroups')),
+                'url_keep' => true,
             ),
         );
         $this->aData = $aData;
@@ -187,11 +188,16 @@ public function actionAddUser($id)
             'model' => $model
         );
         $aData['subview'] = 'addUserResult';
-        $aData['buttons'] = array(
-            'closebutton' => array(
-                'url' => App()->createUrl("SurveysGroupsPermission/index", array("id" => $id)),
-            ),
-        );
+
+        // Green Bar Page Title
+        $aData['pageTitle'] = 'Permission for group: ' . $model->title;
+
+        $aData['fullpagebar'] = [
+            'closebutton' => [
+                'url' => App()->createUrl("SurveysGroupsPermission/index", ["id" => $id]),
+                'url_keep' => true,
+            ],
+        ];
         $aData['aPermissionData'] = array(
             'result' => array(),
             'uid' => $uid,
@@ -210,6 +216,8 @@ public function actionAddUser($id)
         }
 
         $aData['aPermissionData']['result'] = $result;
+
+        $this->aData = $aData;
         App()->getController()->render('/SurveysGroupsPermission/index', $aData);
     }
 
@@ -238,11 +246,16 @@ public function actionAddUserGroup($id)
             'model' => $model
         );
         $aData['subview'] = 'addUserGroupResult';
-        $aData['buttons'] = array(
-            'closebutton' => array(
-                'url' => App()->createUrl("SurveysGroupsPermission/index", array("id" => $id)),
-            ),
-        );
+
+        // Green Bar Page Title
+        $aData['pageTitle'] = 'Permission for group: ' . $model->title;
+
+        $aData['fullpagebar'] = [
+            'closebutton' => [
+                'url' => App()->createUrl("SurveysGroupsPermission/index", ["id" => $id]),
+                'url_keep' => true,
+            ],
+        ];
         $aData['aPermissionData'] = array(
             'result' => array(),
             'ugid' => $ugid,
@@ -269,6 +282,7 @@ public function actionAddUserGroup($id)
         // Did we check something ? Some warning if group is empty for example ?
         $result['success'] = gT("User group added.");
         $aData['aPermissionData']['result'] = $result;
+        $this->aData = $aData;
         App()->getController()->render('/SurveysGroupsPermission/index', $aData);
     }
 
@@ -419,15 +433,21 @@ public function actionDeleteUser($id, $uid)
             'model' => $model
         );
         $aData['subview'] = 'deleteUserResult';
-        $aData['buttons'] = array(
-            'closebutton' => array(
-                'url' => App()->createUrl("SurveysGroupsPermission/index", array("id" => $id)),
-            ),
-        );
+
+        // Green Bar Page Title
+        $aData['pageTitle'] = 'Permission for group: ' . $model->title;
+
+        $aData['fullpagebar'] = [
+            'closebutton' => [
+                'url' => App()->createUrl("SurveysGroupsPermission/index", ["id" => $id]),
+                'url_keep' => true,
+            ],
+        ];
         $aData['aPermissionData'] = array(
             'model' => $model,
             'oUser' => $oUser,
         );
+        $this->aData = $aData;
         App()->getController()->render('/SurveysGroupsPermission/index', $aData);
     }
 
@@ -472,7 +492,8 @@ private function viewUserOrUserGroup($id, $to, $type = 'user')
         );
         $buttons = array(
             'closebutton' => array(
-                'url' => App()->createUrl('surveyAdministration/listsurveys', array('#' => 'surveygroups')),
+                'url' => App()->createUrl("SurveysGroupsPermission/index", ["id" => $id]),
+                'url_keep' => true,
             )
         );
         if ($model->hasPermission('permission', 'update')) {
@@ -484,15 +505,20 @@ private function viewUserOrUserGroup($id, $to, $type = 'user')
                     'form' => 'permissionsSave'
                 ),
                 'closebutton' => array(
-                    'url' => App()->createUrl('surveyAdministration/listsurveys', array('#' => 'surveygroups')),
+                    'url' => App()->createUrl("SurveysGroupsPermission/index", ["id" => $id]),
+                    'url_keep' => true,
                 )
             );
         }
         $aData = array(
             'model' => $model,
             'subview' => 'setPermissionForm',
-            'buttons' => $buttons
+            'fullpagebar' => $buttons
         );
+
+        // Green Bar Page Title
+        $aData['pageTitle'] = 'Permission for group: ' . $model->title;
+
         $aData['aPermissionData'] = array(
             'aPermissions' => $aPermissions,
             'model' => $model,
@@ -502,6 +528,7 @@ private function viewUserOrUserGroup($id, $to, $type = 'user')
             'oUser' => $oUser,
             'oUserGroup' => $oUserGroup,
         );
+        $this->aData = $aData;
         App()->getController()->render('/SurveysGroupsPermission/index', $aData);
     }