diff --git a/api/src/dto/ContentDto.ts b/api/src/dto/ContentDto.ts index 8d09b51f6d..4e5131adab 100644 --- a/api/src/dto/ContentDto.ts +++ b/api/src/dto/ContentDto.ts @@ -153,4 +153,9 @@ export class ContentDto extends _contentBaseDto { @IsString() @Expose() parentImageBucketId?: string; // Inherited from parent Post/Tag for image storage + + @IsOptional() + @IsString() + @Expose() + copyright?: string; } diff --git a/app/src/pages/SingleContent/SingleContent.vue b/app/src/pages/SingleContent/SingleContent.vue index 0cd33d5f32..e33d6bc56f 100644 --- a/app/src/pages/SingleContent/SingleContent.vue +++ b/app/src/pages/SingleContent/SingleContent.vue @@ -668,6 +668,12 @@ const quickLanguageSwitch = (languageId: string) => { > By {{ content.author }} +
+ {{ (content as any).copyright }} +
{
+ +
+ Copyright + +
+
Status diff --git a/cms/src/components/forms/LCombobox.vue b/cms/src/components/forms/LCombobox.vue index dcf4dbdf0e..4067aedfdd 100644 --- a/cms/src/components/forms/LCombobox.vue +++ b/cms/src/components/forms/LCombobox.vue @@ -82,7 +82,7 @@ onClickOutside( () => { showDropdown.value = false; }, - { ignore: [dropdown] }, + { ignore: [dropdown, triggerRef] }, ); const highlightedIndex = ref(-1); @@ -111,15 +111,6 @@ const toggle = () => { }); }; -const open = () => { - if (!showDropdown.value) { - showDropdown.value = true; - } - nextTick(() => { - inputElement.value?.focus(); - }); -}; - watch(showEditModal, (newVal) => { if (newVal) { nextTick(() => { @@ -223,7 +214,7 @@ const placementClass = computed(() => { class="relative flex justify-between gap-2 rounded-md border-[1px] border-zinc-300 bg-white pl-3 pr-8 focus-within:outline focus-within:outline-offset-[-2px] focus-within:outline-zinc-950" tabindex="0" v-bind="attrsWithoutStyles" - @click="open()" + @click="toggle()" >
@@ -311,6 +302,7 @@ const placementClass = computed(() => { class="overflow-y-auto rounded-md bg-white shadow-md focus:outline-none" :class="[placementClass, 'max-h-48']" data-test="options" + @click.self="showDropdown = false" @wheel.stop @touchmove.stop > diff --git a/shared/src/types/dto.ts b/shared/src/types/dto.ts index 2c1669e636..89adfc0e24 100644 --- a/shared/src/types/dto.ts +++ b/shared/src/types/dto.ts @@ -110,6 +110,7 @@ export type ContentDto = ContentBaseDto & { parentTaggedDocs?: Uuid[]; availableTranslations?: Uuid[]; parentImageBucketId?: Uuid; + copyright?: string; }; export type ContentParentDto = ContentBaseDto & {