From 02f1abd3391a1586026e477e8c140bb6a7fdd2ad Mon Sep 17 00:00:00 2001 From: Mariusz Krzaczkowski Date: Fri, 26 Aug 2022 08:49:54 +0200 Subject: [PATCH] Fixed display of views in the calendar --- config/version.php | 2 +- modules/Calendar/ConfigTemplate.php | 8 +++----- modules/Calendar/views/QuickCreateAjax.php | 4 ++-- modules/OSSTimeControl/views/QuickCreateAjax.php | 4 ++-- modules/Occurrences/views/QuickCreateAjax.php | 4 ++-- modules/Reservations/views/QuickCreateAjax.php | 4 ++-- modules/Vtiger/views/Calendar.php | 4 ++-- 7 files changed, 14 insertions(+), 16 deletions(-) diff --git a/config/version.php b/config/version.php index a11f7ab97134..f4083a384651 100644 --- a/config/version.php +++ b/config/version.php @@ -1,7 +1,7 @@ '6.4.12', + 'appVersion' => '6.4.13', 'patchVersion' => '2022.08.26', 'lib_roundcube' => '0.3.1', ]; diff --git a/modules/Calendar/ConfigTemplate.php b/modules/Calendar/ConfigTemplate.php index a61ec04b3973..19fbf2029a57 100644 --- a/modules/Calendar/ConfigTemplate.php +++ b/modules/Calendar/ConfigTemplate.php @@ -20,13 +20,13 @@ ], 'SHOW_TIMELINE_WEEK' => [ 'default' => true, - 'description' => 'Show calendar timeline in monthly view: false = basicWeek, true = timeGridWeek', + 'description' => 'Show calendar timeline in monthly view: false = dayGridWeek, true = timeGridWeek', 'validation' => '\App\Validator::bool', 'sanitization' => '\App\Purifier::bool', ], 'SHOW_TIMELINE_DAY' => [ 'default' => true, - 'description' => 'Show calendar timeline in day view: false = basicDay, true = timeGridDay', + 'description' => 'Show calendar timeline in day view: false = dayGridDay, true = timeGridDay', 'validation' => '\App\Validator::bool', 'sanitization' => '\App\Purifier::bool', ], @@ -94,9 +94,7 @@ 'default' => 5000, 'description' => 'Max number of records to update status in cron', 'validation' => '\App\Validator::naturalNumber', - 'sanitization' => function () { - return (int) func_get_arg(0); - }, + 'sanitization' => fn () => (int) func_get_arg(0), ], 'SHOW_ONLY_CURRENT_RECORDS_COUNT' => [ 'default' => false, diff --git a/modules/Calendar/views/QuickCreateAjax.php b/modules/Calendar/views/QuickCreateAjax.php index 869bf357c1fa..a5f544b4147f 100644 --- a/modules/Calendar/views/QuickCreateAjax.php +++ b/modules/Calendar/views/QuickCreateAjax.php @@ -30,8 +30,8 @@ public function postProcessAjax(App\Request $request) $viewer = $this->getViewer($request); $viewer->assign('RECORD', $this->record); $viewer->assign('WEEK_COUNT', App\Config::module('Calendar', 'WEEK_COUNT')); - $viewer->assign('WEEK_VIEW', App\Config::module('Calendar', 'SHOW_TIMELINE_WEEK') ? 'timeGridWeek' : 'basicWeek'); - $viewer->assign('DAY_VIEW', App\Config::module('Calendar', 'SHOW_TIMELINE_DAY') ? 'timeGridDay' : 'basicDay'); + $viewer->assign('WEEK_VIEW', App\Config::module('Calendar', 'SHOW_TIMELINE_WEEK') ? 'timeGridWeek' : 'dayGridWeek'); + $viewer->assign('DAY_VIEW', App\Config::module('Calendar', 'SHOW_TIMELINE_DAY') ? 'timeGridDay' : 'dayGridDay'); $viewer->assign('ALL_DAY_SLOT', App\Config::module('Calendar', 'ALL_DAY_SLOT')); $viewer->assign('STYLES', $this->getHeaderCss($request)); $viewer->assign('MODAL_TITLE', $this->getPageTitle($request)); diff --git a/modules/OSSTimeControl/views/QuickCreateAjax.php b/modules/OSSTimeControl/views/QuickCreateAjax.php index 2aa1600b1ce7..98ac09384533 100644 --- a/modules/OSSTimeControl/views/QuickCreateAjax.php +++ b/modules/OSSTimeControl/views/QuickCreateAjax.php @@ -30,8 +30,8 @@ public function postProcessAjax(App\Request $request) $viewer = $this->getViewer($request); $viewer->assign('RECORD', $this->record ?? null); $viewer->assign('WEEK_COUNT', App\Config::module('Calendar', 'WEEK_COUNT')); - $viewer->assign('WEEK_VIEW', App\Config::module('Calendar', 'SHOW_TIMELINE_WEEK') ? 'timeGridWeek' : 'basicWeek'); - $viewer->assign('DAY_VIEW', App\Config::module('Calendar', 'SHOW_TIMELINE_DAY') ? 'timeGridDay' : 'basicDay'); + $viewer->assign('WEEK_VIEW', App\Config::module('Calendar', 'SHOW_TIMELINE_WEEK') ? 'timeGridWeek' : 'dayGridWeek'); + $viewer->assign('DAY_VIEW', App\Config::module('Calendar', 'SHOW_TIMELINE_DAY') ? 'timeGridDay' : 'dayGridDay'); $viewer->assign('ALL_DAY_SLOT', App\Config::module('Calendar', 'ALL_DAY_SLOT')); $viewer->assign('STYLES', $this->getHeaderCss($request)); $viewer->assign('MODAL_TITLE', $this->getPageTitle($request)); diff --git a/modules/Occurrences/views/QuickCreateAjax.php b/modules/Occurrences/views/QuickCreateAjax.php index 158586cda8c9..c84b0164012b 100644 --- a/modules/Occurrences/views/QuickCreateAjax.php +++ b/modules/Occurrences/views/QuickCreateAjax.php @@ -30,8 +30,8 @@ public function postProcessAjax(App\Request $request) $viewer = $this->getViewer($request); $viewer->assign('RECORD', $this->record ?? null); $viewer->assign('WEEK_COUNT', App\Config::module('Calendar', 'WEEK_COUNT')); - $viewer->assign('WEEK_VIEW', App\Config::module('Calendar', 'SHOW_TIMELINE_WEEK') ? 'timeGridWeek' : 'basicWeek'); - $viewer->assign('DAY_VIEW', App\Config::module('Calendar', 'SHOW_TIMELINE_DAY') ? 'timeGridDay' : 'basicDay'); + $viewer->assign('WEEK_VIEW', App\Config::module('Calendar', 'SHOW_TIMELINE_WEEK') ? 'timeGridWeek' : 'dayGridWeek'); + $viewer->assign('DAY_VIEW', App\Config::module('Calendar', 'SHOW_TIMELINE_DAY') ? 'timeGridDay' : 'dayGridDay'); $viewer->assign('ALL_DAY_SLOT', App\Config::module('Calendar', 'ALL_DAY_SLOT')); $viewer->assign('STYLES', $this->getHeaderCss($request)); $viewer->assign('MODAL_TITLE', $this->getPageTitle($request)); diff --git a/modules/Reservations/views/QuickCreateAjax.php b/modules/Reservations/views/QuickCreateAjax.php index 1a1e9eea5ad6..0d59b2254ade 100644 --- a/modules/Reservations/views/QuickCreateAjax.php +++ b/modules/Reservations/views/QuickCreateAjax.php @@ -30,8 +30,8 @@ public function postProcessAjax(App\Request $request) $viewer = $this->getViewer($request); $viewer->assign('RECORD', $this->record ?? null); $viewer->assign('WEEK_COUNT', App\Config::module('Calendar', 'WEEK_COUNT')); - $viewer->assign('WEEK_VIEW', App\Config::module('Calendar', 'SHOW_TIMELINE_WEEK') ? 'timeGridWeek' : 'basicWeek'); - $viewer->assign('DAY_VIEW', App\Config::module('Calendar', 'SHOW_TIMELINE_DAY') ? 'timeGridDay' : 'basicDay'); + $viewer->assign('WEEK_VIEW', App\Config::module('Calendar', 'SHOW_TIMELINE_WEEK') ? 'timeGridWeek' : 'dayGridWeek'); + $viewer->assign('DAY_VIEW', App\Config::module('Calendar', 'SHOW_TIMELINE_DAY') ? 'timeGridDay' : 'dayGridDay'); $viewer->assign('ALL_DAY_SLOT', App\Config::module('Calendar', 'ALL_DAY_SLOT')); $viewer->assign('STYLES', $this->getHeaderCss($request)); $viewer->assign('MODAL_TITLE', $this->getPageTitle($request)); diff --git a/modules/Vtiger/views/Calendar.php b/modules/Vtiger/views/Calendar.php index 03a33c79f7d1..0ce10a212fd0 100644 --- a/modules/Vtiger/views/Calendar.php +++ b/modules/Vtiger/views/Calendar.php @@ -56,8 +56,8 @@ public function process(App\Request $request) $viewer->assign('EVENT_CREATE', \App\Privilege::isPermitted($request->getModule(), 'CreateView')); $viewer->assign('EVENT_EDIT', \App\Privilege::isPermitted($request->getModule(), 'EditView')); $viewer->assign('WEEK_COUNT', App\Config::module('Calendar', 'WEEK_COUNT')); - $viewer->assign('WEEK_VIEW', App\Config::module('Calendar', 'SHOW_TIMELINE_WEEK') ? 'timeGridWeek' : 'basicWeek'); - $viewer->assign('DAY_VIEW', App\Config::module('Calendar', 'SHOW_TIMELINE_DAY') ? 'timeGridDay' : 'basicDay'); + $viewer->assign('WEEK_VIEW', App\Config::module('Calendar', 'SHOW_TIMELINE_WEEK') ? 'timeGridWeek' : 'dayGridWeek'); + $viewer->assign('DAY_VIEW', App\Config::module('Calendar', 'SHOW_TIMELINE_DAY') ? 'timeGridDay' : 'dayGridDay'); $viewer->assign('ALL_DAY_SLOT', App\Config::module('Calendar', 'ALL_DAY_SLOT')); $viewer->view('Calendar/CalendarView.tpl', $moduleName); }