From 86799ed7421979a28f80c95fec507e9b38ca0642 Mon Sep 17 00:00:00 2001 From: yuri Date: Thu, 6 Jun 2019 12:41:34 +0300 Subject: [PATCH 1/8] btn-text normal weight --- frontend/less/espo/custom.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/less/espo/custom.less b/frontend/less/espo/custom.less index 97585e0aea..bef0f3b3b9 100644 --- a/frontend/less/espo/custom.less +++ b/frontend/less/espo/custom.less @@ -3063,7 +3063,7 @@ a.link-gray { border-bottom: 1px solid @gray-light; } - font-weight: 600; + font-weight: 400; } .btn-group.open .dropdown-toggle { From c9759549446e15dd5fe5c0945d9e11ec13863165 Mon Sep 17 00:00:00 2001 From: yuri Date: Thu, 6 Jun 2019 12:42:47 +0300 Subject: [PATCH 2/8] stream page btn-text --- client/res/templates/stream.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/res/templates/stream.tpl b/client/res/templates/stream.tpl index 2758349911..dc7cbc1d6b 100644 --- a/client/res/templates/stream.tpl +++ b/client/res/templates/stream.tpl @@ -8,9 +8,9 @@
{{#each filterList}} - + {{/each}} - +
From 66a60b125747bd5d36b8ce0ee474605243a5dc95 Mon Sep 17 00:00:00 2001 From: yuri Date: Thu, 6 Jun 2019 12:53:39 +0300 Subject: [PATCH 3/8] timeline tpl change --- client/modules/crm/res/templates/calendar/timeline.tpl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/client/modules/crm/res/templates/calendar/timeline.tpl b/client/modules/crm/res/templates/calendar/timeline.tpl index 7383aa9927..2b796664e9 100644 --- a/client/modules/crm/res/templates/calendar/timeline.tpl +++ b/client/modules/crm/res/templates/calendar/timeline.tpl @@ -4,8 +4,8 @@
- +
{{#if calendarTypeSelectEnabled}}
@@ -24,7 +24,6 @@ {{/if}}
-
From 73ab4aa42e0a01916873a6216af50afba94b7de0 Mon Sep 17 00:00:00 2001 From: yuri Date: Thu, 6 Jun 2019 13:16:48 +0300 Subject: [PATCH 4/8] meeting modal acceptance right --- client/modules/crm/src/views/meeting/modals/detail.js | 1 + 1 file changed, 1 insertion(+) diff --git a/client/modules/crm/src/views/meeting/modals/detail.js b/client/modules/crm/src/views/meeting/modals/detail.js index 8721042494..c12d793789 100644 --- a/client/modules/crm/src/views/meeting/modals/detail.js +++ b/client/modules/crm/src/views/meeting/modals/detail.js @@ -40,6 +40,7 @@ define('crm:views/meeting/modals/detail', 'views/modals/detail', function (Dep) html: buttonData.html, hidden: this.hasAcceptanceStatusButton(), style: buttonData.style, + pullLeft: true, }, 'cancel'); if ( From fd5218c10bbc73543b94416b4bb7325a9410cd37 Mon Sep 17 00:00:00 2001 From: yuri Date: Thu, 6 Jun 2019 16:05:22 +0300 Subject: [PATCH 5/8] btn-text color --- frontend/less/espo/custom.less | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/frontend/less/espo/custom.less b/frontend/less/espo/custom.less index bef0f3b3b9..c4da3db311 100644 --- a/frontend/less/espo/custom.less +++ b/frontend/less/espo/custom.less @@ -3026,9 +3026,14 @@ a.link-gray { } .btn-text { - color: @gray-soft; + color: @gray-dark; border-radius: 0; + .far, + .fas { + color: @gray-soft; + } + &, &:active, &.active, @@ -3048,6 +3053,10 @@ a.link-gray { color: @gray-dark; text-decoration: none; background-color: transparent; + .far, + .fas { + color: @gray-dark; + } } &.disabled, &[disabled], @@ -3058,6 +3067,10 @@ a.link-gray { text-decoration: none; } color: @gray-light; + .far, + .fas { + color: @gray-light; + } } &.active { border-bottom: 1px solid @gray-light; From 4f2a2b290b7723093d6c234359711b4e5dfeda27 Mon Sep 17 00:00:00 2001 From: yuri Date: Fri, 7 Jun 2019 11:32:30 +0300 Subject: [PATCH 6/8] fix calendar custom event --- .../Espo/Modules/Crm/Services/Activities.php | 40 ++++++++++--------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/application/Espo/Modules/Crm/Services/Activities.php b/application/Espo/Modules/Crm/Services/Activities.php index 924fbd8a78..f51b35a702 100644 --- a/application/Espo/Modules/Crm/Services/Activities.php +++ b/application/Espo/Modules/Crm/Services/Activities.php @@ -1043,9 +1043,9 @@ class Activities extends \Espo\Core\Services\Base 'createdAt' ]; - $wherePart = array( + $wherePart = [ 'assignedUserId' => $userId, - ); + ]; if ($seed->hasRelation('users')) { $wherePart['usersMiddle.userId'] = $userId; @@ -1055,35 +1055,39 @@ class Activities extends \Espo\Core\Services\Base $wherePart['assignedUsersMiddle.userId'] = $userId; } - $selectParams = array( + $selectParams = [ 'select' => $select, 'leftJoins' => [], - 'whereClause' => array( + 'whereClause' => [ 'OR' => $wherePart, - array( - 'OR' => array( - array( + [ + 'OR' => [ + [ 'dateEnd' => null, 'dateStart>=' => $from, 'dateStart<' => $to - ), - array( + ], + [ + 'dateStart>=' => $from, + 'dateStart<' => $to + ], + [ 'dateEnd>=' => $from, 'dateEnd<' => $to - ), - array( + ], + [ 'dateStart<=' => $from, 'dateEnd>=' => $to - ), - array( + ], + [ 'dateEndDate!=' => null, 'dateEndDate>=' => $from, 'dateEndDate<' => $to - ) - ) - ) - ) - ); + ] + ] + ] + ] + ]; if ($seed->hasRelation('users')) { $selectParams['leftJoins'][] = 'users'; From 405a5c29dfa08586e8848d7c9640d08554e7d334 Mon Sep 17 00:00:00 2001 From: yuri Date: Fri, 7 Jun 2019 14:24:20 +0300 Subject: [PATCH 7/8] layout manager css fix --- client/res/templates/admin/layouts/grid.tpl | 2 +- client/res/templates/admin/layouts/rows.tpl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/res/templates/admin/layouts/grid.tpl b/client/res/templates/admin/layouts/grid.tpl index 2f8d43f933..a9dfa646d9 100644 --- a/client/res/templates/admin/layouts/grid.tpl +++ b/client/res/templates/admin/layouts/grid.tpl @@ -76,7 +76,7 @@ display: none; } #layout header { - font-weight: bold; + font-weight: 600; margin-bottom: 10px; } #layout ul.panels > li label { diff --git a/client/res/templates/admin/layouts/rows.tpl b/client/res/templates/admin/layouts/rows.tpl index ecb7c5a666..9df1b4ff51 100644 --- a/client/res/templates/admin/layouts/rows.tpl +++ b/client/res/templates/admin/layouts/rows.tpl @@ -22,7 +22,7 @@ } #layout header { - font-weight: bold; + font-weight: 600; } #layout ul > li .left { From 8f9bb7997845b0fe86a335d837ecac2bd69a3057 Mon Sep 17 00:00:00 2001 From: yuri Date: Fri, 7 Jun 2019 16:37:02 +0300 Subject: [PATCH 8/8] button handler init --- client/src/views/main.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/client/src/views/main.js b/client/src/views/main.js index e17ba0628a..ceb8037bb5 100644 --- a/client/src/views/main.js +++ b/client/src/views/main.js @@ -56,6 +56,20 @@ define('views/main', 'view', function (Dep) { ['buttons', 'actions', 'dropdown'].forEach(function (type) { this.menu[type] = this.menu[type] || []; + + var itemList = this.menu[type]; + itemList.forEach(function (item) { + var viewObject = this; + if (item.initFunction && item.data.handler) { + this.wait(new Promise(function (resolve) { + require(item.data.handler, function (Handler) { + var handler = new Handler(viewObject); + handler[item.initFunction].call(handler); + resolve(); + }); + })); + } + }, this); }, this); this.updateLastUrl();