From c5347a97ce959fd14723af2a94e197400baa2642 Mon Sep 17 00:00:00 2001 From: Shannon Date: Wed, 12 Jun 2019 12:51:26 +1000 Subject: [PATCH] Fixes setting the reset flag when allowManuallyChangingPassword is disabled --- .../src/views/member/member.edit.controller.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js index 4bd7a70113..3edd1d17f4 100644 --- a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js @@ -131,9 +131,9 @@ function MemberEditController($scope, $routeParams, $location, $q, $window, appS $scope.busy = true; $scope.page.saveButtonState = "busy"; - //anytime a user is changing a member's password, we are in effect resetting it so we need to set that flag here + //anytime a user is changing a member's password without the oldPassword, we are in effect resetting it so we need to set that flag here var passwordProp = _.find(contentEditingHelper.getAllProps($scope.content), function (e) { return e.alias === '_umb_password' }); - passwordProp.value.reset = true; + passwordProp.value.reset = !passwordProp.value.oldPassword && passwordProp.config.allowManuallyChangingPassword; memberResource.save($scope.content, $routeParams.create, fileManager.getFiles()) .then(function(data) {