yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add UI feedback when enabling/disabling user

Browse Source
This commit is contained in:
Mads Rasmussen
2017-06-16 14:03:06 +02:00
parent 00659711d9
commit efaa24fb51
3 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -174,10 +174,23 @@
vm.disableUserButtonState = "busy";
usersResource.disableUsers([vm.user.id]).then(function (data) {
if (data === "true") {
vm.user.userState = 1;
setUserDisplayState();
vm.disableUserButtonState = "success";
localizationService.localize("speechBubbles_disableUserSuccess", [vm.user.name]).then(function (value) {
notificationsService.success(value);
});
} else {
vm.disableUserButtonState = "error";
localizationService.localize("speechBubbles_disableUserError").then(function (value) {
notificationsService.error(value);
});
}
}, function(error){
vm.disableUserButtonState = "error";
localizationService.localize("speechBubbles_disableUserError").then(function (value) {
notificationsService.error(value);
});
});
}
@@ -185,10 +198,23 @@
vm.enableUserButtonState = "busy";
usersResource.enableUsers([vm.user.id]).then(function (data) {
if (data === "true") {
vm.user.userState = 0;
setUserDisplayState();
vm.enableUserButtonState = "success";
localizationService.localize("speechBubbles_enableUserSuccess", [vm.user.name]).then(function (value) {
notificationsService.success(value);
});
} else {
vm.enableUserButtonState = "error";
localizationService.localize("speechBubbles_enableUserError").then(function (value) {
notificationsService.error(value);
});
}
}, function(error){
vm.disableUserButtonState = "error";
localizationService.localize("speechBubbles_enableUserError").then(function (value) {
notificationsService.error(value);
});
});
}

4
src/Umbraco.Web.UI.Client/src/views/users/user.html
View File

@@ -154,7 +154,6 @@
</div>
<!--
<div class="umb-package-details__information-item">
<div class="umb-package-details__information-item-label">Status</div>
<div class="umb-package-details__information-item-content">
@@ -166,7 +165,6 @@
</umb-badge>
</div>
</div>
-->
<div class="umb-package-details__information-item">
<div class="umb-package-details__information-item-label">Last login:</div>
@@ -201,7 +199,7 @@
<div style="margin-bottom: 10px;">
<umb-button
ng-if="vm.user.userDisplayState.alias === 'disabled'"
ng-if="vm.user.userDisplayState.alias === 'disabled' || vm.user.userDisplayState.alias === 'lockedOut'"
type="button"
button-style="[success,block]"
state="vm.enableUserButtonState"

5
src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
View File

@@ -1034,6 +1034,11 @@ To manage your website, simply open the Umbraco back office and start adding con
<key alias="scriptErrorHeader">Script view not saved</key>
<key alias="scriptErrorText">An error occurred saving the file.</key>
<key alias="cssErrorText">An error occurred saving the file.</key>
<key alias="enableUserSuccess">%0% is now enabled </key>
<key alias="enableUserError">An error occurred while enabling the user</key>
<key alias="disableUserSuccess">%0% is now disabled</key>
<key alias="disableUserError">An error occurred while disabling the user</key>
</area>
<area alias="stylesheet">
<key alias="aliasHelp">Uses CSS syntax ex: h1, .redHeader, .blueTex</key>