Fixed issue: Label editing was not properly synchronizing across tran…

…slations on deletion and code/assessments value
LimeSurvey · Dec 17, 2015 · c96cb50 · c96cb50
1 parent f36f141
commit c96cb50
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/application/views/admin/labels/labelview_view.php b/application/views/admin/labels/labelview_view.php
@@ -63,7 +63,7 @@
                                 ?>>
                                 <?php
                                     if (!$first) {
-                                    ?>                      <td><?php echo $row['code'] ?></td><td><?php echo $row['assessment_value'] ?></td>
+                                    ?><td><?php echo $row['code'] ?></td><td style='text-align:right;'><?php echo $row['assessment_value'] ?></td>
                                     <?php
                                     }
                                     else

diff --git a/scripts/admin/labels.js b/scripts/admin/labels.js
@@ -25,7 +25,7 @@ $(document).ready(function(){
         {
             alert(strSelectLabelset);
             return false;
-        }   
+        }
         else
         {
             return true;
@@ -191,13 +191,13 @@ function sort_complete(event, ui){
 
 function sync_label(event)
 {
-    var $sRowID = $(event.target).parent().parent().attr('id');
-    $aRowInfo=$sRowID.split('_');// first is row, second langage and last the row number
-    $(".tab-pane").each(function(divindex,divelement){
+    var sRowID = $(event.target).parent().parent().attr('id');
+    aRowInfo=sRowID.split('_');// first is row, second langage and last the row number
+    $(".ui-tabs-panel").each(function(divindex,divelement){
         var div_language = $(".lslanguage",divelement).val();
-        if (typeof(div_language)!="undefined" && div_language!=$aRowInfo[1]){
-            $("#row_"+div_language+"_"+$aRowInfo[2]+" td:first-child").text($("#code_"+$aRowInfo[2]).val()); // Sync code
-            $("#row_"+div_language+"_"+$aRowInfo[2]+" td:nth-child(2)").text($("#assessmentvalue_"+$aRowInfo[2]).val()); // Sync assessment value
+        if (typeof(div_language)!="undefined" && div_language!=aRowInfo[1]){
+            $("#row_"+div_language+"_"+aRowInfo[2]+" td:first-child").text($("#code_"+aRowInfo[2]).val()); // Sync code
+            $("#row_"+div_language+"_"+aRowInfo[2]+" td:nth-child(2)").text($("#assessmentvalue_"+aRowInfo[2]).val()); // Sync assessment value
         }
     });
 
@@ -276,7 +276,7 @@ function del_label(event){
     var $sRowID = $(event.target).parent().parent().attr('id');
 
     $aRowInfo=$sRowID.split('_');// first is row, second langage and last the row number
-    $(".tab-pane").each(function(divindex,divelement){
+    $(".ui-tabs-panel").each(function(divindex,divelement){
         var div_language = $(".lslanguage",divelement).val();
 
         if (typeof(div_language)!="undefined")