Fixed issue: Inherit option not editable on survey edit and in survey…

… create view
LimeSurvey · Jan 20, 2020 · fc0dab7 · fc0dab7
1 parent 45e04fe
commit fc0dab7
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 11 deletions.
diff --git a/application/views/admin/survey/editLocalSettings_main_view.php b/application/views/admin/survey/editLocalSettings_main_view.php
@@ -64,8 +64,8 @@
   </div>
   <!-- END editLocalSettings -->
   <?php
-Yii::app()->getClientScript()->registerScript( "editLocalSettings_submit_".$entryData['name'], "
 
+Yii::app()->getClientScript()->registerScript( "editLocalSettings_submit_".$entryData['name'], "
 window.LS.unrenderBootstrapSwitch();
 window.LS.renderBootstrapSwitch();
 
@@ -99,6 +99,7 @@
     var parent = $(this).parent().parent();
     var inheritValue = parent.find('.inherit-edit').data('inherit-value');
     var savedValue = parent.find('.inherit-edit').data('saved-value');
+
     if (newValue == 'Y'){
         parent.find('.inherit-edit').addClass('hide').removeClass('show').val(inheritValue);
         parent.find('.inherit-readonly').addClass('show').removeClass('hide');

diff --git a/application/views/admin/survey/subview/accordion/_generaloptions_panel.php b/application/views/admin/survey/subview/accordion/_generaloptions_panel.php
@@ -356,4 +356,4 @@ function checkSelect2Languages(mylangs) {
 
         </div>
     </div>
-</div>
+</div>
diff --git a/application/views/admin/survey/subview/tabCreate_view.php b/application/views/admin/survey/subview/tabCreate_view.php
@@ -140,7 +140,29 @@
                 $('#save-form-button').removeClass('disabled');
                 $('#save-and-close-form-button').removeClass('disabled');
             }
+
+            $('.text-option-inherit').on('change', function(e){
+                var newValue = $(this).find('.btn.active input').val();
+                var parent = $(this).parent().parent();
+                var inheritValue = parent.find('.inherit-edit').data('inherit-value');
+                var savedValue = parent.find('.inherit-edit').data('saved-value');
+                console.log({
+                newValue: newValue,
+                parent: parent,
+                inheritValue: inheritValue,
+                savedValue: savedValue
+                })
+                if (newValue == 'Y'){
+                    parent.find('.inherit-edit').addClass('hide').removeClass('show').val(inheritValue);
+                    parent.find('.inherit-readonly').addClass('show').removeClass('hide');
+                } else {
+                    var inputValue = (savedValue === inheritValue) ? "" : savedValue;
+                    parent.find('.inherit-edit').addClass('show').removeClass('hide').val(inputValue);
+                    parent.find('.inherit-readonly').addClass('hide').removeClass('show');
+                }
+            });
         });
+
         $('#addnewsurvey').on('submit',  function(event){
             event.preventDefault();
             var form = this;

diff --git a/application/views/admin/surveysgroups/surveySettings.php b/application/views/admin/surveysgroups/surveySettings.php
@@ -106,24 +106,40 @@
         </div>
     </div>
 </div>
-<script>
+
+<?php
+Yii::app()->getClientScript()->registerScript( "editLocalSettings_submit", "
+
     window.LS.unrenderBootstrapSwitch();
     window.LS.renderBootstrapSwitch();
 
     $('#surveySettings a').click(function (e) {
         window.location.hash = $(this).attr('href');
         e.preventDefault();
-        $("#survey-settings-options-form").attr('action',' <?php echo Yii::app()->getController()->createUrl('/admin/surveysgroups/sa/surveysettings/id/'.$oSurvey->gsid) ?>'+window.location.hash);
+        $('#survey-settings-options-form').attr('action',' ".Yii::app()->getController()->createUrl('/admin/surveysgroups/sa/surveysettings/id/'.$oSurvey->gsid)."'+window.location.hash);
         $(this).tab('show');       
     });
 
-
-    $(document).on('ready pjax:scriptcomplete', function(){
-        if(window.location.hash){
-            $('#surveySettings').find('a[href='+window.location.hash+']').trigger('click');
+    $('.text-option-inherit').on('change', function(e){
+        var newValue = $(this).find('.btn.active input').val();
+        var parent = $(this).parent().parent();
+        var inheritValue = parent.find('.inherit-edit').data('inherit-value');
+        var savedValue = parent.find('.inherit-edit').data('saved-value');
+
+        if (newValue == 'Y'){
+            parent.find('.inherit-edit').addClass('hide').removeClass('show').val(inheritValue);
+            parent.find('.inherit-readonly').addClass('show').removeClass('hide');
+        } else {
+            var inputValue = (savedValue === inheritValue) ? \"\" : savedValue;
+            parent.find('.inherit-edit').addClass('show').removeClass('hide').val(inputValue);
+            parent.find('.inherit-readonly').addClass('hide').removeClass('show');
         }
+    });
 
-        $('#save-form-button, #save-and-close-form-button').attr('data-form-id', 'survey-settings-options-form');
+    if(window.location.hash){
+        $('#surveySettings').find('a[href='+window.location.hash+']').trigger('click');
+    }
+    $('#save-form-button, #save-and-close-form-button').attr('data-form-id', 'survey-settings-options-form');
 
-    })
-</script>
+", LSYii_ClientScript::POS_POSTSCRIPT);
+?>