Fixed issue #17599: Loading a label set at multilingual survey fails

LimeSurvey · Oct 11, 2021 · cc1040f · cc1040f
1 parent 2530170
commit cc1040f
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/assets/scripts/admin/answers.js b/assets/scripts/admin/answers.js
@@ -581,8 +581,16 @@ function transferlabels(type)
             if(type == 'replace'){
                 $table.find('tbody').empty();
             }
-
-            $("#labelsetpreview").find('#language_'+lng).find('.selector_label-list').find('.selector_label-list-row').each(function(i,item){
+
+            // Label data is extracted from the preview html.
+            var sourceRows = $("#labelsetpreview").find('#language_'+lng).find('.selector_label-list').find('.selector_label-list-row');
+            // If data for a language is missing from the label set, and it's not the first language (presumably the base language),
+            // we fall back to the first language. This is the same behavior as "Quick Add".
+            if (sourceRows.length == 0 && lng != languages[0]) {
+                sourceRows = $("#labelsetpreview").find('#language_'+languages[0]).find('.selector_label-list').find('.selector_label-list-row');
+            }
+
+            sourceRows.each(function(i,item){
                 try{
                     var label = $(item).data('label');
                     var $row = $(row);