Merge pull request #841 from nextcloud/fix/823

Prevent read-only calendar as default calendar
nextcloud · Jan 29, 2020 · fb153a0 · fb153a0
2 parents d8a26c7 + 5fa79e8
commit fb153a0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/components/TheSettings.vue b/src/components/TheSettings.vue
@@ -111,7 +111,7 @@ export default {
 			collections: state => state.collections.collections
 		}),
 		...mapGetters({
-			calendars: 'getSortedCalendars'
+			calendars: 'getSortedWritableCalendars'
 		})
 	},
 	methods:

diff --git a/src/store/calendars.js b/src/store/calendars.js
@@ -233,7 +233,12 @@ const getters = {
 	 * @returns {Calendar} The default calendar
 	 */
 	getDefaultCalendar: (state, getters, rootState) => {
-		return getters.getCalendarById(rootState.settings.settings.defaultCalendarId) || getters.getSortedCalendars[0]
+		const defaultCalendar = getters.getCalendarById(rootState.settings.settings.defaultCalendarId)
+		// If the default calendar is read only we return the first calendar that is writable
+		if (!defaultCalendar || defaultCalendar.readOnly) {
+			return getters.getSortedCalendars.find(calendar => !calendar.readOnly) || getters.getSortedCalendars[0]
+		}
+		return defaultCalendar
 	}
 }