From b5654b9e9d75afb1f8b24c1262add1f5ece4e594 Mon Sep 17 00:00:00 2001
From: Anna Vernidub <anna.vernidub13@gmail.com>
Date: Mon, 29 Jun 2015 15:43:04 +0300
Subject: [PATCH] Fixed user add/edit forms

---
 src/app/users/add/user.add.controller.js   | 5 +++--
 src/app/users/edit/user.edit.controller.js | 5 +++--
 src/app/users/edit/users.edit.html         | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/app/users/add/user.add.controller.js b/src/app/users/add/user.add.controller.js
index ac1e585..5bac5b0 100644
--- a/src/app/users/add/user.add.controller.js
+++ b/src/app/users/add/user.add.controller.js
@@ -11,10 +11,11 @@
       $scope.addUser = function () {
         if ($scope.addUserForm.$error.required.length > 0) {
           _.each($scope.addUserForm.$error.required, function (field) {
-            $scope.addUserForm[field].$error.required = true;
+            $scope.addUserForm[field.$name].$error.required = true;
+            $scope.addUserForm[field.$name].$setViewValue($scope.addUserForm[field.$name].$viewValue);
           });
 
-          $('input.ng-pristine').addClass('ng-dirty').removeClass('ng-pristine');
+          $scope.addUserForm.$setDirty();
         } else if ($('.error-message:not(.ng-hide)').length === 0) {
           $scope.update();
 
diff --git a/src/app/users/edit/user.edit.controller.js b/src/app/users/edit/user.edit.controller.js
index 95e574e..7c83366 100644
--- a/src/app/users/edit/user.edit.controller.js
+++ b/src/app/users/edit/user.edit.controller.js
@@ -33,10 +33,11 @@
       $scope.updateUser = function (userId) {
         if ($scope.editUserForm.$error.required.length > 0) {
           _.each($scope.editUserForm.$error.required, function (field) {
-            $scope.editUserForm[field].$error.required = true;
+            $scope.editUserForm[field.$name].$error.required = true;
+            $scope.editUserForm[field.$name].$setViewValue($scope.editUserForm[field.$name].$viewValue);
           });
 
-          $('input.ng-pristine').addClass('ng-dirty').removeClass('ng-pristine');
+          $scope.editUserForm.$setDirty();
         } else if ($('.error-message:not(.ng-hide)').length === 0) {
           $scope.update();
 
diff --git a/src/app/users/edit/users.edit.html b/src/app/users/edit/users.edit.html
index 52b6121..05e10b0 100644
--- a/src/app/users/edit/users.edit.html
+++ b/src/app/users/edit/users.edit.html
@@ -124,7 +124,7 @@ <h2 class="b-modal-window__main-block__header--title">
                     <div class="b-new-user__form__row__col">
                         <div class="b-new-user__form__item">
                             <label class="b-new-user__form__item__label">{{ 'edit_user.PASSWORD' | translate }}</label>
-                            <input class="b-new-user__form__item__field" type="password" name="password" required
+                            <input class="b-new-user__form__item__field" type="password" name="password"
                                    placeholder="{{ 'edit_user.placeholder.PASSWORD' | translate }}"
                                    ng-model="user.password"
                                    ng-change="errorPassword = false"
@@ -142,7 +142,7 @@ <h2 class="b-modal-window__main-block__header--title">
                                 {{ 'edit_user.CONFIRM_PASSWORD' | translate}}
                             </label>
                             <input class="b-new-user__form__item__field" type="password"
-                                   name="confirmpass" required
+                                   name="confirmpass"
                                    placeholder="{{ 'edit_user.placeholder.CONFIRM_PASSWORD' | translate }}"
                                    ng-model="user.confirmpass"
                                    ng-trim="true">