Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default async function processContentDto(doc: ContentDto, db: DbService)
// Copy essential properties from Post / Tag documents to Content documents
if (parentDoc) {
doc.memberOf = parentDoc.memberOf;
doc.parentTags = parentDoc.tags;
doc.parentTags = [];
doc.parentImageData = parentDoc.imageData;
doc.parentImageBucketId = parentDoc.imageBucketId;

Expand Down
2 changes: 2 additions & 0 deletions app/src/components/navigation/LanguageModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ const removeFromSelected = (id: string) => {
:id="language._id"
:key="language._id"
class="flex w-full items-center p-3"
transition="duration-200 hover:bg-yellow-100/50 dark:hover:bg-yellow-100/25"
>
<div class="flex w-full justify-between">
<div
Expand Down Expand Up @@ -135,6 +136,7 @@ const removeFromSelected = (id: string) => {
:id="language._id"
:key="language._id"
class="flex w-full cursor-pointer items-center gap-1 p-3"
transition="duration-200 hover:bg-yellow-100/50 dark:hover:bg-yellow-100/25"
data-test="add-language-button"
@click="
handleLanguageChange({
Expand Down
2 changes: 1 addition & 1 deletion app/src/pages/SingleContent/SingleContent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ const quickLanguageSwitch = (languageId: string) => {
v-for="language in languages"
:key="language._id"
@click="quickLanguageSwitch(language._id)"
class="flex cursor-pointer select-none items-center gap-2 px-4 py-2 text-sm leading-6 text-zinc-800 hover:bg-zinc-50 dark:text-white dark:hover:bg-slate-600"
class="flex cursor-pointer select-none items-center gap-2 px-4 py-2 text-sm leading-6 text-zinc-800 hover:bg-yellow-100/50 dark:text-white dark:hover:bg-yellow-100/25"
data-test="translationOption"
>
{{ language.name }}
Expand Down
4 changes: 1 addition & 3 deletions cms/src/components/content/EditContent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ const duplicate = async () => {
const clonedParent = _.cloneDeep(editableParent.value);
clonedParent._id = db.uuid();
delete (clonedParent as any)._rev;
clonedParent.tags = [];

if (clonedParent.type === DocType.Tag) (clonedParent as TagDto).taggedDocs = [];
if (clonedParent.imageData?.fileCollections) clonedParent.imageData.fileCollections = [];
const clonedContent = editableContent.value.map((c) => {
Expand All @@ -452,8 +452,6 @@ const duplicate = async () => {
newContent.parentId = clonedParent._id;
newContent.parentType = editableParent.value.type;
newContent.status = PublishStatus.Draft;
newContent.parentTags = [];
newContent.parentTaggedDocs = [];
return newContent;
});
editableParent.value = clonedParent;
Expand Down
8 changes: 4 additions & 4 deletions cms/src/components/content/EditContentValidation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ const statusChanged = computed(
statusBadge.value(props.existingContent).title !=
statusBadge.value(editableContent.value).title,
);

console.log("Status changed:", statusChanged.value);
const validations = ref([] as Validation[]);

const isValid = ref(true);
Expand Down Expand Up @@ -156,9 +156,9 @@ const deleteTranslation = () => {
:class="[
'mx-1.5 rounded-md p-1.5 px-2 sm:px-1',
{
'mb-0 cursor-default bg-yellow-100/40 shadow': isActive && !isCardCollapsed,
'border-1.5 cursor-default bg-white shadow': isActive && isCardCollapsed,
'border bg-white/80 hover:bg-white/100': !isActive,
'mb-0 cursor-default border bg-zinc-200/70': isActive && !isCardCollapsed,
'cursor-default border bg-zinc-200': isActive && isCardCollapsed,
'border bg-white/80 hover:border-zinc-200 hover:bg-zinc-100': !isActive,
},
]"
>
Expand Down
Loading