Merge pull request #3891 from nextcloud/backport/3885/stable3.0 (a3b8b819) · Commits · e / infra / ecloud / nextcloud-apps / calendar

src/components/Editor/Invitees/InviteesList.vue

+0 −5

Original line number	Diff line number	Diff line
		@@ -36,7 +36,6 @@
		:key="invitee.email"
		:attendee="invitee"
		:is-read-only="isReadOnly"
		:is-viewed-by-organizer="isViewedByOrganizer"
		:organizer-display-name="organizerDisplayName"
		@remove-attendee="removeAttendee" />
		<NoAttendeesView
		@@ -100,10 +99,6 @@ export default {
		type: Boolean,
		required: true,
		},
		isViewedByOrganizer: {
		type: Boolean,
		required: true,
		},
		calendarObjectInstance: {
		type: Object,
		required: true,

src/components/Editor/Invitees/InviteesListItem.vue

+5 −5

Original line number	Diff line number	Diff line
		@@ -34,7 +34,7 @@
		{{ commonName }}
		</div>
		<div class="invitees-list-item__actions">
		<Actions v-if="!isReadOnly && isViewedByOrganizer">
		<Actions v-if="isViewedByOrganizer">
		<ActionCheckbox
		:checked="attendee.rsvp"
		@change="toggleRSVP">
		@@ -111,10 +111,6 @@ export default {
		type: Boolean,
		required: true,
		},
		isViewedByOrganizer: {
		type: Boolean,
		required: true,
		},
		},
		computed: {
		avatarLink() {
		@@ -147,6 +143,10 @@ export default {
		isNonParticipant() {
		return this.attendee.role === 'NON-PARTICIPANT'
		},
		isViewedByOrganizer() {
		// TODO: check if also viewed by organizer
		return !this.isReadOnly
		},
		},
		methods: {
		/**

src/components/Editor/SaveButtons.vue

+4 −8

Original line number	Diff line number	Diff line
		@@ -74,23 +74,19 @@ export default {
		type: Boolean,
		default: false,
		},
		isReadOnly: {
		type: Boolean,
		default: false,
		},
		},
		computed: {
		showSaveButton() {
		return this.isNew && !this.canCreateRecurrenceException && !this.isReadOnly
		return this.isNew && !this.canCreateRecurrenceException
		},
		shoUpdateButton() {
		return !this.isNew && !this.canCreateRecurrenceException && !this.isReadOnly
		return !this.isNew && !this.canCreateRecurrenceException
		},
		showUpdateOnlyThisButton() {
		return this.canCreateRecurrenceException && !this.forceThisAndAllFuture && !this.isReadOnly
		return this.canCreateRecurrenceException && !this.forceThisAndAllFuture
		},
		showUpdateThisAndFutureButton() {
		return this.canCreateRecurrenceException && !this.isReadOnly
		return this.canCreateRecurrenceException
		},
		},
		methods: {

src/mixins/EditorMixin.js

+0 −17

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ import {
		mapState,
		} from 'vuex'
		import { translate as t } from '@nextcloud/l10n'
		import { removeMailtoPrefix } from '../utils/attendee'

		/**
		* This is a mixin for the editor. It contains common Vue stuff, that is
		@@ -211,19 +210,6 @@ export default {

		return calendar.readOnly
		},
		/**
		* Returns whether or not an attendee is viewing the event
		*
		* @return {boolean}
		*/
		isViewedByAttendee() {
		if (!this.calendarObjectInstance.organizer) {
		return false
		}

		const principal = removeMailtoPrefix(this.$store.getters.getCurrentUserPrincipalEmail)
		return removeMailtoPrefix(this.calendarObjectInstance.organizer.uri) !== principal
		},
		/**
		* Returns all calendars selectable by the user
		*
		@@ -274,9 +260,6 @@ export default {
		if (this.isLoading) {
		return false
		}
		if (this.isViewedByAttendee) {
		return false
		}

		return this.calendarObject.existsOnServer
		},

src/views/EditSidebar.vue

+12 −13

Original line number	Diff line number	Diff line
		@@ -91,7 +91,7 @@
		v-if="showCalendarPicker"
		:calendars="calendars"
		:calendar="selectedCalendar"
		:is-read-only="isReadOnly \|\| !canModifyCalendar \|\| isViewedByAttendee"
		:is-read-only="isReadOnly \|\| !canModifyCalendar"
		@select-calendar="changeCalendar" />

		<PropertyTitleTimePicker
		@@ -100,7 +100,7 @@
		:end-date="endDate"
		:end-timezone="endTimezone"
		:is-all-day="isAllDay"
		:is-read-only="isReadOnly \|\| isViewedByAttendee"
		:is-read-only="isReadOnly"
		:can-modify-all-day="canModifyAllDay"
		:user-timezone="currentUserTimezone"
		:append-to-body="true"
		@@ -122,35 +122,35 @@
		</template>
		<div class="app-sidebar-tab__content">
		<PropertyText
		:is-read-only="isReadOnly \|\| isViewedByAttendee"
		:is-read-only="isReadOnly"
		:prop-model="rfcProps.location"
		:value="location"
		@update:value="updateLocation" />
		<PropertyText
		:is-read-only="isReadOnly \|\| isViewedByAttendee"
		:is-read-only="isReadOnly"
		:prop-model="rfcProps.description"
		:value="description"
		@update:value="updateDescription" />

		<PropertySelect
		:is-read-only="isReadOnly \|\| isViewedByAttendee"
		:is-read-only="isReadOnly"
		:prop-model="rfcProps.status"
		:value="status"
		@update:value="updateStatus" />
		<PropertySelect
		:is-read-only="isReadOnly \|\| isViewedByAttendee"
		:is-read-only="isReadOnly"
		:prop-model="rfcProps.accessClass"
		:value="accessClass"
		@update:value="updateAccessClass" />
		<PropertySelect
		:is-read-only="isReadOnly \|\| isViewedByAttendee"
		:is-read-only="isReadOnly"
		:prop-model="rfcProps.timeTransparency"
		:value="timeTransparency"
		@update:value="updateTimeTransparency" />

		<PropertySelectMultiple
		:colored-options="true"
		:is-read-only="isReadOnly \|\| isViewedByAttendee"
		:is-read-only="isReadOnly"
		:prop-model="rfcProps.categories"
		:value="categories"
		@add-single-value="addCategory"
		@@ -158,7 +158,7 @@

		<PropertyColor
		:calendar-color="selectedCalendarColor"
		:is-read-only="isReadOnly \|\| isViewedByAttendee"
		:is-read-only="isReadOnly"
		:prop-model="rfcProps.color"
		:value="color"
		@update:value="updateColor" />
		@@ -172,7 +172,7 @@
		<Repeat
		:calendar-object-instance="calendarObjectInstance"
		:recurrence-rule="calendarObjectInstance.recurrenceRule"
		:is-read-only="isReadOnly \|\| isViewedByAttendee"
		:is-read-only="isReadOnly"
		:is-editing-master-item="isEditingMasterItem"
		:is-recurrence-exception="isRecurrenceException"
		@force-this-and-all-future="forceModifyingFuture" />
		@@ -199,8 +199,7 @@
		<InviteesList
		v-if="!isLoading"
		:calendar-object-instance="calendarObjectInstance"
		:is-viewed-by-organizer="!isViewedByAttendee"
		:is-read-only="isReadOnly \|\| isViewedByAttendee" />
		:is-read-only="isReadOnly" />
		</div>
		<SaveButtons
		v-if="showSaveButtons"
		@@ -224,7 +223,7 @@
		<ResourceList
		v-if="!isLoading"
		:calendar-object-instance="calendarObjectInstance"
		:is-read-only="isReadOnly \|\| isViewedByAttendee" />
		:is-read-only="isReadOnly" />
		</div>
		<SaveButtons
		v-if="showSaveButtons"