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

Fixes #9983 - Getting kicked, if document type has a Umbraco.UserPicker property (#10002)

Browse Source 
* Fixes #9983

Temporary fix for this issue. using the entityservice like before.

* Needed to remove the call to usersResource here as well for displaying the picked items

* Don't need usersResource for now

(cherry picked from commit 45de0a101e)
This commit is contained in:
Sebastiaan Janssen
2021-03-18 13:01:46 +01:00
parent e17bf386a4
commit 73439d4cba
2 changed files with 21 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/userpicker/userpicker.controller.js
View File

@@ -1,8 +1,8 @@
(function () {
"use strict";
function UserPickerController($scope, usersResource, localizationService, eventsService) {
function UserPickerController($scope, entityResource, localizationService, eventsService) {
var vm = this;
vm.users = [];
@@ -102,17 +102,9 @@
vm.loading = true;
// Get users
usersResource.getPagedResults(vm.usersOptions).then(function (users) {
vm.users = users.items;
vm.usersOptions.pageNumber = users.pageNumber;
vm.usersOptions.pageSize = users.pageSize;
vm.usersOptions.totalItems = users.totalItems;
vm.usersOptions.totalPages = users.totalPages;
entityResource.getAll("User").then(function (data) {
vm.users = data;
preSelect($scope.model.selection, vm.users);
vm.loading = false;
});
}

29
src/Umbraco.Web.UI.Client/src/views/propertyeditors/userpicker/userpicker.controller.js
View File

@@ -1,4 +1,4 @@
function userPickerController($scope, usersResource , iconHelper, editorService, overlayService){
function userPickerController($scope, iconHelper, editorService, overlayService, entityResource) {
function trim(str, chr) {
var rgxtrim = (!chr) ? new RegExp('^\\s+|\\s+$', 'g') : new RegExp('^' + chr + '+|' + chr + '+$', 'g');
@@ -92,17 +92,22 @@ function userPickerController($scope, usersResource , iconHelper, editorService,
unsubscribe();
});
//load user data
var modelIds = $scope.model.value ? $scope.model.value.split(',') : [];
// entityResource.getByIds doesn't support "User" and we would like to show avatars in umb-user-preview as well.
usersResource.getUsers(modelIds).then(function (data) {
_.each(data, function (item, i) {
// set default icon if it's missing
item.icon = item.icon ? iconHelper.convertFromLegacyIcon(item.icon) : "icon-user";
$scope.renderModel.push({ name: item.name, id: item.id, udi: item.udi, icon: item.icon, avatars: item.avatars });
});
});
//load user data - split to an array of ints (map)
const modelIds = $scope.model.value ? $scope.model.value.split(',').map(x => +x) : [];
if(modelIds.length !== 0) {
entityResource.getAll("User").then(function (users) {
const filteredUsers = users.filter(user => modelIds.indexOf(user.id) !== -1);
filteredUsers.forEach(item => {
$scope.renderModel.push({
name: item.name,
id: item.id,
udi: item.udi,
icon: item.icon = item.icon ? iconHelper.convertFromLegacyIcon(item.icon) : "icon-user",
avatars: item.avatars
});
});
});
}
}