From 2e100e60c46cd25bfb6316fe454bdcc832fa0ff8 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Tue, 10 May 2022 11:39:39 +0200 Subject: [PATCH] read from languages - save to allowedLanguages --- .../src/common/services/umbdataformatter.service.js | 4 ++-- src/Umbraco.Web.UI.Client/src/views/users/group.controller.js | 4 ++-- src/Umbraco.Web.UI.Client/src/views/users/group.html | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js b/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js index f3957de2e0..3ed99d6fae 100644 --- a/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js +++ b/src/Umbraco.Web.UI.Client/src/common/services/umbdataformatter.service.js @@ -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; diff --git a/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js b/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js index e4d0e39e16..b2d1f0e534 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/users/group.controller.js @@ -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 () { diff --git a/src/Umbraco.Web.UI.Client/src/views/users/group.html b/src/Umbraco.Web.UI.Client/src/views/users/group.html index 7c47f7169a..cf811410a2 100644 --- a/src/Umbraco.Web.UI.Client/src/views/users/group.html +++ b/src/Umbraco.Web.UI.Client/src/views/users/group.html @@ -27,7 +27,7 @@ -