Merge branch 'main' into feature/login-improvements

src/components/misc/keyboard-shortcuts/index.vue

@@ -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') : $t('keyboardShortcuts.allPages')
 					}}

src/components/misc/subscription.vue

@@ -38,9 +38,13 @@ const props = defineProps({
 	},
 	subscription: {
 		required: true,
+		validator(value) {
+			return value instanceof SubscriptionModel || value === null
+		},
 	},
 	entityId: {
 		required: true,
+		type: Number,
 	},
 	isButton: {
 		type: Boolean,
@@ -48,6 +52,8 @@ const props = defineProps({
 	},
 })
 
+const subscriptionEntity = computed<string>(() => props.subscription.entity)
+
 const emit = defineEmits(['change'])
 
 const subscriptionService = shallowRef(new SubscriptionService())
@@ -57,7 +63,7 @@ const tooltipText = computed(() => {
 	if (disabled.value) {
 		return t('task.subscription.subscribedThroughParent', {
 			entity: props.entity,
-			parent: props.subscription.entity,
+			parent: subscriptionEntity.value,
 		})
 	}
 
@@ -73,7 +79,7 @@ const disabled = computed(() => {
 		return false
 	}
 
-	return props.subscription.entity !== props.entity
+	return subscriptionEntity.value !== props.entity
 })
 
 function changeSubscription() {