From a7fadfaa519f54a6fd7d24bfb102c39397761639 Mon Sep 17 00:00:00 2001 From: Nick Korbel Date: Wed, 5 Aug 2020 09:30:31 -0400 Subject: [PATCH] hide the calendar user filter for now until we can make it more usable --- Web/scripts/calendar.js | 10 ++++++---- lib/Config/Configuration.php | 2 +- tpl/Calendar/calendar.filter.tpl | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Web/scripts/calendar.js b/Web/scripts/calendar.js index 07f03d45b..14ecad526 100644 --- a/Web/scripts/calendar.js +++ b/Web/scripts/calendar.js @@ -197,8 +197,7 @@ function Calendar(opts) { elements.moveErrorDialog.modal('hide'); }); - const ownerFilter = $("#ownerFilter"); - const participantFilter = $("#participantFilter"); + function selectOwner(ui, textbox) { textbox.val(ui.item.label); @@ -212,11 +211,14 @@ function Calendar(opts) { _fullCalendar.fullCalendar('refetchEvents'); } - if (ownerFilter.length != 0) { + const ownerFilter = $("#ownerFilter"); + const participantFilter = $("#participantFilter"); + + if (ownerFilter.length !== 0) { ownerFilter.userAutoComplete(opts.autocompleteUrl, selectOwner); } - if (participantFilter.length != 0) { + if (participantFilter.length !== 0) { participantFilter.userAutoComplete(opts.autocompleteUrl, selectParticipant); } diff --git a/lib/Config/Configuration.php b/lib/Config/Configuration.php index 00ad314c8..fa29efce7 100644 --- a/lib/Config/Configuration.php +++ b/lib/Config/Configuration.php @@ -99,7 +99,7 @@ class Configuration implements IConfiguration const DEFAULT_CONFIG_ID = 'booked'; const DEFAULT_CONFIG_FILE_PATH = 'config/config.php'; - const VERSION = '2.8.3'; + const VERSION = '2.8.4'; protected function __construct() { diff --git a/tpl/Calendar/calendar.filter.tpl b/tpl/Calendar/calendar.filter.tpl index e0adb14db..ca716cfa1 100644 --- a/tpl/Calendar/calendar.filter.tpl +++ b/tpl/Calendar/calendar.filter.tpl @@ -45,7 +45,7 @@ along with Booked Scheduler. If not, see . - {if $CanViewUsers} + {if false}