Fixed #05806: No label set for quick add // Save as label set don't work

Implemented missing actions.
LimeSurvey · Mar 15, 2012 · 312fc13 · 312fc13
1 parent 1b8a08d
commit 312fc13
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 6 deletions.
diff --git a/application/controllers/admin/question.php b/application/controllers/admin/question.php
@@ -940,6 +940,69 @@ public function ajaxquestionattributes()
         $aData['attributedata'] = $aAttributesPrepared;
         $this->getController()->render('/admin/survey/Question/advanced_settings_view', $aData);
     }
+
+    /**
+     * This function prepares the data for label set details
+     *
+     * @access public
+     * @return void
+     */
+    public function ajaxlabelsetdetails()
+    {
+        $lid=returnglobal('lid');
+        Yii::app()->loadHelper('surveytranslator');
+
+        $labelsetdata=Labelsets::model()->find('lid=:lid',array(':lid' => $lid)); //$connect->GetArray($query);
+
+        $labelsetlanguages=explode(' ',$labelsetdata->languages);
+        foreach  ($labelsetlanguages as $language){
+
+            //$query='select * from lime_labels where lid='.$lid." and language='{$language}' order by sortorder";
+            $criteria=new CDbCriteria;
+            $criteria->condition='lid=:lid and language=:language';
+            $criteria->params=array(':lid'=>$lid, ':language'=>$language);
+            $criteria->order='sortorder';
+            $labelsdata=Label::model()->findAll($criteria);
+            $i=0;
+            foreach($labelsdata as $labeldata)
+            {
+                $data[$i]['lid'] = $labeldata->lid;
+                $data[$i]['code'] = $labeldata->code;
+                $data[$i]['title'] = $labeldata->title;
+                $data[$i]['sortorder'] = $labeldata->sortorder;
+                $data[$i]['assessment_value'] = $labeldata->assessment_value;
+                $data[$i]['language'] = $labeldata->language;
+                $i++;
+            }
+            $labels = $data;
+            //$labels=dbExecuteAssoc($query); //Label::model()->find(array('lid' => $lid, 'language' => $language), array('order' => 'sortorder')); //$connect->GetArray($query);
+            $resultdata[]=array($language=>array($labels,getLanguageNameFromCode($language,false)));
+        }
+
+        echo json_encode($resultdata);
+    }
+
+    /**
+     * This function prepares the data for labelset
+     *
+     * @access public
+     * @return void
+     */
+    public function ajaxlabelsetpicker()
+    {
+        $match=(int)returnglobal('match');
+        $surveyid=returnglobal('sid');
+        if ($match==1)
+        {
+            $language=GetBaseLanguageFromSurveyID($surveyid);
+        }
+        else
+        {
+            $language=null;
+        }
+        $resultdata=getlabelsets($language);
+        echo json_encode($resultdata);
+    }
 
     /**
      * Load preview of a question screen.

diff --git a/application/views/admin/survey/Question/answerOptions_view.php b/application/views/admin/survey/Question/answerOptions_view.php
@@ -27,6 +27,8 @@
     var saveaslabletitle  = '<?php $clang->eT('Save as label set','js'); ?>';
     var lanameurl = '<?php echo Yii::app()->createUrl('/admin/labels/getAllSets'); ?>';
     var lasaveurl = '<?php echo Yii::app()->createUrl('/admin/labels/ajaxSets'); ?>';
+    var lsdetailurl = '<?php echo Yii::app()->createUrl('/admin/question/ajaxlabelsetdetails'); ?>';
+    var lspickurl = '<?php echo Yii::app()->createUrl('/admin/question/ajaxlabelsetpicker'); ?>';
     var check = true;
     var lasuccess = '<?php $clang->eT('The records have been saved successfully!'); ?>';
     var lafail = '<?php $clang->eT('Sorry, the request failed!'); ?>';

diff --git a/application/views/admin/survey/Question/subQuestion_view.php b/application/views/admin/survey/Question/subQuestion_view.php
@@ -13,6 +13,8 @@
     var saveaslabletitle  = '<?php $clang->eT('Save as label set','js'); ?>';
     var lanameurl = '<?php echo Yii::app()->createUrl('/admin/labels/getAllSets'); ?>';
     var lasaveurl = '<?php echo Yii::app()->createUrl('/admin/labels/ajaxSets'); ?>';
+    var lsdetailurl = '<?php echo Yii::app()->createUrl('/admin/question/ajaxlabelsetdetails'); ?>';
+    var lspickurl = '<?php echo Yii::app()->createUrl('/admin/question/ajaxlabelsetpicker'); ?>';
     var check = true;
     var lasuccess = '<?php $clang->eT('The records have been saved successfully!'); ?>';
     var lafail = '<?php $clang->eT('Sorry, the request failed!'); ?>';

diff --git a/scripts/admin/answers.js b/scripts/admin/answers.js
@@ -309,7 +309,7 @@ function lsbrowser()
     {
         match=1;
     }*/
-    $.getJSON('admin.php?action=ajaxlabelsetpicker',{sid:surveyid, match:1},function(json){
+    $.getJSON(lspickurl,{sid:surveyid, match:1},function(json){
         var x=0;
         $("#labelsets").removeOption(/.*/);
         for (x in json)
@@ -350,7 +350,7 @@ function lspreview()
    if (!isset(labelcache[lsid]))
    {
        $.ajax({
-              url: 'admin.php?action=ajaxlabelsetdetails',
+              url: lsdetailurl,
               dataType: 'json',
               data: {lid:lsid, sid:surveyid},
               cache: true,
@@ -455,7 +455,7 @@ function transferlabels()
    }
    var lsid=$('#labelsets').val();
    $.ajax({
-          url: 'admin.php?action=ajaxlabelsetdetails',
+          url: lsdetailurl,
           dataType: 'json',
           data: {lid:lsid, sid:surveyid},
           cache: true,

diff --git a/scripts/admin/subquestions.js b/scripts/admin/subquestions.js
@@ -256,7 +256,7 @@ function lsbrowser()
     {
         match=1;
     }*/
-    $.getJSON('admin.php?action=ajaxlabelsetpicker',{sid:surveyid, match:1},function(json){
+    $.getJSON(lspickurl,{sid:surveyid, match:1},function(json){
         var x=0;    
         $("#labelsets").removeOption(/.*/); 
         for (x in json)
@@ -301,7 +301,7 @@ function lspreview()
    if (!isset(labelcache[lsid]))
    {
        $.ajax({
-              url: 'admin.php?action=ajaxlabelsetdetails',
+              url: lsdetailurl,
               dataType: 'json',
               data: {lid:lsid, sid:surveyid},
               cache: true,
@@ -409,7 +409,7 @@ function transferlabels()
 
    var lsid=$('#labelsets').val();
    $.ajax({
-          url: 'admin.php?action=ajaxlabelsetdetails',
+          url: lsdetailurl,
           dataType: 'json',
           data: {lid:lsid, sid:surveyid},
           cache: true,