Fixed issue #10472: design: add "save and close" button

LimeSurvey · Mar 9, 2016 · efc6c25 · efc6c25
1 parent ba6fd9d
commit efc6c25
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/application/controllers/admin/useraction.php b/application/controllers/admin/useraction.php
@@ -666,10 +666,18 @@ function personalsettings()
         $aData['sSavedLanguage'] = $user->lang;
 
         $aData['fullpagebar']['savebutton']['form'] = 'personalsettings';
+        $aData['fullpagebar']['saveandclosebutton']['form'] = 'personalsettings';
         $aData['fullpagebar']['closebutton']['url'] = 'admin/survey/sa/index';  // Close button
 
         // Render personal settings view
-        $this->_renderWrappedTemplate('user', 'personalsettings', $aData);
+        if (isset($_POST['saveandclose']))
+        {
+            $this->getController()->redirect(array("admin/user/sa/index"));
+        }
+        else
+        {
+            $this->_renderWrappedTemplate('user', 'personalsettings', $aData);
+        }
     }
 
     private function _getUserNameFromUid($uid)

diff --git a/styles/Sea_Green/scripts/save.js b/styles/Sea_Green/scripts/save.js
@@ -25,6 +25,7 @@ if ($('#save-and-close-form-button').length>0){
             value: '1'
         }).appendTo($form);
 
+
         $form.find('[type="submit"]').trigger('click');
         return false;
     });