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

Merge remote-tracking branch 'origin/release/17.0'

Browse Source
This commit is contained in:
Jacob Overgaard
2025-12-03 15:10:47 +01:00
parent 6104ae60ce 86411e4ae3
commit c35fcf181b
7 changed files with 59 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Umbraco.Web.UI.Client/src/assets/lang/da.ts
View File

@@ -591,7 +591,7 @@ export default {
chooseMediaStartNode: 'Vælg startnode for medie',
selectMediaType: 'Vælg medietype',
selectIcon: 'Vælg ikon',
selectItem: 'Vælg item',
selectItem: 'Vælg element',
selectLink: 'Vælg link',
addLink: 'Tilføj Link',
updateLink: 'Opdater Link',
@@ -2366,10 +2366,10 @@ export default {
labelUsedByDocuments: 'Brugt i Dokumenter',
labelUsedByMembers: 'Brugt i Medlemmer',
labelUsedByMedia: 'Brugt i Medier',
itemHasNoReferences: 'This item has no references.',
labelUsedByDocumentTypes: 'Referenced by the following Document Types',
labelUsedByItems: 'Referenced by the following items',
labelDependsOnThis: 'The following items depend on this',
itemHasNoReferences: 'Ingen referencer',
labelUsedByDocumentTypes: 'Refereret af følgende Dokument Typer',
labelUsedByItems: 'Refereret af',
labelDependsOnThis: 'Følgende elementer er afhængige af dette',
labelUsedItems: 'The following items are referenced',
labelUsedDescendants: 'The following descendant items have dependencies',
labelDependentDescendants: 'The following descending items have dependencies',

2
src/Umbraco.Web.UI.Client/src/assets/lang/en.ts
View File

@@ -2447,7 +2447,7 @@ export default {
'This item or its descendants is being used. Unpublishing can lead to broken links on your website. Please take the appropriate actions.',
deleteDisabledWarning: 'This item or its descendants is being used. Therefore, deletion has been disabled.',
listViewDialogWarning: 'The following items you are trying to %0% are used by other content.',
labelUsedByItems: 'Referenced by the following items',
labelUsedByItems: 'Referenced by',
labelDependsOnThis: 'The following items depend on this',
labelDependentDescendants: 'The following descending items have dependencies',
labelMoreReferences: (count: number) => {

15
src/Umbraco.Web.UI.Client/src/packages/data-type/reference/info-app/manifests.ts
View File

@@ -1,6 +1,9 @@
import { UMB_DATA_TYPE_WORKSPACE_ALIAS } from '../../workspace/constants.js';
import { UMB_DATA_TYPE_REFERENCE_REPOSITORY_ALIAS } from '../constants.js';
import { UMB_WORKSPACE_CONDITION_ALIAS } from '@umbraco-cms/backoffice/workspace';
import {
UMB_WORKSPACE_CONDITION_ALIAS,
UMB_WORKSPACE_ENTITY_IS_NEW_CONDITION_ALIAS,
} from '@umbraco-cms/backoffice/workspace';
export const manifests: Array<UmbExtensionManifest> = [
{
@@ -8,14 +11,18 @@ export const manifests: Array<UmbExtensionManifest> = [
kind: 'entityReferences',
name: 'Data Type References Workspace Info App',
alias: 'Umb.WorkspaceInfoApp.DataType.References',
meta: {
referenceRepositoryAlias: UMB_DATA_TYPE_REFERENCE_REPOSITORY_ALIAS,
},
conditions: [
{
alias: UMB_WORKSPACE_CONDITION_ALIAS,
match: UMB_DATA_TYPE_WORKSPACE_ALIAS,
},
{
alias: UMB_WORKSPACE_ENTITY_IS_NEW_CONDITION_ALIAS,
match: false,
},
],
meta: {
referenceRepositoryAlias: UMB_DATA_TYPE_REFERENCE_REPOSITORY_ALIAS,
},
},
];

15
src/Umbraco.Web.UI.Client/src/packages/documents/documents/reference/info-app/manifests.ts
View File

@@ -1,6 +1,9 @@
import { UMB_DOCUMENT_WORKSPACE_ALIAS } from '../../workspace/constants.js';
import { UMB_DOCUMENT_REFERENCE_REPOSITORY_ALIAS } from '../constants.js';
import { UMB_WORKSPACE_CONDITION_ALIAS } from '@umbraco-cms/backoffice/workspace';
import {
UMB_WORKSPACE_CONDITION_ALIAS,
UMB_WORKSPACE_ENTITY_IS_NEW_CONDITION_ALIAS,
} from '@umbraco-cms/backoffice/workspace';
export const manifests: Array<UmbExtensionManifest> = [
{
@@ -8,14 +11,18 @@ export const manifests: Array<UmbExtensionManifest> = [
kind: 'entityReferences',
name: 'Document References Workspace Info App',
alias: 'Umb.WorkspaceInfoApp.Document.References',
meta: {
referenceRepositoryAlias: UMB_DOCUMENT_REFERENCE_REPOSITORY_ALIAS,
},
conditions: [
{
alias: UMB_WORKSPACE_CONDITION_ALIAS,
match: UMB_DOCUMENT_WORKSPACE_ALIAS,
},
{
alias: UMB_WORKSPACE_ENTITY_IS_NEW_CONDITION_ALIAS,
match: false,
},
],
meta: {
referenceRepositoryAlias: UMB_DOCUMENT_REFERENCE_REPOSITORY_ALIAS,
},
},
];

15
src/Umbraco.Web.UI.Client/src/packages/media/media/reference/info-app/manifests.ts
View File

@@ -1,6 +1,9 @@
import { UMB_MEDIA_WORKSPACE_ALIAS } from '../../workspace/constants.js';
import { UMB_MEDIA_REFERENCE_REPOSITORY_ALIAS } from '../constants.js';
import { UMB_WORKSPACE_CONDITION_ALIAS } from '@umbraco-cms/backoffice/workspace';
import {
UMB_WORKSPACE_CONDITION_ALIAS,
UMB_WORKSPACE_ENTITY_IS_NEW_CONDITION_ALIAS,
} from '@umbraco-cms/backoffice/workspace';
export const manifests: Array<UmbExtensionManifest> = [
{
@@ -8,14 +11,18 @@ export const manifests: Array<UmbExtensionManifest> = [
kind: 'entityReferences',
name: 'Media References Workspace Info App',
alias: 'Umb.WorkspaceInfoApp.Media.References',
meta: {
referenceRepositoryAlias: UMB_MEDIA_REFERENCE_REPOSITORY_ALIAS,
},
conditions: [
{
alias: UMB_WORKSPACE_CONDITION_ALIAS,
match: UMB_MEDIA_WORKSPACE_ALIAS,
},
{
alias: UMB_WORKSPACE_ENTITY_IS_NEW_CONDITION_ALIAS,
match: false,
},
],
meta: {
referenceRepositoryAlias: UMB_MEDIA_REFERENCE_REPOSITORY_ALIAS,
},
},
];

15
src/Umbraco.Web.UI.Client/src/packages/members/member/reference/info-app/manifests.ts
View File

@@ -1,6 +1,9 @@
import { UMB_MEMBER_WORKSPACE_ALIAS } from '../../workspace/constants.js';
import { UMB_MEMBER_REFERENCE_REPOSITORY_ALIAS } from '../constants.js';
import { UMB_WORKSPACE_CONDITION_ALIAS } from '@umbraco-cms/backoffice/workspace';
import {
UMB_WORKSPACE_CONDITION_ALIAS,
UMB_WORKSPACE_ENTITY_IS_NEW_CONDITION_ALIAS,
} from '@umbraco-cms/backoffice/workspace';
export const manifests: Array<UmbExtensionManifest> = [
{
@@ -8,14 +11,18 @@ export const manifests: Array<UmbExtensionManifest> = [
kind: 'entityReferences',
name: 'Member References Workspace Info App',
alias: 'Umb.WorkspaceInfoApp.Member.References',
meta: {
referenceRepositoryAlias: UMB_MEMBER_REFERENCE_REPOSITORY_ALIAS,
},
conditions: [
{
alias: UMB_WORKSPACE_CONDITION_ALIAS,
match: UMB_MEMBER_WORKSPACE_ALIAS,
},
{
alias: UMB_WORKSPACE_ENTITY_IS_NEW_CONDITION_ALIAS,
match: false,
},
],
meta: {
referenceRepositoryAlias: UMB_MEMBER_REFERENCE_REPOSITORY_ALIAS,
},
},
];

11
src/Umbraco.Web.UI.Client/src/packages/relations/relations/reference/workspace-info-app/entity-references-workspace-view-info.element.ts
View File

@@ -103,7 +103,6 @@ export class UmbEntityReferencesWorkspaceInfoAppElement extends UmbLitElement {
}
override render() {
if (!this._items?.length) return nothing;
return html`
<umb-workspace-info-app-layout headline="#references_labelUsedByItems">
<div id="content">${this.#renderItems()} ${this.#renderReferencePagination()}</div>
@@ -112,7 +111,10 @@ export class UmbEntityReferencesWorkspaceInfoAppElement extends UmbLitElement {
}
#renderItems() {
if (!this._items) return;
if (!this._items) return nothing;
if (this._items.length === 0) {
return html`<umb-localize class="noItems" key="references_itemHasNoReferences"></umb-localize>`;
}
return html`
<uui-ref-list>
${repeat(
@@ -150,6 +152,11 @@ export class UmbEntityReferencesWorkspaceInfoAppElement extends UmbLitElement {
display: contents;
}
.noItems {
display: block;
margin: var(--uui-size-space-2);
}
#content {
display: block;
padding: var(--uui-size-space-3) var(--uui-size-space-4);