Fixed issue #9530: When editing a token the language drop down menu l…

…ists all languages - should list only languages used
LimeSurvey · May 12, 2015 · 8791a6c · 8791a6c · Shnoulle · May 12, 2015
1 parent 2237500
commit 8791a6c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 29 deletions.
diff --git a/application/controllers/admin/surveypermission.php b/application/controllers/admin/surveypermission.php
@@ -522,7 +522,7 @@ function delete($surveyid)
             {
                 if (isset($postuserid))
                 {
-                    $dbresult = Permission::model()->deleteAll('uid = :uid AND entity_id = :sid AND entity = :entity',array(':uid' => $postuserid, ':sid' => $surveyid, ':entity' => 'survey'));
+                    $dbresult = Permission::model()->deleteAll("uid = :uid AND entity_id = :sid AND entity = 'survey'",array(':uid' => $postuserid, ':sid' => $surveyid));
                     $addsummary .= "<br />".gT("Username").": ".sanitize_xss_string($_POST['user'])."<br /><br />\n";
                     $addsummary .= "<div class=\"successheader\">".gT("Success!")."</div>\n";
                 }

diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
@@ -323,7 +323,13 @@ function browse($iSurveyId, $limit = 50, $start = 0, $order = false, $searchstri
         $aData['order'] = $order;
         $aData['surveyprivate'] = $aData['thissurvey']['anonymized'];
         $aData['dateformatdetails'] = $dateformatdetails;
-
+        $aLanguageCodes=Survey::model()->findByPk($iSurveyId)->getAllLanguages();
+        $aLanguages=array();
+        foreach ($aLanguageCodes as $aCode)
+        {
+            $aLanguages[$aCode]=getLanguageNameFromCode($aCode,false);    
+        }
+        $aData['aLanguages'] = $aLanguages;
         $this->_renderWrappedTemplate('token', array('tokenbar', 'browse'), $aData);
     }
 

diff --git a/application/models/Permission.php b/application/models/Permission.php
@@ -437,18 +437,6 @@ function giveAllSurveyPermissions($iUserID, $iSurveyID)
         $this->setPermissions($iUserID, $iSurveyID, 'survey', $aPermissionsToSet);
     }
 
-    function deleteSomeRecords($condition)
-    {
-        $criteria = new CDbCriteria;
-
-        foreach ($condition as $item => $value)
-        {
-            $criteria->addCondition($item."='".$value."'");
-        }
-
-        $this->deleteAll($criteria);
-    }
-
     function insertRecords($data)
     {
         foreach ($item as $data)

diff --git a/application/views/admin/token/browse.php b/application/views/admin/token/browse.php
@@ -1,21 +1,11 @@
 <?php
     // Build the options for additional languages
-    $j = 1;
-    $getlangvalues = getLanguageData(false,Yii::app()->session['adminlang']);
-    if (Yii::app()->session['adminlang'] != 'auto')
+    $aLanguageNames=array();
+    foreach ($aLanguages as $sCode => $sName)
     {
-        $lname[0] = Yii::app()->session['adminlang'] . ":" . $getlangvalues[Yii::app()->session['adminlang']]['description'];
+        $aLanguageNames[] = $sCode . ":" . str_replace(";", " -", $sName);
     }
-    foreach ($getlangvalues as $keycode => $keydesc)
-    {
-        if (Yii::app()->session['adminlang'] != $keycode)
-        {
-            $cleanlangdesc = str_replace(";", " -", $keydesc['description']);
-            $lname[$j] = $keycode . ":" . $cleanlangdesc;
-            $j++;
-        }
-    }
-    $langnames = implode(";", $lname);
+    $aLanguageNames = implode(";", $aLanguageNames);
     // Build the column information : columnname=>Description,search(true/false) (type ?)
     // Don't add id : because we don't really need it. This different from columnNames (no action).
     // TODO: Merge columnNames and aTokenColumns : need more option (name,index,search, type, editable ...)
@@ -127,7 +117,7 @@
     { "name":"email", "index":"email","align":"left","width":170, "sorttype":"string", "sortable": true, "editable":true},
     { "name":"emailstatus", "index":"emailstatus","align":"left","width":80,"sorttype":"string", "sortable": true, "editable":true},
     { "name":"token", "index":"token","align":"left", "sorttype":"int", "sortable": true,"width":150,"editable":true},
-    { "name":"language", "index":"language","align":"left", "sorttype":"int", "sortable": true,"width":100,"editable":true, "formatter":'select', "edittype":"select", "editoptions":{"value":"<?php echo $langnames; ?>"}},
+    { "name":"language", "index":"language","align":"left", "sorttype":"int", "sortable": true,"width":100,"editable":true, "formatter":'select', "edittype":"select", "editoptions":{"value":"<?php echo $aLanguageNames; ?>"}},
     { "name":"sent", "index":"sent","align":"left", "sorttype":"int", "sortable": true,"width":130,"editable":true},
     { "name":"remindersent", "index":"remindersent","align":"left", "sorttype":"int", "sortable": true,"width":80,"editable":true},
     { "name":"remindercount", "index":"remindercount","align":"right", "sorttype":"int", "sortable": true,"width":80,"editable":true},