ifl
/
iflrandevu
forked from mirrors/easyappointments
1
1
Fork 0
Code Issues 6 Pull Requests Releases 3 Activity

Merge pull request #1326 from eerojaaskelainen/RelFrontFixes 

Fixes for frontend problems running in release mode
This commit is contained in:
Alex Tselegidis 2023-01-14 10:15:01 +01:00 committed by GitHub
parent f68e475e27 ad6bf65667
commit 8879fa7889
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/Calendar.php
View File

@ -129,7 +129,7 @@ class Calendar extends EA_Controller {
'timezones' => $this->timezones->to_array(), 'timezones' => $this->timezones->to_array(),
'privileges' => $privileges, 'privileges' => $privileges,
'calendar_view' => $calendar_view, 'calendar_view' => $calendar_view,
'available_providers' => $available_providers, 'available_providers' => array_values($available_providers), // Strip keys to prevent unintended array-to-object conversion
'available_services' => $available_services, 'available_services' => $available_services,
'secretary_providers' => $secretary_providers, 'secretary_providers' => $secretary_providers,
'edit_appointment' => $edit_appointment, 'edit_appointment' => $edit_appointment,

2
assets/js/utils/calendar_table_view.js
View File

@ -878,7 +878,7 @@ App.Utils.CalendarTableView = (function () {
const workDateStart = moment(start.format('YYYY-MM-DD') + ' ' + workingPlan[selDayName].start); const workDateStart = moment(start.format('YYYY-MM-DD') + ' ' + workingPlan[selDayName].start);
if (start < workDateStart) { if (start < workDateStart) {
unavailabilityPeriod = { const unavailabilityPeriod = {
title: lang('not_working'), title: lang('not_working'),
start: start.toDate(), start: start.toDate(),
end: workDateStart.toDate(), end: workDateStart.toDate(),