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

wire up enable and disable user

Browse Source
This commit is contained in:
Mads Rasmussen
2017-05-25 22:09:52 +02:00
parent 8aabb3e3d0
commit 7934ea14a3
3 changed files with 64 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/Umbraco.Web.UI.Client/src/common/services/usershelper.service.js Normal file
View File

@@ -0,0 +1,32 @@
(function () {
'use strict';
function usersHelperService(localizationService) {
function getUserStateFromValue(value) {
switch (value) {
case 0:
return { "name": "Active", "alias": "active", "color": "success" };
case 1:
return { "name": "Disabled", "alias": "disabled", "color": "danger" };
case 2:
return { "name": "Locked out", "alias": "lockedOut", "color": "danger" };
case 3:
return { "name": "Invited", "alias": "invited", "color": "warning" };
}
}
////////////
var service = {
getUserStateFromValue: getUserStateFromValue
};
return service;
}
angular.module('umbraco.services').factory('usersHelper', usersHelperService);
})();

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

@@ -1,7 +1,7 @@
(function () {
"use strict";
function UserEditController($scope, $timeout, $location, $routeParams, usersResource, contentEditingHelper, localizationService, notificationsService, mediaHelper, Upload, umbRequestHelper) {
function UserEditController($scope, $timeout, $location, $routeParams, usersResource, contentEditingHelper, localizationService, notificationsService, mediaHelper, Upload, umbRequestHelper, usersHelper) {
var vm = this;
var localizeSaving = localizationService.localize("general_saving");
@@ -17,8 +17,8 @@
vm.openMediaPicker = openMediaPicker;
vm.removeSelectedItem = removeSelectedItem;
vm.disableUser = disableUser;
vm.enableUser = enableUser;
vm.resetPassword = resetPassword;
vm.getUserStateType = getUserStateType;
vm.clearAvatar = clearAvatar;
vm.save = save;
vm.maxFileSize = Umbraco.Sys.ServerVariables.umbracoSettings.maxFileSize + "KB"
@@ -32,6 +32,7 @@
usersResource.getUser($routeParams.id).then(function (user) {
vm.user = user;
makeBreadcrumbs(vm.user);
setUserDisplayState();
vm.loading = false;
});
@@ -142,7 +143,25 @@
}
function disableUser() {
alert("disable user");
vm.disableUserButtonState = "busy";
usersResource.disableUsers([vm.user.id]).then(function (data) {
if (data === "true") {
vm.disableUserButtonState = "success";
} else {
vm.disableUserButtonState = "error";
}
});
}
function enableUser() {
vm.enableUserButtonState = "busy";
usersResource.enableUsers([vm.user.id]).then(function (data) {
if (data === "true") {
vm.enableUserButtonState = "success";
} else {
vm.enableUserButtonState = "error";
}
});
}
function resetPassword() {
@@ -156,17 +175,6 @@
});
}
function getUserStateType(state) {
switch (state) {
case "disabled" || "umbracoDisabled":
return "danger";
case "pending":
return "warning";
default:
return "success";
}
}
$scope.changeAvatar = function (files, event) {
if (files && files.length > 0) {
upload(files[0]);
@@ -237,6 +245,10 @@
];
}
function setUserDisplayState() {
vm.user.userDisplayState = usersHelper.getUserStateFromValue(vm.user.userState);
}
init();
}

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

@@ -145,20 +145,17 @@
</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">
<umb-badge
style="margin-top: 4px;"
size="s"
ng-if="user.state !== 'active'"
color="{{vm.getUserStateType(vm.user.state)}}">
{{ vm.user.state }}
color="{{vm.user.userDisplayState.color}}">
{{vm.user.userDisplayState.name}}
</umb-badge>
</div>
</div>
-->
<div class="umb-package-details__information-item">
<div class="umb-package-details__information-item-label">Last login:</div>
@@ -181,10 +178,11 @@
<div style="margin-top: 20px;">
<div style="margin-bottom: 10px;">
<umb-button
ng-if="vm.user.state === 'active'"
ng-if="vm.user.userDisplayState.alias === 'active'"
type="button"
button-style="[danger,block]"
action="vm.disableUser()"
state="vm.disableUserButtonState"
label="Disable user"
size="m">
</umb-button>
@@ -192,9 +190,10 @@
<div style="margin-bottom: 10px;">
<umb-button
ng-if="vm.user.state === 'disabled'"
ng-if="vm.user.userDisplayState.alias === 'disabled'"
type="button"
button-style="[success,block]"
state="vm.enableUserButtonState"
action="vm.enableUser()"
label="Enable user"
size="m">