Merge pull request #89 from nextcloud/sidebar_hide_calendars_input_if…

…_only_one editor: show calendar selection only if more than one writable calendar is available
nextcloud · Sep 25, 2016 · 849496c · 849496c
2 parents 85b2a64 + 2dff209
commit 849496c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/js/app/controllers/editorcontroller.js b/js/app/controllers/editorcontroller.js
@@ -172,6 +172,18 @@ app.controller('EditorController', ['$scope', 'TimezoneService', 'AutoCompletion
 				$scope.eventsrepeatview = true;
 			}
 		};
+
+		/**
+		 * Everything calendar select
+		 */
+		$scope.showCalendarSelection = function() {
+			const writableCalendars = $scope.calendars.filter(function (c) {
+				return c.isWritable();
+			});
+
+			return writableCalendars.length > 1;
+		};
+
 		/**
 		 * Everything date and time
 		 */

diff --git a/templates/editor.popover.php b/templates/editor.popover.php
@@ -10,7 +10,8 @@ class="events--input h2"
 			/>
 			<select
 					ng-model="calendar"
-					ng-options="c as c.displayname for c in calendars | orderBy:['order'] | calendarSelectorFilter: oldCalendar"></select>
+					ng-options="c as c.displayname for c in calendars | orderBy:['order'] | calendarSelectorFilter: oldCalendar"
+					ng-show="showCalendarSelection()"></select>
 		</fieldset>
 
 		<fieldset class="event-time events--fieldset" ng-disabled="readOnly">

diff --git a/templates/editor.sidebar.php b/templates/editor.sidebar.php
@@ -11,7 +11,8 @@ class="advanced--input h2"
 							autofocus="autofocus"/>
 					<select
 							ng-model="calendar"
-							ng-options="c as c.displayname for c in calendars | orderBy:['order'] | calendarSelectorFilter: oldCalendar"></select>
+							ng-options="c as c.displayname for c in calendars | orderBy:['order'] | calendarSelectorFilter: oldCalendar"
+							ng-show="showCalendarSelection()"></select>
 				</fieldset>
 
 				<fieldset class="advanced--fieldset start-end-container" ng-disabled="readOnly">