From faa94a2b0ae07b27c237220492c956c699c42701 Mon Sep 17 00:00:00 2001
From: Neha Gupta <gnehapk@gmail.com>
Date: Tue, 23 Oct 2018 12:52:25 +0900
Subject: [PATCH] Fixed: Bug 1610190 Bugzilla: 1610190 tendrl-bug-id:
 https://github.com/Tendrl/ui/issues/1080

---
 src/modules/users/add-user/add-user.html   |  4 ++--
 src/modules/users/add-user/add-user.js     | 10 +++++++---
 src/modules/users/edit-user/edit-user.html |  4 ++--
 src/modules/users/edit-user/edit-user.js   |  6 +++++-
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/modules/users/add-user/add-user.html b/src/modules/users/add-user/add-user.html
index 9cbc1b48..fa94fa01 100644
--- a/src/modules/users/add-user/add-user.html
+++ b/src/modules/users/add-user/add-user.html
@@ -43,7 +43,7 @@
             <div class="form-group">
                 <label class="col-sm-2 col-md-1 control-label" for="password">Password</label>
                 <div class="col-sm-8 col-md-6 inner-addon">
-                    <input type="{{ addUserCntrl.typePassword ? 'text' : 'password' }}" data-id="password" aria-describedby="passwordStatus" name="password" ng-model="addUserCntrl.user.password" minlength="9" ng-maxlength="128" required/>
+                    <input type="{{ addUserCntrl.typePassword ? 'text' : 'password' }}" data-id="password" aria-describedby="passwordStatus" name="password" ng-model="addUserCntrl.user.password" ng-minlength="9" ng-maxlength="128" required/>
                     <span id="passwordStatus" class="showPassword" ng-click="addUserCntrl.toggleTypePassword()">
                         <span ng-if="addUserCntrl.typePassword === true">
                             <i class="glyphicon glyphicon-eye-open" aria-hidden="true"></i>
@@ -57,7 +57,7 @@
             <div class="form-group required">
                 <label class="col-sm-2 col-md-1 control-label cp-padding" for="password">Confirm Password</label>
                 <div class="col-sm-8 col-md-6 inner-addon">
-                    <input type="{{ addUserCntrl.confirmPassword ? 'text' : 'password' }}" data-id="password" aria-describedby="passwordStatus" name="confirmPassword" ng-model="addUserCntrl.user.confirmPassword" minlength="9" ng-maxlength="128" required/>
+                    <input type="{{ addUserCntrl.confirmPassword ? 'text' : 'password' }}" data-id="password" aria-describedby="passwordStatus" name="confirmPassword" ng-model="addUserCntrl.user.confirmPassword" ng-minlength="9" ng-maxlength="128" required/>
                     <span id="passwordStatus" class="showPassword" ng-click="addUserCntrl.toggleConfirmPassword()">
                         <span ng-if="addUserCntrl.confirmPassword === true">
                             <i class="glyphicon glyphicon-eye-open" aria-hidden="true"></i>
diff --git a/src/modules/users/add-user/add-user.js b/src/modules/users/add-user/add-user.js
index c577cc0d..3ce26662 100644
--- a/src/modules/users/add-user/add-user.js
+++ b/src/modules/users/add-user/add-user.js
@@ -87,12 +87,16 @@
             } else if (form.username.$invalid) {
                 vm.errorMsg = "Please specify valid User Id.";
                 isFormValid = false;
+            } else if ((form.confirmPassword.$dirty && form.confirmPassword.$error.minlength) ||
+                (form.password.$dirty && form.password.$error.minlength)) {
+                vm.errorMsg = "Password should contain minimum 9 characters.";
+                isFormValid = false;
             } else if ((form.confirmPassword.$dirty && form.confirmPassword.$error.maxlength) ||
                 (form.password.$dirty && form.password.$error.maxlength)) {
-                vm.errorMsg = "Password can contain maximum 128 characters."
+                vm.errorMsg = "Password can contain maximum 128 characters.";
                 isFormValid = false;
             } else if (form.password.$invalid || form.confirmPassword.$invalid) {
-                vm.errorMsg = "Please specify valid Password."
+                vm.errorMsg = "Please specify valid Password.";
                 isFormValid = false;
             } else if (!_isPasswordSame()) {
                 vm.errorMsg = "Password and Confirm Password doesn't match.";
@@ -118,4 +122,4 @@
         }
 
     }
