Dev: fixed Panelintegration still todo-> not saving correctly

LimeSurvey · Oct 10, 2017 · 706b56d · 706b56d
1 parent c6eb5b5
commit 706b56d
Show file tree

Hide file tree

Showing 17 changed files with 4,077 additions and 3,348 deletions.
diff --git a/application/config/packages.php b/application/config/packages.php
@@ -147,12 +147,11 @@
         ),
         'css' => array(
             'build/lsadminpanel.css'
-            )
         ),
         'depends' => array(
             'pjax',
             'jquery'
         )
-          
+    )
 
 );
diff --git a/application/config/version.php b/application/config/version.php
@@ -14,7 +14,7 @@
 
 $config['versionnumber'] = '3.0.0-beta.3'; //The current version of this branch
 $config['masterversion'] = '2.67.3'; //The current masters version merged into this branch
-$config['dbversionnumber'] = 318;
+$config['dbversionnumber'] = 319;
 $config['buildnumber'] = '';
 $config['updatable'] = true;
 $config['assetsversionnumber'] = '2903';

diff --git a/application/controllers/admin/database.php b/application/controllers/admin/database.php
diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php
@@ -932,13 +932,11 @@ public function rendersidemenulink($iSurveyID, $subaction){
             $this->getController()->redirect(array('admin/survey','sa'=>'view','surveyid'=>$iSurveyID));
             Yii::app()->end();
         }
+
+        $templateData = is_array($menuEntry->data) ? $menuEntry->data : [];
 
-        if( empty($menuEntry->data)) {
-            $templateData = call_user_func_array(array($this,$menuEntry->getdatamethod), array('survey'=>$survey));
-        }
-        else
-        {
-            $templateData = $menuEntry->data;
+        if( !empty($menuEntry->getdatamethod)) {
+            $templateData = array_merge($templateData, call_user_func_array(array($this,$menuEntry->getdatamethod), array('survey'=>$survey)));
         }
 
         $templateData = array_merge($this->_getGeneralTemplateData($iSurveyID), $templateData);
@@ -1761,6 +1759,8 @@ private function _tabTokens($esrow)
      */
     private function _tabPanelIntegration($survey)
     {
+
+        App()->getClientScript()->registerPackage('jquery-datatable');
         $aData = array();
         $oResult = Question::model()->getQuestionsWithSubQuestions($survey->sid, $survey->language, "({{questions}}.type = 'T'  OR  {{questions}}.type = 'Q'  OR  {{questions}}.type = 'T' OR {{questions}}.type = 'S')");
         $aData['questions'] = $oResult;

diff --git a/application/helpers/update/updatedb_helper.php b/application/helpers/update/updatedb_helper.php
@@ -473,6 +473,17 @@ function db_upgrade_all($iOldDBVersion, $bSilent=false) {
         $oDB->createCommand()->update('{{settings_global}}',array('stg_value'=>318),"stg_name='DBVersion'");
         $oTransaction->commit();
     }
+
+    //force panelintegration to a full reload
+
+    if ($iOldDBVersion < 319) {
+        $oTransaction = $oDB->beginTransaction();
+
+        $oDB->createCommand()->update('{{surveymenu_entries}}',array('data'=>'{"render": {"link": { "pjaxed": false}}}'),"name='panelintegration'");
+
+        $oDB->createCommand()->update('{{settings_global}}',array('stg_value'=>319),"stg_name='DBVersion'");
+        $oTransaction->commit();
+    }
 
 
 

diff --git a/application/models/SurveymenuEntries.php b/application/models/SurveymenuEntries.php
@@ -114,11 +114,11 @@ public static function reorderMenu($menuId){
 		$menuEntriesInMenu = SurveymenuEntries::model()->findAll($criteriaItems);
 
 		$statistics =
-		Yii::app()->db->createCommand()->select('MIN(ordering) as lowOrder, MAX(ordering) as highOrder, COUNT(id) as count')
+		Yii::app()->db->createCommand()->select('MIN(ordering) as loworder, MAX(ordering) as highorder, COUNT(id) as count')
 				->from('{{surveymenu_entries}}')
 				->where(['menu_id = :menu_id'],['menu_id' => (int) $menuId])
-				->queryRow();
-		if( ($statistics['lowOrder'] != 1) || ($statistics['highOrder'] != $statistics['count']) ){
+                ->queryRow();
+		if( ($statistics['loworder'] != 1) || ($statistics['highorder'] != $statistics['count']) ){
 			$current = 1;
 			foreach($menuEntriesInMenu as $menuEntry){
 				$menuEntry->ordering = $current;

diff --git a/application/views/admin/survey/editLocalSettings_main_view.php b/application/views/admin/survey/editLocalSettings_main_view.php
@@ -64,10 +64,12 @@
         method:'POST',
         data: data,
         success: function(result){
+
+            console.log({result: result});
           if(result.redirecturl != undefined ){
-            window.location.href=result.redirecturl;
+            //window.location.href=result.redirecturl;
           } else {
-            window.location.reload();
+            //window.location.reload();
           }
         },
         error: function(result){

diff --git a/application/views/admin/survey/subview/accordion/_integration_panel.php b/application/views/admin/survey/subview/accordion/_integration_panel.php
@@ -22,8 +22,32 @@
     var sAddParam = "<?php  eT('Add URL parameter','js');?>";
     var sEditParam = "<?php  eT('Edit URL parameter','js');?>";
     var iSurveyId = "<?php  echo $surveyid; ?>";
+    var questionArray =JSON.parse('<?php echo json_encode($questions); ?>');
 </script>
 <!-- Container -->
+<lspanelparametertable :sid="<?php  echo $surveyid; ?>" json-url="<?php echo App()->createUrl('admin/survey/sa/getUrlParamsJson', array('surveyid' => $surveyid))?>" :translate="{
+    table: {
+        idColumn : '<?php eT('ID');?>',
+        actionColumn : '<?php eT('Action');?>',
+        parameterColumn : '<?php eT('Parameter');?>',
+        questionColumn : '<?php eT('Target question');?>',
+        sidColumn : '<?php eT('Survey id');?>',
+        qidColumn : '<?php eT('Question id');?>',
+        sqidColumn : '<?php eT('SubQuestion ID');?>',
+        addParameter : '<?php eT('Add URL parameter');?>'
+    },
+    popup: {
+        editParam : '<?php eT('Edit URL parameter');?>',
+        newParam : '<?php eT('Add URL parameter');?>',
+        paramName : '<?php eT('Parameter');?>',
+        targetQuestion : '<?php eT('Target question');?>',
+        noTargetQuestion : '<?php eT('(No target question)');?>',
+        save : '<?php eT('Save');?>',
+        cancel : '<?php eT('Cancel');?>'
+    }
+}"></lspanelparametertable>
+
+<?php /*
 <div class="container-fluid">
     <div class="row">
         <div class="col-sm-12">
@@ -41,4 +65,5 @@
 
 <!-- Modal box to add a parameter -->
 <div data-copy="submitsurveybutton"></div>
-<?php $this->renderPartial('survey/subview/addPanelIntegrationParameter_view', array('questions' => $questions)); ?>
+<?php $this->renderPartial('survey/subview/addPanelIntegrationParameter_view', array('questions' => $questions)); ?> 
+*/?>