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

Merge branch 'main' into v14/feature/use-uui-1.10-rc0

Browse Source
This commit is contained in:
Niels Lyngsø
2024-09-12 13:18:52 +02:00
committed by GitHub
parent 2bb49ca77c cff2e6ccc0
commit 711c67b111
3 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Umbraco.Web.UI.Client/src/packages/core/content/property-dataset-context/content-property-dataset.context.ts
View File

@@ -75,10 +75,7 @@ export class UmbContentPropertyDatasetContext<
this.observe(
this.#workspace.readOnlyState.states,
(states) => {
const isReadOnly = states.some(
(state) => state.unique.startsWith('UMB_CULTURE_') && state.variantId.equal(this.#variantId),
);
const isReadOnly = states.some((state) => state.variantId.equal(this.#variantId));
this.#currentVariantCultureIsReadOnly.setValue(isReadOnly);
},
'umbObserveReadOnlyStates',

8
src/Umbraco.Web.UI.Client/src/packages/core/workspace/components/workspace-split-view/workspace-split-view-variant-selector.element.ts
View File

@@ -186,13 +186,7 @@ export class UmbWorkspaceSplitViewVariantSelectorElement extends UmbLitElement {
#setReadOnlyCultures() {
this._readOnlyCultures = this._variantOptions
.filter((variant) => {
const isReadOnly = this._readOnlyStates.some((state) => {
return state.unique.startsWith('UMB_CULTURE_') && state.variantId.compare(variant);
});
return isReadOnly;
})
.filter((variant) => this._readOnlyStates.some((state) => state.variantId.compare(variant)))
.map((variant) => variant.culture)
.filter((item) => item !== null) as string[];
}

2
src/Umbraco.Web.UI.Client/src/packages/language/permissions/language-access.workspace-context.ts
View File

@@ -56,7 +56,7 @@ export class UmbLanguageAccessWorkspaceContext extends UmbContextBase<UmbLanguag
const variantIds = disallowedLanguages?.map((variant) => new UmbVariantId(variant.culture, variant.segment)) || [];
// create a list of states for the disallowed languages
const identifier = 'UMB_CULTURE_';
const identifier = 'UMB_LANGUAGE_PERMISSION_';
const readOnlyStates = variantIds.map((variantId) => {
return {
unique: identifier + variantId.culture,