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

removes userResource and adds the disableUser to the usersResource

Browse Source
This commit is contained in:
Shannon
2017-05-18 15:53:54 +10:00
parent 4c61cac9a8
commit b130ccf9c1
3 changed files with 16 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/lib/umbraco/LegacyUmbClientMgr.js
View File

@@ -194,7 +194,7 @@ Umbraco.Sys.registerNamespace("Umbraco.Application");
if (currentMenuNode) {
if (confirm(txtConfirmDisable + ' "' + UmbClientMgr.mainTree().getActionNode().nodeName + '"?\n\n')) {
angularHelper.safeApply($rootScope, function () {
userResource.disableUser(currentMenuNode.nodeId).then(function () {
usersResource.disableUser(currentMenuNode.nodeId).then(function () {
UmbClientMgr.mainTree().syncTree("-1," + currentMenuNode.nodeId, true);
});
});

25
src/Umbraco.Web.UI.Client/src/common/resources/user.resource.js
View File

@@ -1,25 +0,0 @@
/**
* @ngdoc service
* @name umbraco.resources.userResource
**/
function userResource($q, $http, umbDataFormatter, umbRequestHelper) {
return {
disableUser: function (userId) {
if (!userId) {
throw "userId not specified";
}
return umbRequestHelper.resourcePromise(
$http.post(
umbRequestHelper.getApiUrl(
"userApiBaseUrl",
"PostDisableUser", [{ userId: userId }])),
'Failed to disable the user ' + userId);
}
};
}
angular.module('umbraco.resources').factory('userResource', userResource);

16
src/Umbraco.Web.UI.Client/src/common/resources/users.resource.js
View File

@@ -11,6 +11,19 @@
function usersResource($http, umbRequestHelper, $q) {
function disableUser(userId) {
if (!userId) {
throw "userId not specified";
}
return umbRequestHelper.resourcePromise(
$http.post(
umbRequestHelper.getApiUrl(
"userApiBaseUrl",
"PostDisableUser", [{ userId: userId }])),
'Failed to disable the user ' + userId);
}
function getUser() {
var deferred = $q.defer();
var user = {
@@ -288,7 +301,8 @@
getUser: getUser,
getUsers: getUsers,
getUserRole: getUserRole,
getUserGroups: getUserGroups
getUserGroups: getUserGroups,
disableUser: disableUser
};
return resource;