diff --git a/NEWS b/NEWS index 9260515f9..f09f4f2be 100644 --- a/NEWS +++ b/NEWS @@ -3,6 +3,7 @@ New features - [core] can now invite attendees to exceptions only (#2561) + - [web] display freebusy information of owner in appointment editor Enhancements - diff --git a/UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox b/UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox index 8ddb10254..cbeaf82e4 100644 --- a/UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox +++ b/UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox @@ -33,7 +33,8 @@ - + {{calendar.name}} diff --git a/UI/Templates/SchedulerUI/UIxAttendeesEditor.wox b/UI/Templates/SchedulerUI/UIxAttendeesEditor.wox index 568715e41..4eb75b0e1 100644 --- a/UI/Templates/SchedulerUI/UIxAttendeesEditor.wox +++ b/UI/Templates/SchedulerUI/UIxAttendeesEditor.wox @@ -16,6 +16,21 @@
+ + +
+ person +
+ person +
+
{{editor.component.organizer.name}}
+
{{editor.component.organizer.email}}
+
+ +
+ +
{{day.stringWithSeparator}}
@@ -43,6 +59,27 @@
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
0); + if (updateRequired) + vm.component.initOrganizer(Calendar.$get(vm.component.destinationCalendar)); + } + // Autocomplete cards for attendees function cardFilter($query) { AddressBook.$filterAll($query); @@ -278,18 +285,20 @@ } function addAttendee(card) { - var automaticallyExapand = (!vm.component.attendees || vm.component.attendees.length === 0); + var initOrganizer = (!vm.component.attendees || vm.component.attendees.length === 0), + destinationCalendar = Calendar.$get(vm.component.destinationCalendar), + options = initOrganizer? { organizerCalendar: destinationCalendar } : {}; if (angular.isString(card)) { // User pressed "Enter" in search field, adding a non-matching card if (card.isValidEmail()) { - vm.component.addAttendee(new Card({ emails: [{ value: card }] })); - vm.showAttendeesEditor |= automaticallyExapand; + vm.component.addAttendee(new Card({ emails: [{ value: card }] }), options); + vm.showAttendeesEditor |= initOrganizer; vm.searchText = ''; } } else { - vm.component.addAttendee(card); - vm.showAttendeesEditor |= automaticallyExapand; + vm.component.addAttendee(card, options); + vm.showAttendeesEditor |= initOrganizer; } }