1
0

Merge branch 'main' into feature/vue3-modals-with-router-4

# Conflicts:
#	src/router/index.ts
#	src/views/tasks/TaskDetailView.vue
This commit is contained in:
kolaente
2022-01-18 21:47:17 +01:00
62 changed files with 1180 additions and 1107 deletions

View File

@ -4,7 +4,7 @@
<template v-for="(s, i) in shortcuts" :key="i">
<h3>{{ $t(s.title) }}</h3>
<message>
<message class="mb-4">
{{
s?.available($route)
? $t('keyboardShortcuts.currentPageOnly')

View File

@ -13,7 +13,7 @@
<section class="content">
<div>
<h2 class="title" v-if="title">{{ title }}</h2>
<api-config @foundApi="hasApiUrl = true"/>
<api-config/>
<slot/>
</div>
<legal/>
@ -23,9 +23,9 @@
</template>
<script lang="ts" setup>
import Logo from '@/components/home/Logo'
import Message from '@/components/misc/message'
import Legal from '@/components/misc/legal'
import Logo from '@/components/home/Logo.vue'
import Message from '@/components/misc/message.vue'
import Legal from '@/components/misc/legal.vue'
import ApiConfig from '@/components/misc/api-config.vue'
import {useStore} from 'vuex'
import {computed} from 'vue'

View File

@ -23,7 +23,7 @@
</template>
<script lang="ts" setup>
import {computed, shallowRef} from 'vue'
import {computed, PropType, shallowRef} from 'vue'
import {useI18n} from 'vue-i18n'
import SubscriptionService from '@/services/subscription'
@ -38,9 +38,11 @@ const props = defineProps({
},
subscription: {
required: true,
type: Object as PropType<SubscriptionModel>,
},
entityId: {
required: true,
type: Number,
},
isButton: {
type: Boolean,
@ -48,6 +50,8 @@ const props = defineProps({
},
})
const subscriptionEntity = computed<string>(() => props.subscription.entity)
const emit = defineEmits(['change'])
const subscriptionService = shallowRef(new SubscriptionService())
@ -57,7 +61,7 @@ const tooltipText = computed(() => {
if (disabled.value) {
return t('task.subscription.subscribedThroughParent', {
entity: props.entity,
parent: props.subscription.entity,
parent: subscriptionEntity.value,
})
}
@ -73,7 +77,7 @@ const disabled = computed(() => {
return false
}
return props.subscription.entity !== props.entity
return subscriptionEntity.value !== props.entity
})
function changeSubscription() {