From c76823f9eeedb6d56780ee0ce571cd5e85d4ead0 Mon Sep 17 00:00:00 2001 From: yuri Date: Wed, 1 Feb 2017 11:14:18 +0200 Subject: [PATCH 1/3] fix timeline --- client/modules/crm/src/views/calendar/timeline.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/client/modules/crm/src/views/calendar/timeline.js b/client/modules/crm/src/views/calendar/timeline.js index 239e71ae3d..9084fe6f28 100644 --- a/client/modules/crm/src/views/calendar/timeline.js +++ b/client/modules/crm/src/views/calendar/timeline.js @@ -332,6 +332,8 @@ Espo.define('crm:views/calendar/timeline', ['view', 'lib!vis'], function (Dep, V event.start = event.end.clone(); } } + } else { + if (!event.end || !event.start) return; } this.fillColor(event); @@ -380,6 +382,7 @@ Espo.define('crm:views/calendar/timeline', ['view', 'lib!vis'], function (Dep, V var resultList = []; list.forEach(function (o) { var event = this.convertEvent(o); + if (!event) return; resultList.push(event); }, this); return resultList; From ba0a79cc9b5ce684f8999d22ad4afff55b347a4f Mon Sep 17 00:00:00 2001 From: yuri Date: Wed, 1 Feb 2017 11:43:36 +0200 Subject: [PATCH 2/3] year 2017 --- frontend/html/main.html | 2 +- frontend/html/portal.html | 2 +- html/main.html | 2 +- html/portal.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/frontend/html/main.html b/frontend/html/main.html index 8f8e6db65d..171a748fed 100644 --- a/frontend/html/main.html +++ b/frontend/html/main.html @@ -48,7 +48,7 @@
diff --git a/frontend/html/portal.html b/frontend/html/portal.html index cd40162ddc..6c6e730fb8 100644 --- a/frontend/html/portal.html +++ b/frontend/html/portal.html @@ -49,7 +49,7 @@
diff --git a/html/main.html b/html/main.html index 51416af6f6..c39e9f4416 100644 --- a/html/main.html +++ b/html/main.html @@ -31,7 +31,7 @@
diff --git a/html/portal.html b/html/portal.html index badd8eaff1..9af0a90e13 100644 --- a/html/portal.html +++ b/html/portal.html @@ -30,7 +30,7 @@
From cd6da3ba87cbca78120a7e647a683fe7d4e711b2 Mon Sep 17 00:00:00 2001 From: yuri Date: Wed, 1 Feb 2017 12:05:57 +0200 Subject: [PATCH 3/3] fix formula --- application/Espo/Resources/metadata/app/formula.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/Espo/Resources/metadata/app/formula.json b/application/Espo/Resources/metadata/app/formula.json index b6ce4269f9..7722af954b 100644 --- a/application/Espo/Resources/metadata/app/formula.json +++ b/application/Espo/Resources/metadata/app/formula.json @@ -62,7 +62,7 @@ }, { "name": "entity\\isNew", - "insertText": "entity\\attribute()" + "insertText": "entity\\isNew()" }, { "name": "entity\\isAttributeChanged",