Fixed issue #7741: Order of label sets in label set picker

LimeSurvey · Apr 21, 2013 · 9133a4f · 9133a4f
1 parent aa1ce79
commit 9133a4f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -7286,6 +7286,7 @@ function getLabelSets($languages = null)
     }
 
     $criteria = new CDbCriteria;
+    $criteria->order = "label_name";    
     foreach ($languagesarray as $k => $item)
     {
         $criteria->params[':lang_like1_' . $k] = "% $item %";

diff --git a/application/views/admin/labels/labelbar_view.php b/application/views/admin/labels/labelbar_view.php
@@ -1,6 +1,6 @@
 <div class='menubar'>
     <div class='menubar-title ui-widget-header'>
-        <strong><?php $clang->eT("Label Set"); ?>:</strong> <?php echo $row['label_name']; ?>
+        <strong><?php printf($clang->gT("Label set:%s %s (ID:%s)"),'</strong>',$row['label_name'],$lid); ?>
     </div>
     <div class='menubar-main'>
         <div class='menubar-left'>

diff --git a/application/views/admin/labels/labelsetsbar_view.php b/application/views/admin/labels/labelsetsbar_view.php
@@ -27,7 +27,7 @@
                         { ?>
                         <option value='<?php echo $this->createUrl("admin/labels/sa/view/lid/".$lb[0]); ?>'
                             <?php if ($lb[0] == $lid) { ?> selected='selected' <?php } ?>
-                            ><?php echo $lb[0]; ?>: <?php echo $lb[1]; ?></option>
+                            ><?php echo $lb[1]; ?></option>
                         <?php }
                 } ?>