Merge branch 'dev-v7.7' into temp-U4-10275

src/Umbraco.Web.UI.Client/src/common/services/contenteditinghelper.service.js

@@ -458,14 +458,7 @@ function contentEditingHelper(fileManager, $q, $location, $routeParams, notifica
                     //indicates we've handled the server result
                     return true;
                 }
-                else {
-                    dialogService.ysodDialog(args.err);
-                }
             }
-            else {
-                dialogService.ysodDialog(args.err);
-            }
-
             return false;
         },
 

src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.controller.js

@@ -119,7 +119,7 @@ angular.module("umbraco")
            $scope.changePasswordModel.config = data;
            //ensure the hasPassword config option is set to true (the user of course has a password already assigned)
            //this will ensure the oldPassword is shown so they can change it
-           // disable reset password functionality beacuse it does not make sense inside the backoffice
+           // disable reset password functionality beacuse it does not make sense for the current user.
            $scope.changePasswordModel.config.hasPassword = true;
            $scope.changePasswordModel.config.disableToggle = true;
            $scope.changePasswordModel.config.enableReset = false;

src/Umbraco.Web.UI.Client/src/views/users/user.controller.js

@@ -78,6 +78,14 @@
                   vm.changePasswordModel.config.hasPassword = vm.user.userState !== 3 && vm.user.userState !== 4;
 
                   vm.changePasswordModel.config.disableToggle = true;
+
+                  //this is only relavent for membership providers now (it's basically obsolete)
+                  vm.changePasswordModel.config.enableReset = false;
+
+                  //in the ASP.NET Identity world, this config option will allow an admin user to change another user's password
+                  //if the user has access to the user section. So if this editor is being access, the user of course has access to this section.
+                  //the authorization check is also done on the server side when submitted.
+                  vm.changePasswordModel.config.allowManuallyChangingPassword = !vm.user.isCurrentUser;
                   
                   vm.loading = false;
                 });
@@ -112,6 +120,9 @@
             vm.page.saveButtonState = "busy";
             vm.user.resetPasswordValue = null;
 
+            //anytime a user is changing another user's password, we are in effect resetting it so we need to set that flag here
+            vm.user.changePassword.reset = !vm.user.changePassword.oldPassword && !vm.user.isCurrentUser;
+
             contentEditingHelper.contentEditorPerformSave({
                 statusMessage: vm.labels.saving,
                 saveMethod: usersResource.saveUser,