Merge pull request #3116 from nextcloud/fix/misc-bugs

fix some bugs after testing

appinfo/info.xml

@@ -4,7 +4,7 @@
     <name>Polls</name>
     <summary>A polls app, similar to Doodle/Dudle with the possibility to restrict access.</summary>
     <description>A polls app, similar to Doodle/Dudle with the possibility to restrict access (members, certain groups/users, hidden and public).</description>
-    <version>5.4.0-beta6</version>
+    <version>5.4.0-rc1</version>
     <licence>agpl</licence>
     <author>Vinzenz Rosenkranz</author>
     <author>René Gieling</author>

src/js/components/Options/OptionsText.vue

@@ -45,8 +45,8 @@
 							:title="t('polls', 'Delete option')"
 							@delete="removeOption(option)" />
 						<NcButton v-if="closed"
-							v-tooltip="confirmationCaption"
-							:aria-label="confirmationCaption"
+							v-tooltip="option.confirmed ? t('polls', 'Unconfirm option') : t('polls', 'Confirm option')"
+							:aria-label="option.confirmed ? t('polls', 'Unconfirm option') : t('polls', 'Confirm option')"
 							type="tertiary"
 							@click="confirmOption(option)">
 							<template #icon>
@@ -123,10 +123,6 @@ export default {
 			countOptions: 'options/count',
 		}),
 
-		confirmationCaption() {
-			return this.option.confirmed ? t('polls', 'Unconfirm option') : t('polls', 'Confirm option')
-		},
-
 		dragOptions() {
 			return {
 				animation: 200,

src/js/views/Vote.vue

@@ -171,6 +171,7 @@ export default {
 			proposalsAllowed: 'poll/proposalsAllowed',
 			proposalsOpen: 'poll/proposalsOpen',
 			proposalsExpirySet: 'poll/proposalsExpirySet',
+			proposalsExpired: 'poll/proposalsExpired',
 			proposalsExpireRelative: 'poll/proposalsExpireRelative',
 			countHiddenParticipants: 'poll/countHiddenParticipants',
 			safeTable: 'poll/safeTable',