Fixed issue #04360: Lacking the 'Manage labels' right cause the label…

… set browser to be unusable git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@8751 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · May 26, 2010 · ed32e58 · ed32e58
1 parent cdb3f98
commit ed32e58
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/admin/scripts/answers.js b/admin/scripts/answers.js
@@ -403,6 +403,7 @@ function dump(arr,level) {
 
 function transferlabels()
 {
+   surveyid=$('input[name=sid]').val(); 
    if ($(this).attr('id')=='btnlsreplace')
    {
        var lsreplace=true;
@@ -415,7 +416,7 @@ function transferlabels()
    $.ajax({
           url: 'admin.php?action=ajaxlabelsetdetails',
           dataType: 'json',
-          data: {lid:lsid},
+          data: {lid:lsid, sid:surveyid},
           cache: true,
           success: function(json){
                 languages=langs.split(';');   

diff --git a/admin/scripts/subquestions.js b/admin/scripts/subquestions.js
@@ -273,13 +273,14 @@ function lspreview()
    }
 
    var lsid=$('#labelsets').selectedValues();
+   surveyid=$('input[name=sid]').val();
    // check if this label set is already cached
    if (!isset(labelcache[lsid]))
    {
        $.ajax({
               url: 'admin.php?action=ajaxlabelsetdetails',
               dataType: 'json',
-              data: {lid:lsid},
+              data: {lid:lsid, sid:surveyid},
               cache: true,
               success: function(json){
                     $("#labelsetpreview").tabs('destroy');
@@ -361,6 +362,7 @@ function dump(arr,level) {
 
 function transferlabels()
 {
+    surveyid=$('input[name=sid]').val();
     if ($(this).attr('id')=='btnlsreplace')
     {
         var lsreplace=true;
@@ -382,7 +384,7 @@ function transferlabels()
    $.ajax({
           url: 'admin.php?action=ajaxlabelsetdetails',
           dataType: 'json',
-          data: {lid:lsid},
+          data: {lid:lsid, sid:surveyid},
           cache: true,
           success: function(json){
                 languages=langs.split(';');