dev: Fixed errors on editing labelsets

LimeSurvey · Jul 2, 2013 · 84e8e19 · 84e8e19
1 parent e14b3b9
commit 84e8e19
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/application/controllers/admin/labels.php b/application/controllers/admin/labels.php
@@ -167,7 +167,7 @@ public function index($sa, $lid=0)
         $lid = sanitize_int($lid);
         $aViewUrls = array();
 
-        if (hasGlobalPermission('labelsets','read'))
+        if (Permission::model()->hasGlobalPermission('labelsets','read'))
         {
             if ($sa == "editlabelset" && Permission::model()->hasGlobalPermission('labelsets','update'))
             {

diff --git a/scripts/admin/labels.js b/scripts/admin/labels.js
@@ -28,8 +28,8 @@ $(document).ready(function(){
         add_label(undefined);
 
 
-    $(".btnaddanswer").live('click',add_label);
-    $(".btndelanswer").live('click',del_label);
+    $(".btnaddanswer").click(add_label);
+    $(".btndelanswer").click(del_label);
 
     $('#neweditlblset0 .answertable tbody').sortable({
         update:sort_complete,
@@ -41,7 +41,7 @@ $(document).ready(function(){
         width:600,
         title: $("#quickadd").attr('name')});
 
-    $('.btnquickadd').live('click',function(){
+    $('.btnquickadd').click(function(){
         $('#quickadd').dialog('open');
     });