Merge branch '2.05' of github.com:LimeSurvey/LimeSurvey into 2.05

LimeSurvey · Aug 12, 2013 · 8a3638f · 8a3638f
2 parents 788a7ae + 792fac2
commit 8a3638f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/application/core/plugins/ExportR/RSyntaxWriter.php b/application/core/plugins/ExportR/RSyntaxWriter.php
@@ -45,6 +45,9 @@ public function init(SurveyObj $survey, $sLanguageCode, FormattingOptions $oOpti
         foreach ($tmpFieldmap as $field => $values)
         {
             $fieldmap[$values['title']] = $values;
+            if (array_key_exists('sql_name', $values)) {
+                $fieldmap[$values['sql_name']] = $values;
+            }
         }
         $this->customFieldmap = $fieldmap;
     }
@@ -56,8 +59,8 @@ protected function out($content)
 
     protected function outputRecord($headers, $values, FormattingOptions $oOptions)
     {
-        $this->headers = $headers;
-        foreach ($headers as $id => $title)
+        $this->headers = $oOptions->selectedColumns;
+        foreach ($oOptions->selectedColumns as $id => $title)
         {
             $field = $this->customFieldmap[$title];
 
@@ -176,7 +179,7 @@ public function close()
                         $errors .= "# Variable name was incorrect and was changed from {$field['title']} to $ftitle .\n";
                     }
 
-                    $this->out("names(data)[" . $id . "] <- "
+                    $this->out("names(data)[" . $i . "] <- "
                     . "\"" . $ftitle . "\"");  // <AdV> added \n
                 } else {
                     $this->out("#sql_name not set");

diff --git a/application/helpers/export_helper.php b/application/helpers/export_helper.php
@@ -219,8 +219,8 @@ function SPSSExportData ($iSurveyID, $iLength, $na = '', $q='\'', $header=FALSE)
 * @param $field array field from SPSSFieldMap
 * @return array or false
 */
-function SPSSGetValues ($field = array(), $qidattributes = null ) {
-    global $iSurveyID, $language, $length_vallabel;
+function SPSSGetValues ($field = array(), $qidattributes = null, $language ) {
+    $length_vallabel = 120;
     $clang = Yii::app()->lang;
 
     if (!isset($field['LStype']) || empty($field['LStype'])) return false;
@@ -329,7 +329,7 @@ function SPSSGetValues ($field = array(), $qidattributes = null ) {
 * @return array
 */
 function SPSSFieldMap($iSurveyID, $prefix = 'V') {
-    global $clang, $surveyprivate, $tokensexist, $language;
+    global $clang, $surveyprivate, $tokensexist;
 
     $typeMap = array(
 '5'=>Array('name'=>'5 Point Choice','size'=>1,'SPSStype'=>'F','Scale'=>3),
@@ -490,7 +490,7 @@ function SPSSFieldMap($iSurveyID, $prefix = 'V') {
         'ValueLabels'=>'','VariableLabel'=>$varlabel,"sql_name"=>$fieldname,"size"=>$val_size,
         'title'=>$ftitle,'hide'=>$hide,'scale'=>$export_scale, 'scale_id'=>$scale_id);
         //Now check if we have to retrieve value labels
-        $answers = SPSSGetValues($tempArray, $aQuestionAttribs);
+        $answers = SPSSGetValues($tempArray, $aQuestionAttribs, $language);
         if (is_array($answers)) {
             //Ok we have answers
             if (isset($answers['size'])) {

diff --git a/scripts/admin/organize.js b/scripts/admin/organize.js
@@ -11,6 +11,7 @@ $(document).ready(function(){
         placeholder: 'placeholder',
         revert: 250,
         tabSize: 25,
+        rootID: 'root',
         stop: function(event, ui) {
             if (ui.item[0].sourceLevel!=ui.placeholder.destinationLevel)
                $('ol.organizer').nestedSortable('cancel');