users add/del/edit

luticate/app.js

@@ -60,10 +60,10 @@ luticate.config(['$stateProvider', '$urlRouterProvider', '$httpProvider',
                     return config;
                 },
                 'responseError': function(rejection) {
-                    if (rejection.status == 401) {
+                    /*if (rejection.status == 401) {
                         luticateAuthCache.removeUser();
                         $injector.get('$state').transitionTo('login');
-                    }
+                    }*/
                     return $q.reject(rejection);
                 }
             };

luticate/controllers/directives/dialogokcancel.js

@@ -1,67 +0,0 @@
-/**
- * Created by robin on 11/2/15.
- */
-
-
-angular.module('luticate')
-    .directive('dialogOkCancel', [
-        function () {
-            return {
-                restrict: 'EA',
-                transclude: true,
-                templateUrl: 'views/directives/dialogokcancel.html',
-                link: function link($scope, element, attrs) {
-                    $scope.title = attrs.title;
-                    $scope.model = {};
-                    $scope.pending = false;
-                    $scope.submitted = false;
-                    $scope.errorString = "";
-
-                    $scope.__submit = function()
-                    {
-                        $scope.submitted = true;
-                        $scope.errorString = "";
-                        if ($scope.form.$valid) {
-                            $scope.pending = true;
-                            $scope.promise = $scope.submitForm();
-                            if ($scope.promise)
-                            {
-                                $scope.promise.then(function(data) {
-                                    if ($scope.onDone) {
-                                        $scope.onDone(data);
-                                    }
-                                    $scope.$close(data);
-                                    $scope.pending = false;
-                                })
-                                    .catch(function(error)
-                                    {
-                                        if ($scope.onError) {
-                                            $scope.onError(error);
-                                        }
-                                        if (error.Data) {
-                                            $scope.errorString = error.Data;
-                                        }
-                                        else {
-                                            $scope.errorString = error;
-                                        }
-                                        $scope.pending = false;
-                                    });
-                            }
-                            else {
-                                $scope.$close();
-                                $scope.pending = false;
-                            }
-                        }
-                    };
-
-                    $scope.__cancel = function()
-                    {
-                        if ($scope.onCanceled) {
-                            $scope.onCanceled();
-                        }
-                        $scope.$dismiss();
-                        $scope.pending = false;
-                    };
-                }
-            };
-        }]);

luticate/controllers/modals/useredit.controller.js

@@ -40,14 +40,8 @@ angular.module('luticate')
                 loaderGroups: ["modal"]
             };
 
-            $scope.onCanceled = function()
-            {
-                console.log($scope.userPassword);
-            };
-
             $scope.submitForm = function()
             {
-                console.log($scope.userPassword);
                 if ($scope.user.Id != null) {
                     var defer = $q.defer();
                     luticateAuthUsers.edit({
@@ -58,7 +52,6 @@ angular.module('luticate')
                     }, promiseEditUser)
                         .then(function(data)
                         {
-                            console.log($scope.userPassword);
                             if ($scope.userPassword.value != "") {
                                 luticateAuthUsers.setPassword({
                                     user_id: $scope.user.Id,

luticate/controllers/users.controller.js

@@ -1,20 +1,24 @@
 angular.module('luticate')
-    .controller('UsersController', ['$scope', '$state', 'luticateAuthUsers', 'dialogs',
-        function($scope, $state, luticateAuthUsers, dialogs) {
+    .controller('UsersController', ['$scope', '$state', 'luticateAuthUsers', 'dialogs', '$q', 'luticateDialogErrorHelper',
+        function($scope, $state, luticateAuthUsers, dialogs, $q, luticateDialogErrorHelper) {
             $scope.page = 0;
             $scope.perPage = 15;
             $scope.users = [];
             $scope.pages = [];
             $scope.selectedUsers = [];
 
-            var promiseUsers = {
-                id: "promiseUsers",
+            var promiseLoadUsers = {
+                id: "promiseLoadUsers",
                 groups: ['userList']
             };
+            var promiseDelUsers = {
+                id: "promiseDelUsers",
+                loadGroups: ['userList']
+            };
 
             $scope.loadPage = function(page)
             {
-                luticateAuthUsers.getAll({page: page, perPage: $scope.perPage}, promiseUsers)
+                luticateAuthUsers.getAll({page: page, perPage: $scope.perPage}, promiseLoadUsers)
                     .then(function(users)
                     {
                         $scope.page = page;
@@ -40,7 +44,23 @@ angular.module('luticate')
 
             $scope.removeUsers = function()
             {
-                console.log($scope.selectedUsers);
+                if ($scope.selectedUsers.length == 0) {
+                    $scope.loadPage($scope.page);
+                    return;
+                }
+                luticateAuthUsers.del({user_id: $scope.selectedUsers[0]}, promiseDelUsers)
+                    .then(function(data)
+                    {
+                        $scope.selectedUsers.splice(0, 1);
+                        $scope.removeUsers();
+                    }, function(error)
+                    {
+                        luticateDialogErrorHelper.errorDialog(error)
+                            .result.then(function(data)
+                            {
+                                $scope.loadPage($scope.page);
+                            }, function(error) {});
+                    });
             };
 
             $scope.addUser = function()

luticate/index.html

@@ -27,6 +27,9 @@
     <script src="../bower_components/luticate-utils/src/promises.js"></script>
     <script src="../bower_components/luticate-utils/src/request.js"></script>
     <script src="../bower_components/luticate-utils/src/lubusy.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>
     <script src="../bower_components/luticate-auth/src/luticateauth.js"></script>
     <script src="../bower_components/luticate-auth/src/users.js"></script>
     <script src="../bower_components/luticate-auth/src/cache.js"></script>
@@ -47,7 +50,6 @@
 
     <!-- SDK -->
     <script src="../sdk/cache.js"></script>
-    <script src="controllers/directives/dialogokcancel.js"></script>
 
     <!-- Directives -->
 

luticate/views/directives/dialogokcancel.html

@@ -1,18 +0,0 @@
-<div class="popin modal-content" xmlns="http://www.w3.org/1999/html">
-    <form name="form" class="form-horizontal" ng-submit="__submit()">
-        <div class="modal-header">{{ title }}</div>
-        <div class="modal-body" lu-busy="modal">
-            <div class="form-group">
-                <ng-transclude></ng-transclude>
-            </div>
-            <div class="clearfix"></div>
-            <span class="error" ng-show="submitted">
-                <p class="error">{{ errorString }}</p>
-            </span>
-        </div>
-        <div class="modal-footer">
-            <button type="button" class="btn btn-default" ng-click="__cancel()">Cancel</button>
-            <button type="submit" class="btn btn-default" ng-enabled="!pending">OK</button>
-        </div>
-    </form>
-</div>