users ui

luticate/controllers/home.controller.js

@@ -1,5 +1,4 @@
 angular.module('luticate')
     .controller('HomeController', ['$scope', '$state', 'luticatePromises',
         function($scope, $state, luticatePromises) {
-
     }]);

luticate/controllers/modals/useredit.controller.js

@@ -3,10 +3,12 @@
  */
 
 angular.module('luticate')
-    .controller('UserEditController', ['$scope', 'luticateAuthUsers', 'data', '$q', 'dialogs',
-        function($scope, luticateAuthUsers, data, $q, dialogs) {
+    .controller('UserEditController', ['$scope', 'luticateAuthUsers', 'data', '$q', 'dialogs', 'luticateAuthCache',
+        function($scope, luticateAuthUsers, data, $q, dialogs, luticateAuthCache) {
             if (data != null) {
                 $scope.user = data;
+                $scope.permission = "LU_USER_EDIT";
+                $scope.permissionPassword = "LU_USER_SET_PASSWORD";
             }
             else {
                 $scope.user = {
@@ -15,6 +17,8 @@ angular.module('luticate')
                     Firstname: "",
                     Lastname: ""
                 };
+                $scope.permission = "LU_USER_ADD";
+                $scope.permissionPassword = "LU_USER_ADD";
             }
             $scope.userPassword = {
                 value: "",
@@ -44,25 +48,21 @@ angular.module('luticate')
             {
                 if ($scope.user.Id != null) {
                     var defer = $q.defer();
-                    luticateAuthUsers.edit({
-                        user_id: $scope.user.Id,
-                        email: $scope.user.Email,
-                        firstname: $scope.user.Firstname,
-                        lastname: $scope.user.Lastname
-                    }, promiseEditUser)
-                        .then(function(data)
-                        {
-                            if ($scope.userPassword.value != "") {
-                                luticateAuthUsers.setPassword({
-                                    user_id: $scope.user.Id,
-                                    password: $scope.userPassword.value
-                                }, promiseSetPassword)
-                                    .then(defer.resolve, defer.reject);
-                            }
-                            else {
-                                defer.resolve(data);
-                            }
-                        }, defer.reject);
+                    if (luticateAuthCache.hasEffectivePermissions("LU_USER_EDIT")) {
+                        luticateAuthUsers.edit({
+                            user_id: $scope.user.Id,
+                            email: $scope.user.Email,
+                            firstname: $scope.user.Firstname,
+                            lastname: $scope.user.Lastname
+                        }, promiseEditUser)
+                            .then(function(data)
+                            {
+                                $scope.mayEditPassword(defer);
+                            }, defer.reject);
+                    }
+                    else {
+                        $scope.mayEditPassword(defer);
+                    }
                     return defer.promise;
                 }
                 else {
@@ -77,6 +77,21 @@ angular.module('luticate')
                 }
             };
 
+            $scope.mayEditPassword = function(defer)
+            {
+                if ($scope.userPassword.value != ""
+                    && luticateAuthCache.hasEffectivePermissions("LU_USER_SET_PASSWORD")) {
+                    luticateAuthUsers.setPassword({
+                        user_id: $scope.user.Id,
+                        password: $scope.userPassword.value
+                    }, promiseSetPassword)
+                        .then(defer.resolve, defer.reject);
+                }
+                else {
+                    defer.resolve(data);
+                }
+;            }
+
             $scope.editPermissions = function(user)
             {
                 dialogs.create('views/modals/userpermissions.html', 'UserPermissionsController', user);

luticate/controllers/modals/userpermissions.controller.js

@@ -11,6 +11,12 @@ angular.module('luticate')
             $scope.luPermissionEdit = {
                 item: $scope.user,
 
+                permissions: {
+                    add: 'LU_PERM_USER_ADD',
+                    del: 'LU_PERM_USER_DEL',
+                    edit: 'LU_PERM_USER_EDIT'
+                },
+
                 getGetAllPromise: function (page, perPage, promise) {
                     return luticateAuthPermissionsUser.getAll({
                         user_id: this.item.Id,

luticate/controllers/navbar.controller.js

@@ -10,15 +10,6 @@ angular.module('luticate')
                 loaderGroups: ["body"]
             };
 
-            $scope.hasPermission = function(permission)
-            {
-                var permissions = luticateAuthCache.getEffectivePermissions();
-                if (permissions == null || permissions[permission] == null) {
-                    return false;
-                }
-                return permissions[permission];
-            };
-
             $scope.logout = function()
             {
                 luticateAuthUsers.logout(promiseLogout).finally(function()

luticate/controllers/users.controller.js

@@ -2,48 +2,51 @@ angular.module('luticate')
     .controller('UsersController', ['$scope', 'luticateAuthUsers',
         function($scope, luticateAuthUsers) {
 
-            $scope.columns = [
-                {
-                    name: "Username",
-                    width: 3,
-                    getValue: function(item) {
-                        return item.Username;
+            $scope.luTable = {
+                columns: [
+                    {
+                        name: "Username",
+                        width: 3,
+                        getValue: function (item) {
+                            return item.Username;
+                        }
+                    }, {
+                        name: "Email",
+                        width: 3,
+                        getValue: function (item) {
+                            return item.Email;
+                        }
+                    }, {
+                        name: "Firstname",
+                        width: 3,
+                        getValue: function (item) {
+                            return item.Firstname;
+                        }
+                    }, {
+                        name: "Lastname",
+                        width: 3,
+                        getValue: function (item) {
+                            return item.Lastname;
+                        }
                     }
-                }, {
-                    name: "Email",
-                    width: 3,
-                    getValue: function(item) {
-                        return item.Email;
-                    }
-                }, {
-                    name: "Firstname",
-                    width: 3,
-                    getValue: function(item) {
-                        return item.Firstname;
-                    }
-                }, {
-                    name: "Lastname",
-                    width: 3,
-                    getValue: function(item) {
-                        return item.Lastname;
-                    }
-                }
-            ];
-
-            $scope.getLoadPagePromise = function(page, perPage, promise)
-            {
-                return luticateAuthUsers.getAll({page: page, perPage: perPage}, promise);
-            };
+                ],
 
-            $scope.getDelPromise = function(id, promise)
-            {
-                return luticateAuthUsers.del({user_id: id}, promise);
-            };
+                permissions: {
+                    add: 'LU_USER_ADD',
+                    del: 'LU_USER_DEL',
+                    edit: 'LU_USER_EDIT'
+                },
 
-            $scope.getEditController = function()
-            {
-                return "UserEdit";
-            };
+                getLoadPagePromise: function (page, perPage, promise) {
+                    return luticateAuthUsers.getAll({page: page, perPage: perPage}, promise);
+                },
 
+                getDelPromise: function (id, promise) {
+                    return luticateAuthUsers.del({user_id: id}, promise);
+                },
 
+                getEditController: function () {
+                    return "UserEdit";
+                }
+            };
     }]);

luticate/index.html

@@ -29,6 +29,7 @@
     <script src="../bower_components/luticate-utils/src/lubusy.js"></script>
     <script src="../bower_components/luticate-utils/src/lutable.js"></script>
     <script src="../bower_components/luticate-utils/src/lupermissionsedit.js"></script>
+    <script src="../bower_components/luticate-utils/src/luhaspermission.js"></script>
     <script src="../bower_components/luticate-utils/src/modals/dialogerror.js"></script>
     <script src="../bower_components/luticate-utils/src/modals/dialogerrorhelper.js"></script>
     <script src="../bower_components/luticate-utils/src/modals/dialogokcancel.js"></script>

luticate/views/modals/useredit.html

@@ -8,22 +8,22 @@
     <div class="form-group">
         <label for="email" class="col-sm-2 control-label">Email</label>
         <div class="col-sm-9">
-            <input id="email" class="form-control" ng-model="user.Email" />
+            <input id="email" class="form-control" ng-model="user.Email" lu-enable-permission="{{ permission }}"/>
         </div>
     </div>
     <div class="form-group">
         <label for="firstname" class="col-sm-2 control-label">Firstname</label>
         <div class="col-sm-9">
-            <input id="firstname" class="form-control" ng-model="user.Firstname" />
+            <input id="firstname" class="form-control" ng-model="user.Firstname" lu-enable-permission="{{ permission }}"/>
         </div>
     </div>
     <div class="form-group">
         <label for="lastname" class="col-sm-2 control-label">Lastname</label>
         <div class="col-sm-9">
-            <input id="lastname" class="form-control" ng-model="user.Lastname" />
+            <input id="lastname" class="form-control" ng-model="user.Lastname" lu-enable-permission="{{ permission }}"/>
         </div>
     </div>
-    <div class="form-group">
+    <div class="form-group" lu-show-permission="{{ permissionPassword }}">
         <label for="password" class="col-sm-2 control-label">Password</label>
         <div class="col-sm-9">
             <input id="password" class="form-control" type="password" ng-model="userPassword.value"
@@ -41,7 +41,7 @@
             <p class="error" ng-show="form.password2.$error.same_passwords">Passwords do not match</p>
         </div>
     </div>
-    <div class="form-group">
+    <div class="form-group" lu-show-permission="LU_PERM_USER_GET">
         <button type="button" class="btn btn-default col-sm-offset-2"
                 ng-click="editPermissions(user)" ng-show="user.Id != null">
             Edit Permissions

luticate/views/navbar.html

@@ -15,9 +15,9 @@
         <!-- Collect the nav links, forms, and other content for toggling -->
         <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
             <ul class="nav navbar-nav navbar-left">
-                <li><a href="#/users" ng-show="hasPermission('LU_USER_GET')">Users</a></li>
-                <li><a href="#/groups" ng-show="hasPermission('LU_GROUP_GET')">Groups</a></li>
-                <li><a href="#/permissions" ng-show="hasPermission('LU_PERM_GET')">Permissions</a></li>
+                <li><a href="#/users" lu-show-permission="LU_USER_GET">Users</a></li>
+                <li><a href="#/groups" lu-show-permission="LU_GROUP_GET">Groups</a></li>
+                <li><a href="#/permissions" lu-show-permission="LU_PERM_GET">Permissions</a></li>
             </ul>
             <ul class="nav navbar-nav navbar-right">
                 <li><a href="" ng-click="logout()">Logout</a></li>

luticate/views/users.html

@@ -1,4 +1,4 @@
 <!-- Page Content -->
 <div class="container">
-    <lu-table class="row col-sm-8 col-sm-offset-2" ></lu-table>
+    <lu-table options="luTable" class="row col-sm-8 col-sm-offset-2" ></lu-table>
 </div>