lu has permission mutliple

src/luhaspermission.js

@@ -2,58 +2,59 @@
  * Created by robin on 11/5/15.
  */
 
-angular.module('luticateUtils')
-    .directive('luShowPermission', ['luticateAuthCache',
-        function(luticateAuthCache) {
-            return {
-                restrict: 'A',
-                link: function ($scope, element, attrs) {
+(function()
+{
+    function checkPermissions(permissions, luticateAuthCache)
+    {
+        var perms = permissions.split(',');
+        for (var i = 0; i < perms.length; ++i) {
+            if (!luticateAuthCache.hasEffectivePermission(perms[i])) {
+                return false;
+            }
+        }
+        return true;
+    }
 
-                    $scope.$watch(function()
-                    {
-                        var permissions = luticateAuthCache.getEffectivePermissions();
-                        if (permissions == null) {
-                            return null;
-                        }
-                        var permission_name = attrs.luShowPermission;
-                        if ($scope[permission_name] != null) {
-                            permission_name = $scope[permission_name];
-                        }
+    angular.module('luticateUtils')
+        .directive('luShowPermission', ['luticateAuthCache',
+            function(luticateAuthCache) {
+                return {
+                    restrict: 'A',
+                    link: function ($scope, element, attrs) {
 
-                        var value = permissions[permission_name];
-                        return value == null ? null : value;
-                    }, function(newValue, oldValue)
-                    {
-                        if (newValue == true) {
-                            element.show();
-                        }
-                        else {
-                            element.hide();
-                        }
-                    })
-                }
-            };
-        }])
-    .directive('luEnablePermission', ['luticateAuthCache',
-        function(luticateAuthCache) {
-            return {
-                restrict: 'A',
-                scope: {
-                    luEnablePermission: '@'
-                },
-                link: function ($scope, element, attrs) {
+                        $scope.$watch(function()
+                        {
+                            return checkPermissions(attrs.luShowPermission, luticateAuthCache);
+                        }, function(newValue)
+                        {
+                            if (newValue == true) {
+                                element.show();
+                            }
+                            else {
+                                element.hide();
+                            }
+                        })
+                    }
+                };
+            }])
+        .directive('luEnablePermission', ['luticateAuthCache',
+            function(luticateAuthCache) {
+                return {
+                    restrict: 'A',
+                    link: function ($scope, element, attrs) {
 
-                    $scope.$watch(function() {
-                        return luticateAuthCache.hasEffectivePermissions($scope.luEnablePermission);
-                    }, function(newValue)
-                    {
-                        if (newValue == true) {
-                            element.removeAttr("disabled");
-                        }
-                        else {
-                            element.attr("disabled", "disabled");
-                        }
-                    })
-                }
-            };
-        }]);
+                        $scope.$watch(function() {
+                            return checkPermissions(attrs.luEnablePermission, luticateAuthCache);
+                        }, function(newValue)
+                        {
+                            if (newValue == true) {
+                                element.removeAttr("disabled");
+                            }
+                            else {
+                                element.attr("disabled", "disabled");
+                            }
+                        })
+                    }
+                };
+            }]);
+})()

src/lupermissionsedit.js

@@ -3,8 +3,8 @@
  */
 
 angular.module('luticateUtils')
-    .directive('luPermissionEdit', ['dialogs', 'luticateDialogErrorHelper', 'luticateAuthPermissions',
-        function(dialogs, luticateDialogErrorHelper, luticateAuthPermissions) {
+    .directive('luPermissionEdit', ['dialogs', 'luticateDialogErrorHelper', 'luticateAuthPermissions', 'luticateAuthCache',
+        function(dialogs, luticateDialogErrorHelper, luticateAuthPermissions, luticateAuthCache) {
             return {
                 restrict: 'E',
                 scope: {
@@ -21,7 +21,6 @@ angular.module('luticateUtils')
                         Value: true
                     };
                     $scope.luModelOptions = $scope.luModel();
-                    console.log();
 
                     $scope.editPermission = function(permission, value)
                     {
@@ -103,7 +102,12 @@ angular.module('luticateUtils')
                             }, luticateDialogErrorHelper.errorDialog);
                     };
 
-                    $scope.loadAllPermissions();
+                    if (luticateAuthCache.hasEffectivePermission('LU_PERM_GET')) {
+                        $scope.loadAllPermissions();
+                    }
+                    else {
+                        $scope.loadPermissions();
+                    }
                 }
             };
         }]);