ui fixes

luticate/controllers/groups.controller.js

@@ -1,6 +1,6 @@
 angular.module('luticate')
-    .controller('GroupsController', ['$scope', 'luticateAuthGroups',
-        function($scope, luticateAuthGroups) {
+    .controller('GroupsController', ['$scope', 'luticateAuthGroups', 'luticateAuthCache',
+        function($scope, luticateAuthGroups, luticateAuthCache) {
 
             $scope.luTable = {
                 columns: [
@@ -17,7 +17,10 @@ angular.module('luticate')
 
                 canDel: 'LU_GROUP_DEL',
 
-                canEdit: 'LU_GROUP_EDIT',
+                canEdit: function()
+                {
+                    return true;
+                },
 
                 getLoadPagePromise: function (page, perPage, query, promise) {
                     return luticateAuthGroups.getAll({page: page, perPage: perPage, query: query}, promise);

luticate/controllers/home.controller.js

@@ -1,5 +1,75 @@
 angular.module('luticate')
-    .controller('HomeController', ['$scope', 'luticateAuthCache',
-        function($scope, luticateAuthCache) {
+    .controller('HomeController', ['$scope', 'luticateAuthCache', 'luticateDialogErrorHelper', 'luticateAuthUsers', '$state',
+        function($scope, luticateAuthCache, luticateDialogErrorHelper, luticateAuthUsers, $state) {
             $scope.user = luticateAuthCache.getUser();
+
+            $scope.userPassword = {
+                old: "",
+                value: "",
+                confirm: ""
+            };
+            $scope.passwordValidation = {
+                length: '$value.length >= 5 || $value.length == 0'
+            };
+            $scope.password2Validation = {
+                same_passwords: 'userPassword.value==$value'
+            };
+
+            $scope.submit = function()
+            {
+                var promiseEditUser = {
+                    id: "promiseEditUser",
+                    loaderGroups: ["form"]
+                };
+                if (luticateAuthCache.hasEffectivePermission("LU_USER_EDIT_ME")) {
+                    luticateAuthUsers.editMe({
+                            email: $scope.user.Email,
+                            firstname: $scope.user.Firstname,
+                            lastname: $scope.user.Lastname
+                        }, promiseEditUser)
+                        .then(function(data)
+                        {
+                            $scope.load();
+                            $scope.mayEditPassword();
+                        }, luticateDialogErrorHelper.errorDialog);
+                }
+                else {
+                    $scope.mayEditPassword();
+                }
+            };
+
+            $scope.mayEditPassword = function()
+            {
+                var promiseSetPassword = {
+                    id: "promiseSetPassword",
+                    loaderGroups: ["form"]
+                };
+                if ($scope.userPassword.value != ""
+                    && luticateAuthCache.hasEffectivePermission("LU_USER_SET_PASSWORD_ME")) {
+                    luticateAuthUsers.setPasswordMe({
+                            oldPassword: $scope.userPassword.old,
+                            password: $scope.userPassword.value
+                        }, promiseSetPassword)
+                        .then(function(data)
+                        {
+                            luticateAuthCache.removeUser();
+                            $state.go('login');
+                        }, luticateDialogErrorHelper.errorDialog);
+                }
+            };
+
+            $scope.load = function()
+            {
+                var promiseLoadMe = {
+                    id: "promiseLoadMe",
+                    groups: ["form"]
+                };
+                luticateAuthUsers.getMe(promiseLoadMe)
+                    .then(function(user)
+                    {
+                        $scope.user = user;
+                    }, luticateDialogErrorHelper.errorDialog);
+            };
+
+            $scope.load();
     }]);

luticate/controllers/modals/groupedit.controller.js

@@ -3,8 +3,8 @@
  */
 
 angular.module('luticate')
-    .controller('GroupEditController', ['$scope', 'luticateAuthGroups', 'data', 'dialogs',
-        function($scope, luticateAuthGroups, data, dialogs) {
+    .controller('GroupEditController', ['$scope', 'luticateAuthGroups', 'data', 'dialogs', '$q', 'luticateAuthCache',
+        function($scope, luticateAuthGroups, data, dialogs, $q, luticateAuthCache) {
             if (data != null) {
                 $scope.group = data;
                 $scope.permission = "LU_GROUP_EDIT";
@@ -18,27 +18,46 @@ angular.module('luticate')
 
             $scope.submitForm = function()
             {
-                if ($scope.group.Id != null) {
-                    var promiseEditGroup = {
-                        id: "promiseEditGroup",
-                        loaderGroups: ["modal"]
-                    };
-                    return luticateAuthGroups.edit({
-                        group_id: $scope.group.Id,
-                        group_name: $scope.group.Name
-                    }, promiseEditGroup);
+                if (luticateAuthCache.hasEffectivePermission($scope.permission)) {
+                    if ($scope.group.Id != null) {
+                        var promiseEditGroup = {
+                            id: "promiseEditGroup",
+                            loaderGroups: ["modal"]
+                        };
+                        return luticateAuthGroups.edit({
+                            group_id: $scope.group.Id,
+                            group_name: $scope.group.Name
+                        }, promiseEditGroup);
+                    }
+                    else {
+                        var promiseAddGroup = {
+                            id: "promiseAddGroup",
+                            loaderGroups: ["modal"]
+                        };
+                        return luticateAuthGroups.add({
+                            group_name: $scope.group.Name
+                        }, promiseAddGroup);
+                    }
                 }
                 else {
-                    var promiseAddGroup = {
-                        id: "promiseAddGroup",
-                        loaderGroups: ["modal"]
-                    };
-                    return luticateAuthGroups.add({
-                        group_name: $scope.group.Name
-                    }, promiseAddGroup);
+                    var defer = $q.defer();
+                    defer.resolve();
+                    return defer.promise;
                 }
             };
 
+            $scope.canEditUsers = function()
+            {
+                return $scope.group.Id != null &&
+                    (luticateAuthCache.hasEffectivePermission('LU_GROUP_USER_DEL') ||
+                    luticateAuthCache.hasAllEffectivePermissions(['LU_GROUP_USER_ADD', 'LU_USER_GET']));
+            };
+
+            $scope.canEditPermissions = function()
+            {
+                return $scope.group.Id != null && luticateAuthCache.hasEffectivePermission('LU_PERM_GROUP_GET');
+            };
+
             $scope.editPermissions = function(group)
             {
                 dialogs.create('views/modals/grouppermissions.html', 'GroupPermissionsController', group);

luticate/controllers/modals/permissionedit.controller.js

@@ -3,8 +3,8 @@
  */
 
 angular.module('luticate')
-    .controller('PermissionEditController', ['$scope', 'luticateAuthPermissions', 'data',
-        function($scope, luticateAuthPermissions, data) {
+    .controller('PermissionEditController', ['$scope', 'luticateAuthPermissions', 'data', 'luticateAuthCache', '$q',
+        function($scope, luticateAuthPermissions, data, luticateAuthCache, $q) {
             if (data != null) {
                 $scope.permission = data;
                 $scope.permission.IsNew = false;
@@ -26,11 +26,18 @@ angular.module('luticate')
                     permission_value: $scope.permission.Value
                 };
                 if (!$scope.permission.IsNew) {
-                    var promiseEditPermission = {
-                        id: "promiseEditPermission",
-                        loaderGroups: ["modal"]
-                    };
-                    return luticateAuthPermissions.edit(perm, promiseEditPermission);
+                    if (luticateAuthCache.hasEffectivePermission("LU_PERM_EDIT")) {
+                        var promiseEditPermission = {
+                            id: "promiseEditPermission",
+                            loaderGroups: ["modal"]
+                        };
+                        return luticateAuthPermissions.edit(perm, promiseEditPermission);
+                    }
+                    else {
+                        var defer = $q.defer();
+                        defer.resolve();
+                        return defer.promise;
+                    }
                 }
                 else {
                     var promiseAddPermission = {

luticate/controllers/modals/useredit.controller.js

@@ -100,4 +100,9 @@ angular.module('luticate')
             {
                 dialogs.create('views/modals/usereffectivepermissions.html', 'UserEffectivePermissionsController', user);
             };
+
+            $scope.canEditPermissions = function()
+            {
+                return $scope.user.Id != null && luticateAuthCache.hasEffectivePermission("LU_PERM_USER_GET");
+            }
         }]);

luticate/controllers/navbar.controller.js

@@ -5,13 +5,14 @@
 angular.module('luticate')
     .controller('NavBarController', ['$scope', 'luticateAuthCache', 'luticateAuthUsers', '$state',
         function($scope, luticateAuthCache, luticateAuthUsers, $state) {
-            var promiseLogout = {
-                id: "promiseLogout",
-                loaderGroups: ["body"]
-            };
+
 
             $scope.logout = function()
             {
+                var promiseLogout = {
+                    id: "promiseLogout",
+                    loaderGroups: ["body"]
+                };
                 luticateAuthUsers.logout(promiseLogout).finally(function()
                 {
                     $state.go('login');

luticate/controllers/permissions.controller.js

@@ -23,7 +23,10 @@ angular.module('luticate')
 
                 canDel: 'LU_PERM_DEL',
 
-                canEdit: 'LU_PERM_EDIT',
+                canEdit: function()
+                {
+                    return true;
+                },
 
                 getLoadPagePromise: function (page, perPage, query, promise) {
                     return luticateAuthPermissions.getAll({page: page, perPage: perPage, query: query}, promise);

luticate/controllers/users.controller.js

@@ -35,7 +35,10 @@ angular.module('luticate')
 
                 canDel: 'LU_USER_DEL',
 
-                canEdit: 'LU_USER_EDIT',
+                canEdit: function()
+                {
+                    return true;
+                },
 
                 getLoadPagePromise: function (page, perPage, query, promise) {
                     return luticateAuthUsers.getAll({page: page, perPage: perPage, query: query}, promise);

luticate/views/home.html

@@ -1,8 +1,8 @@
 <!-- Page Content -->
 <div class="container">
-    <form ng-submit="submit()">
+    <form name="form" ng-submit="submit()">
         <div class="form-group">
-            <div class="row co-sm-8 col-sm-offset-2">
+            <div class="row co-sm-8 col-sm-offset-2" lu-busy="form">
                 <div class="form-group">
                     <label for="email" class="col-sm-2 control-label">Email</label>
                     <div class="col-sm-9">
@@ -21,8 +21,14 @@
                         <input id="lastname" class="form-control" ng-model="user.Lastname" lu-enable-permission="LU_USER_EDIT_ME"/>
                     </div>
                 </div>
+
                 <div class="form-group" lu-show-permission="LU_USER_SET_PASSWORD_ME">
-                    <label for="password" class="col-sm-2 control-label">Password</label>
+                    <label for="oldPassword" class="col-sm-2 control-label">Old Password</label>
+                    <div class="col-sm-9">
+                        <input id="oldPassword" class="form-control" type="password" ng-model="userPassword.old"
+                               name="oldPassword"/>
+                    </div>
+                    <label for="password" class="col-sm-2 control-label">New Password</label>
                     <div class="col-sm-9">
                         <input id="password" class="form-control" type="password" ng-model="userPassword.value"
                                name="password" ui-validate="passwordValidation"/>
@@ -39,6 +45,10 @@
                         <p class="error" ng-show="form.password2.$error.same_passwords">Passwords do not match</p>
                     </div>
                 </div>
+                <div class="clearfix"></div>
+                <div class="form-group" class="col-sm-12">
+                    <button class="btn btn-default">Edit</button>
+                </div>
             </div>
         </div>
     </form>

luticate/views/modals/groupedit.html

@@ -7,12 +7,12 @@
     </div>
     <div class="form-group">
         <div class="col-sm-2"></div>
-        <button type="button" class="btn btn-default" lu-show-permission="LU_PERM_GROUP_GET,LU_PERM_GET"
-                ng-click="editPermissions(group)" ng-show="group.Id != null">
+        <button type="button" class="btn btn-default"
+                ng-click="editPermissions(group)" ng-show="canEditPermissions()">
             Edit permissions
         </button>
-        <button type="button" class="btn btn-default" lu-show-permission="LU_PERM_GROUP_GET,LU_PERM_GET"
-                ng-click="editUsers(group)" ng-show="group.Id != null">
+        <button type="button" class="btn btn-default"
+                ng-click="editUsers(group)" ng-show="canEditUsers()">
             Edit users
         </button>
     </div>

luticate/views/modals/useredit.html

@@ -43,11 +43,11 @@
     </div>
     <div class="form-group">
         <div class="col-sm-2"></div>
-        <button type="button" class="btn btn-default" lu-show-permission="LU_PERM_USER_GET,LU_PERM_GET"
-                ng-click="editPermissions(user)" ng-show="user.Id != null">
+        <button type="button" class="btn btn-default"
+                ng-click="editPermissions(user)" ng-show="canEditPermissions()">
             Edit permissions
         </button>
-        <button type="button" class="btn btn-default" lu-show-permission="LU_PERM_EFFECTIVE_GET"
+        <button type="button" class="btn btn-default" lu-show-permission="LU_PERM_EFFECTIVE_GET,LU_PERM_GET"
                 ng-click="showEffectivePermissions(user)" ng-show="user.Id != null">
             Show effective permissions
         </button>