Merge remote-tracking branch 'origin/fix-user-details-update-button' …

…into v1.8.0
sam-glendenning · Feb 16, 2022 · 971df59 · 971df59
2 parents cbafc73 + ce50926
commit 971df59
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/...main/webapp/resources/iam/apps/dashboard-app/components/user/edit/edit-user.controller.js b/...main/webapp/resources/iam/apps/dashboard-app/components/user/edit/edit-user.controller.js
@@ -161,8 +161,8 @@
       return !self.enabled || !$scope.userUpdateForm.$dirty ||
         $scope.userUpdateForm.name.$invalid ||
         $scope.userUpdateForm.surname.$invalid ||
-        $scope.userUpdateForm.email.$invalid ||
-        $scope.userUpdateForm.username.$invalid ||
+        ($scope.userUpdateForm.email.$invalid && $scope.userUpdateForm.email.$dirty) ||
+        ($scope.userUpdateForm.username.$invalid && $scope.userUpdateForm.username.$dirty) ||
         $scope.userUpdateForm.picture.$invalid;
     }
   }

diff --git a/...c/main/webapp/resources/iam/apps/dashboard-app/components/user/edit/edit-user.dialog.html b/...c/main/webapp/resources/iam/apps/dashboard-app/components/user/edit/edit-user.dialog.html
@@ -32,6 +32,9 @@ <h3 class="modal-title">Edit '{{$ctrl.oUser.name.formatted}}' account details</h
                     <input class="form-control" id="name" name="name" placeholder="First name" required type="text"
                         ng-minlength="3" ng-maxlength="64" ng-model="$ctrl.eUser.name" ng-pattern="$ctrl.pattern"
                         ng-disabled="!$ctrl.isAdmin() && !$ctrl.isUserEditableField('NAME')" />
+                    <span class="glyphicon form-control-feedback"
+                        ng-class="{'glyphicon-remove': userUpdateForm.name.$dirty && userUpdateForm.name.$invalid, 'glyphicon-ok': userUpdateForm.name.$dirty && userUpdateForm.name.$valid}"
+                        style="right: 15px"></span>
                     <span class="help-block"
                         ng-show="userUpdateForm.name.$dirty && userUpdateForm.name.$error.required"> This is a required
                         field </span>
@@ -149,7 +152,7 @@ <h3 class="modal-title">Edit '{{$ctrl.oUser.name.formatted}}' account details</h
                         ng-show="userUpdateForm.picture.$dirty && userUpdateForm.picture.$error.url"> This field is not
                         a valid URL </span>
                     <span class="help-block"
-                        ng-show="userUpdateForm.username.$dirty && userUpdateForm.username.$error.isImage"> This field
+                        ng-show="userUpdateForm.picture.$dirty && userUpdateForm.picture.$error.isImage"> This field
                         is not a valid image </span>
                 </div>
                 <div class="col-sm-12">
@@ -171,4 +174,5 @@ <h3 class="modal-title">Edit '{{$ctrl.oUser.name.formatted}}' account details</h
         <button class="btn btn-danger" type="button" name="dismiss" id="modal-btn-cancel"
             ng-click="$ctrl.dismiss()">Cancel</button>
     </div>
+
 </form>