ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

Merge branch 'hotfix/modal-title-bug' into develop

This commit is contained in:
Ramon Wenger 2022-07-07 17:04:39 +02:00
parent 1780893da2 5bd50457c5
commit c4affd29da
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/src/components/ContentBlock.vue
View File

@ -84,11 +84,11 @@
import me from '@/mixins/me'; import me from '@/mixins/me';
import { hidden } from '@/helpers/visibility'; import {hidden} from '@/helpers/visibility';
import { CONTENT_TYPE } from '@/consts/types'; import {CONTENT_TYPE} from '@/consts/types';
import PopoverLink from '@/components/ui/PopoverLink'; import PopoverLink from '@/components/ui/PopoverLink';
import { removeAtIndex } from '@/graphql/immutable-operations'; import {removeAtIndex} from '@/graphql/immutable-operations';
import { EDIT_CONTENT_BLOCK_PAGE } from '@/router/module.names'; import {EDIT_CONTENT_BLOCK_PAGE} from '@/router/module.names';
import {instrumentCategory} from '@/helpers/instrumentType'; import {instrumentCategory} from '@/helpers/instrumentType';
const ContentComponent = () => import(/* webpackChunkName: "content-components" */'@/components/content-blocks/ContentComponent'); const ContentComponent = () => import(/* webpackChunkName: "content-components" */'@/components/content-blocks/ContentComponent');

13
client/src/components/modals/Confirm.vue
View File

@ -34,15 +34,20 @@
<script> <script>
import Modal from '@/components/Modal'; import Modal from '@/components/Modal';
export default { export default {
components: { components: {
Modal Modal,
}, },
computed: { computed: {
title() { title() {
return this.$modal.state.payload.title || "Bestätigung"; const {payload} = this.$modal.state;
} if (payload && payload.title) {
return payload.title;
}
return 'Bestätigung';
},
}, },
methods: { methods: {
@ -52,7 +57,7 @@
cancel() { cancel() {
this.$modal.cancel(); this.$modal.cancel();
}, },
} },
}; };
</script> </script>