New feature #09442: Allow to save (not save and quit) in Plugin setti…

…ngs and global settings Dev: Add actual tab to url in #tabs Dev: Fix an notice in settingsWidget buttons Dev: TODO : same for survey settings
LimeSurvey · Jan 8, 2015 · 653ce2a · 653ce2a
1 parent bbf129d
commit 653ce2a
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 14 deletions.
diff --git a/application/controllers/PluginsController.php b/application/controllers/PluginsController.php
@@ -90,10 +90,9 @@ public function actionConfigure($id)
                 $aSave[$name] = App()->request->getPost($name, null);
             }
             $oPluginObject->saveSettings($aSave);
-
-            if(App()->request->getPost('redirect'))
+            Yii::app()->user->setFlash('pluginmanager', 'Settings saved');
+            if(!is_null(App()->request->getPost('redirect')))
             {
-                Yii::app()->user->setFlash('pluginmanager', 'Settings saved');
                 $this->forward('plugins/index', true);
             }
         }

diff --git a/application/controllers/admin/globalsettings.php b/application/controllers/admin/globalsettings.php
@@ -73,7 +73,9 @@ private function _displaySettings()
                              'admin/user/setusertemplates'=>'admin/user/sa/index'
                             );
         $refurl= str_replace(array_keys($aReplacements),array_values($aReplacements),$refurl);
-        Yii::app()->session['refurl'] = htmlspecialchars($refurl); //just to be safe!
+        // Don't update refurl is it's globalsetting
+        if(strpos($refurl,'globalsettings')===false)
+            Yii::app()->session['refurl'] = htmlspecialchars($refurl); //just to be safe!
 
         $data['title'] = "hi";
         $data['message'] = "message";
@@ -110,11 +112,13 @@ private function _displaySettings()
 
     private function _saveSettings()
     {
-        if (App()->request->getPost('action') !== "globalsettingssave") {
+        if (App()->request->getPost('action') !== "save" && App()->request->getPost('action') !== "savequit") // Why not use App()->request->isPostRequest ?
+        {
             return;
         }
 
-        if (!Permission::model()->hasGlobalPermission('settings','update')) {
+        if (!Permission::model()->hasGlobalPermission('settings','update'))
+        {
             $this->getController()->redirect(array('/admin'));
         }
         Yii::app()->loadHelper('surveytranslator');
@@ -226,9 +230,14 @@ private function _saveSettings()
         setGlobalSetting('usercontrolSameGroupPolicy', strip_tags(App()->request->getPost('usercontrolSameGroupPolicy')));
 
         Yii::app()->setFlashMessage(gT("Global settings were saved."));
-
-        $url = htmlspecialchars_decode(Yii::app()->session['refurl']);
-        if($url){Yii::app()->getController()->redirect($url);}
+        if(App()->request->getPost('action') == "savequit")
+        {
+            $url = htmlspecialchars_decode(Yii::app()->session['refurl']);
+            if($url)
+            {
+                Yii::app()->getController()->redirect($url);
+            }
+        }
     }
 
     private function _checkSettings()

diff --git a/application/extensions/SettingsWidget/SettingsWidget.php b/application/extensions/SettingsWidget/SettingsWidget.php
@@ -77,9 +77,9 @@ protected function renderButton($label, $htmlOptions)
             $htmlOptions['class'] = isset($htmlOptions['class']) ? $htmlOptions['class'] . " btn" : 'btn';
             if (isset($htmlOptions['type']) && $htmlOptions['type'] == 'link')
             {
-                $htmlOptions['class'] = isset($htmlOptions['class']) ? $htmlOptions['class'] . " btn-link button" : 'btn-link button';
-                //echo CHtml::link($label,$htmlOptions['href'],$htmlOptions); // This allow cancel without js
-                echo CHtml::linkButton($label,$htmlOptions);
+                $htmlOptions['class'] = $htmlOptions['class'] . " btn-link button";
+                echo CHtml::link($label,$htmlOptions['href'],$htmlOptions); // This allow cancel without js
+                //echo CHtml::linkButton($label,$htmlOptions);
             }
             elseif(isset($htmlOptions['type']))
             {
@@ -96,6 +96,11 @@ protected function renderButtons()
             echo CHtml::openTag('div', array('class' => 'buttons control-group'));
             foreach ($this->buttons as $label => $htmlOptions)
             {
+                if (is_string($htmlOptions))
+                {
+                    $label = $htmlOptions;
+                    $htmlOptions = array();
+                }
                 $htmlOptions['class'] = isset($htmlOptions['class']) ? $htmlOptions['class'] . " inline" : 'inline';
                 $this->renderButton($label, $htmlOptions);
             }

diff --git a/application/views/admin/globalSettings_view.php b/application/views/admin/globalSettings_view.php
@@ -350,7 +350,12 @@
         </div>
         <input type='hidden' name='restrictToLanguages' id='restrictToLanguages' value='<?php implode(' ',$restrictToLanguages); ?>'/>
         <div class="hidden hide" id="submitglobalbutton">
-            <p><button type="submit" name="action" value='globalsettingssave'><?php eT("Save"); ?></button></p>
+            <p>
+                <?php if(Yii::app()->session['refurl']) { ?>
+                <button type="submit" name="action" value='savequit'><?php eT("Save and quit"); ?></button>
+                <?php } ?>
+                <button type="submit" name="action" value='save'><?php eT("Save"); ?></button>
+            </p>
         </div>
     </form>
 

diff --git a/application/views/plugins/configure.php b/application/views/plugins/configure.php
@@ -12,6 +12,11 @@
         'method' => 'post',
         'buttons' => array(
             gT('Save plugin settings'),
+            gT('Save and return to plugins list')=>array(
+                'type'=>'submit',
+                'name'=>'redirect',
+                'value'=>App()->createUrl('plugins/index'), // This allow to use App()->request->getPost('redirect')) for forward (not used actually)
+            ),
             gT('Cancel') => array(
                 'type' => 'link',
                 'href' => App()->createUrl('plugins/index')

diff --git a/scripts/admin/admin_core.js b/scripts/admin/admin_core.js
@@ -87,7 +87,16 @@ $(document).ready(function(){
     $('#MaximizeGroupWindow').click(function(){
         $('#groupdetails').show();
     });
-    $('#tabs').tabs();
+    $('#tabs').tabs({
+        activate: function(event, ui) {
+            if(history.pushState) {
+                history.pushState(null, null, '#'+ui.newPanel.attr('id'));
+            }
+            else {
+                location.hash = ui.newPanel.attr('id');
+            }
+        }
+    });
     $('.tab-nav').tabs();
     $(".flashmessage").each(function() {
         $(this).notify().notify('create','themeroller',{},{custom:true,

diff --git a/scripts/admin/globalsettings.js b/scripts/admin/globalsettings.js
@@ -1,6 +1,9 @@
 $(document).on('click',"[data-copy] :submit",function(){
     $("form :input[value='"+$(this).val()+"']").click();
 });
+$(document).on('submit',"#frmglobalsettings",function(){
+    $('#frmglobalsettings').attr('action',$('#frmglobalsettings').attr('action')+location.hash);// Maybe validate before ?
+});
 $(document).ready(function(){
     $("[data-copy]").each(function(){
         $(this).html($("#"+$(this).data('copy')).html());