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

read from languages - save to allowedLanguages

Browse Source
This commit is contained in:
Mads Rasmussen
2022-05-10 11:39:39 +02:00
parent 5c2b0121ba
commit 2e100e60c4
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js
View File

@@ -189,7 +189,7 @@
/** formats the display model used to display the user group to the model used to save the user group*/
formatUserGroupPostData: function (displayModel, action) {
//create the save model from the display model
var saveModel = _.pick(displayModel, 'id', 'alias', 'name', 'icon', 'sections', 'users', 'defaultPermissions', 'assignedPermissions', 'allowedLanguages');
var saveModel = _.pick(displayModel, 'id', 'alias', 'name', 'icon', 'sections', 'users', 'defaultPermissions', 'assignedPermissions', 'languages');
// the start nodes cannot be picked as the property name needs to change - assign manually
saveModel.startContentId = displayModel['contentStartNode'];
@@ -264,7 +264,7 @@
}
// make sure the allowed languages are just an array of id's
saveModel.allowedLanguages = saveModel.allowedLanguages && saveModel.allowedLanguages.length > 0 ? saveModel.allowedLanguages.map(language => language.id) : [];
saveModel.allowedLanguages = saveModel.languages && saveModel.languages.length > 0 ? saveModel.languages.map(language => language.id) : [];
saveModel.parentId = -1;
return saveModel;

4
src/Umbraco.Web.UI.Client/src/views/users/group.controller.js
View File

@@ -113,11 +113,11 @@
function openLanguagePicker() {
var currentSelection = [];
Utilities.copy(vm.userGroup.allowedLanguages, currentSelection);
Utilities.copy(vm.userGroup.languages, currentSelection);
var languagePicker = {
selection: currentSelection,
submit: function (model) {
vm.userGroup.allowedLanguages = model.selection;
vm.userGroup.languages = model.selection;
editorService.close();
},
close: function () {

2
src/Umbraco.Web.UI.Client/src/views/users/group.html
View File

@@ -27,7 +27,7 @@
<umb-control-group style="margin-bottom: 20px;" label="@treeHeaders_languages"
description="@user_languagesHelp">
<umb-node-preview style="max-width: 100%;" ng-repeat="language in vm.userGroup.allowedLanguages"
<umb-node-preview style="max-width: 100%;" ng-repeat="language in vm.userGroup.languages"
icon="language.icon" name="language.name" allow-remove="true"
on-remove="vm.removeLanguage($index)">
</umb-node-preview>