-})();
+})();
\ No newline at end of file
diff --git a/src/modules/users/edit-user/edit-user.html b/src/modules/users/edit-user/edit-user.html
index 0254cce0..57b475d0 100644
--- a/src/modules/users/edit-user/edit-user.html
+++ b/src/modules/users/edit-user/edit-user.html
@@ -42,7 +42,7 @@
             <div class="form-group">
                 <label class="col-sm-2 col-md-1 control-label cp-padding" for="password">New Password</label>
                 <div class="col-sm-8 col-md-6 inner-addon">
-                    <input type="{{ editUserCntrl.typePassword ? 'text' : 'password' }}" data-id="password" name="password" ng-model="editUserCntrl.user.password" minlength="9" ng-maxlength="128"/>
+                    <input type="{{ editUserCntrl.typePassword ? 'text' : 'password' }}" data-id="password" name="password" ng-model="editUserCntrl.user.password" ng-minlength="9" ng-maxlength="128"/>
                     <span id="passwordStatus" class="showPassword" ng-click="editUserCntrl.toggleTypePassword()">
                         <span ng-if="editUserCntrl.typePassword === true">
                             <i class="glyphicon glyphicon-eye-open" aria-hidden="true"></i>
@@ -56,7 +56,7 @@
             <div class="form-group">
                 <label class="col-sm-2 col-md-1 control-label cp-padding" for="password">Confirm Password</label>
                 <div class="col-sm-8 col-md-6 inner-addon">
-                    <input type="{{ editUserCntrl.confirmPassword ? 'text' : 'password' }}" data-id="password" aria-describedby="passwordStatus" name="confirmPassword" ng-model="editUserCntrl.user.confirmPassword" minlength="9" ng-maxlength="128">
+                    <input type="{{ editUserCntrl.confirmPassword ? 'text' : 'password' }}" data-id="password" aria-describedby="passwordStatus" name="confirmPassword" ng-model="editUserCntrl.user.confirmPassword" ng-minlength="9" ng-maxlength="128">
                     <span id="passwordStatus" class="showPassword" ng-click="editUserCntrl.toggleConfirmPassword()">
                         <span ng-if="editUserCntrl.confirmPassword === true">
                             <i class="glyphicon glyphicon-eye-open" aria-hidden="true"></i>
diff --git a/src/modules/users/edit-user/edit-user.js b/src/modules/users/edit-user/edit-user.js
index 4741a117..b31dfcaf 100644
--- a/src/modules/users/edit-user/edit-user.js
+++ b/src/modules/users/edit-user/edit-user.js
@@ -100,9 +100,13 @@
             if (form.name.$invalid) {
                 vm.errorMsg = "Please specify valid Name."
                 isFormValid = false;
+            } else if((form.confirmPassword.$dirty && form.confirmPassword.$error.minlength) || 
+                (form.password.$dirty && form.password.$error.minlength) ) {
+                vm.errorMsg = "Password should contain minimum 9 characters.";
+                isFormValid = false;
             } else if((form.confirmPassword.$dirty && form.confirmPassword.$error.maxlength) || 
                 (form.password.$dirty && form.password.$error.maxlength) ) {
-                vm.errorMsg = "Password can contain maximum 128 characters."
+                vm.errorMsg = "Password can contain maximum 128 characters.";
                 isFormValid = false;
             } else if (!_isPasswordSame()) {
                 vm.errorMsg = "Password and Confirm Password doesn't match.";