user set password

luticate/controllers/directives/dialogokcancel.js

@@ -14,9 +14,13 @@ angular.module('luticate')
                     $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();
@@ -34,6 +38,12 @@ angular.module('luticate')
                                         if ($scope.onError) {
                                             $scope.onError(error);
                                         }
+                                        if (error.Data) {
+                                            $scope.errorString = error.Data;
+                                        }
+                                        else {
+                                            $scope.errorString = error;
+                                        }
                                         $scope.pending = false;
                                     });
                             }

luticate/controllers/modals/useredit.controller.js

@@ -3,8 +3,8 @@
  */
 
 angular.module('luticate')
-    .controller('UserEditController', ['$scope', 'luticateAuthUsers', 'data',
-        function($scope, luticateAuthUsers, data) {
+    .controller('UserEditController', ['$scope', 'luticateAuthUsers', 'data', '$q',
+        function($scope, luticateAuthUsers, data, $q) {
             if (data != null) {
                 $scope.user = data;
             }
@@ -13,24 +13,64 @@ angular.module('luticate')
                     Username: "",
                     Email: "",
                     Firstname: "",
-                    Lastname: "",
-                    Password: ""
+                    Lastname: ""
                 };
             }
+            $scope.userPassword = {
+                value: "",
+                confirm: ""
+            };
+            $scope.passwordValidation = {
+                length: '$value.length >= 5 || $value.length == 0'
+            };
+            $scope.password2Validation = {
+                same_passwords: 'userPassword.value==$value'
+            };
+
             var promiseEditUser = {
                 id: "promiseEditUser",
                 loaderGroups: ["modal"]
             };
+            var promiseAddUser = {
+                id: "promiseAddUser",
+                loaderGroups: ["modal"]
+            };
+            var promiseSetPassword = {
+                id: "promiseSetPassword",
+                loaderGroups: ["modal"]
+            };
+
+            $scope.onCanceled = function()
+            {
+                console.log($scope.userPassword);
+            };
 
             $scope.submitForm = function()
             {
+                console.log($scope.userPassword);
                 if ($scope.user.Id != null) {
-                    return luticateAuthUsers.edit({
+                    var defer = $q.defer();
+                    luticateAuthUsers.edit({
                         user_id: $scope.user.Id,
                         email: $scope.user.Email,
                         firstname: $scope.user.Firstname,
                         lastname: $scope.user.Lastname
-                    }, promiseEditUser);
+                    }, promiseEditUser)
+                        .then(function(data)
+                        {
+                            console.log($scope.userPassword);
+                            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);
+                    return defer.promise;
                 }
                 else {
                     var user = {
@@ -38,11 +78,9 @@ angular.module('luticate')
                         email: $scope.user.Email,
                         firstname: $scope.user.Firstname,
                         lastname: $scope.user.Lastname,
-                        password: $scope.user.Password
+                        password: $scope.userPassword.value
                     };
-                    console.log(user);
-                    return;
-                    return luticateAuthUsers.add(user, promiseEditUser);
+                    return luticateAuthUsers.add(user, promiseAddUser);
                 }
             };
         }]);

luticate/views/directives/dialogokcancel.html

@@ -6,14 +6,13 @@
                 <ng-transclude></ng-transclude>
             </div>
             <div class="clearfix"></div>
-            <!--<span class="error" ng-show="submitted">
-                <p class="error" ng-show="{{ e.show }}" ng-repeat="e in submittedErrors" ng-bind-template="{{ e.text | translate }}"></p>
+            <span class="error" ng-show="submitted">
+                <p class="error">{{ errorString }}</p>
             </span>
-            <p class="error" ng-show="{{ e.show }}" ng-repeat="e in alwaysErrors" ng-bind-template="{{ e.text | translate }}"></p>-->
         </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" ng-click="submitted = true">OK</button>
+            <button type="submit" class="btn btn-default" ng-enabled="!pending">OK</button>
         </div>
     </form>
 </div>

luticate/views/modals/useredit.html

@@ -26,17 +26,19 @@
     <div class="form-group">
         <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="user.Password" />
+            <input id="password" class="form-control" type="password" ng-model="userPassword.value"
+                   name="password" ui-validate="passwordValidation"/>
         </div>
         <div class="clearfix"></div>
-        <label for="password" class="col-sm-2 control-label">Confirmation</label>
+        <label for="password2" class="col-sm-2 control-label">Confirmation</label>
         <div class="col-sm-9">
-            <input id="password2" class="form-control" type="password" ng-model="password2"
-                   name="password2" ui-validate="{ same_passwords: '$value==user.Password' }"/>
+            <input id="password2" class="form-control" type="password" ng-model="userPassword.confirm"
+                   name="password2" ui-validate="password2Validation" ui-validate-watch="'userPassword.value'"/>
         </div>
         <div class="clearfix"></div>
         <div class="col-sm-offset-2 col-sm-9">
-            <p class="error" ng-show="form.password2.$error.same_passwords && user.Password != ''">Passwords do not match</p>
+            <p class="error" ng-show="form.password.$error.length">Passwords is too short</p>
+            <p class="error" ng-show="form.password2.$error.same_passwords">Passwords do not match</p>
         </div>
     </div>
 </dialog-ok-cancel>