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

Merge branch 'bugfix/user-access-unique-mapping' into bugfix/ignore-user-start-node-for-document-and-media-trees

Browse Source
This commit is contained in:
Mads Rasmussen
2024-05-16 09:56:15 +02:00
parent 4488ccd13e 035971e835
commit 3a7335ff0a
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-access/user-workspace-access.element.ts
View File

@@ -40,12 +40,15 @@ export class UmbUserWorkspaceAccessElement extends UmbLitElement {
#renderDocumentStartNodes() {
return html` <b><umb-localize key="sections_content">Content</umb-localize></b>
<umb-user-document-start-node
.uniques=${this._user?.documentStartNodeUniques || []}></umb-user-document-start-node>`;
.uniques=${this._user?.documentStartNodeUniques.map((reference) => reference.unique) ||
[]}></umb-user-document-start-node>`;
}
#renderMediaStartNodes() {
return html` <b><umb-localize key="sections_media">Media</umb-localize></b>
<umb-user-media-start-node .uniques=${this._user?.mediaStartNodeUniques || []}></umb-user-media-start-node>`;
<umb-user-media-start-node
.uniques=${this._user?.mediaStartNodeUniques.map((reference) => reference.unique) ||
[]}></umb-user-media-start-node>`;
}
static styles = [

6
src/Umbraco.Web.UI.Client/src/packages/user/user/workspace/components/user-workspace-assign-access/user-workspace-assign-access.element.ts
View File

@@ -130,7 +130,7 @@ export class UmbUserWorkspaceAssignAccessElement extends UmbLitElement {
description="${this.localize.term('user_groupsHelp')}">
<umb-user-group-input
slot="editor"
.selection=${this._userGroupUniques}
.selection=${this._userGroupUniques.map((reference) => reference.unique)}
@change=${this.#onUserGroupsChange}></umb-user-group-input>
</umb-property-layout>`;
}
@@ -152,7 +152,7 @@ export class UmbUserWorkspaceAssignAccessElement extends UmbLitElement {
? html`
<umb-input-document
slot="editor"
.selection=${this._documentStartNodeUniques}
.selection=${this._documentStartNodeUniques.map((reference) => reference.unique)}
@change=${this.#onDocumentStartNodeChange}></umb-input-document>
`
: nothing}
@@ -177,7 +177,7 @@ export class UmbUserWorkspaceAssignAccessElement extends UmbLitElement {
? html`
<umb-input-media
slot="editor"
.selection=${this._mediaStartNodeUniques}
.selection=${this._mediaStartNodeUniques.map((reference) => reference.unique)}
@change=${this.#onMediaStartNodeChange}></umb-input-media>
`
: nothing}