EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
jsdocs
Yuri Kuznetsovd0321be7761b
diff --git a/client/modules/crm/src/views/calendar/calendar.js b/client/modules/crm/src/views/calendar/calendar.jsindex 0bb103a0f3..02d17da495 100644--- a/client/modules/crm/src/views/calendar/calendar.js+++ b/client/modules/crm/src/views/calendar/calendar.js@@ -144,6 +144,31 @@ class CalendarView extends View {},}++ /**+ * @param {{+ * userId?: string,+ * userName?: string|null,+ * mode?: string|null,+ * date?: string|null,+ * scrollToNowSlots?: boolean,+ * $container?: JQuery,+ * suppressLoadingAlert?: boolean,+ * slotDuration?: number,+ * scrollHour?: number,+ * teamIdList?: string[],+ * containerSelector?: string,+ * height?: number,+ * enabledScopeList?: string[],+ * header?: boolean,+ * }} options+ */+ constructor(options) {+ super(options);++ this.options = options;+ }+data() {return {mode: this.mode,diff --git a/client/modules/crm/src/views/calendar/timeline.js b/client/modules/crm/src/views/calendar/timeline.jsindex 96c0dc3932..5bb389f23d 100644--- a/client/modules/crm/src/views/calendar/timeline.js+++ b/client/modules/crm/src/views/calendar/timeline.js@@ -123,6 +123,27 @@ class TimelineView extends View {},}+ /**+ * @param {{+ * userId?: string,+ * userName?: string|null,+ * mode?: string|null,+ * date?: string|null,+ * $container?: JQuery,+ * suppressLoadingAlert?: boolean,+ * containerSelector?: string,+ * enabledScopeList?: string[],+ * calendarType?: string,+ * userList?: string[],+ * header?: boolean,+ * }} options+ */+ constructor(options) {+ super(options);++ this.options = options;+ }+data() {const calendarTypeDataList = this.getCalendarTypeDataList();@@ -550,13 +571,14 @@ class TimelineView extends View {onTag: (tag, html) => html,},},- moment: date => {+ moment: /** Record */date => {const m = moment(date);if (date && date.noTimeZone) {return m;}+ // noinspection JSUnresolvedReferencereturn m.tz(this.getDateTime().getTimeZone());},format: this.getFormatObject(),@@ -903,7 +925,7 @@ class TimelineView extends View {}fetchEvents(from, to, callback) {- if (!this.options.noFetchLoadingMessage) {+ if (!this.options.suppressLoadingAlert) {Espo.Ui.notifyWait();}diff --git a/client/modules/crm/src/views/dashlets/calendar.js b/client/modules/crm/src/views/dashlets/calendar.jsindex 9ade93c742..c0d423e3c0 100644--- a/client/modules/crm/src/views/dashlets/calendar.js+++ b/client/modules/crm/src/views/dashlets/calendar.js@@ -59,7 +59,7 @@ class CalendarDashletView extends BaseDashletView {calendarType: 'shared',userList: userList,enabledScopeList: this.getOption('enabledScopeList'),- noFetchLoadingMessage: true,+ suppressLoadingAlert: true,}, view => {view.render();});