From bb32b060631cda12dc6ff76b8bb973966f50f25b Mon Sep 17 00:00:00 2001 From: yuri Date: Wed, 22 Nov 2017 11:00:09 +0200 Subject: [PATCH 1/4] fix address field search --- .../res/templates/fields/address/search.tpl | 2 +- client/src/views/fields/address.js | 22 +++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/client/res/templates/fields/address/search.tpl b/client/res/templates/fields/address/search.tpl index 7397f07bcb..c4b6cb77f2 100644 --- a/client/res/templates/fields/address/search.tpl +++ b/client/res/templates/fields/address/search.tpl @@ -1,3 +1,3 @@ - + diff --git a/client/src/views/fields/address.js b/client/src/views/fields/address.js index 4707208a41..2273148110 100644 --- a/client/src/views/fields/address.js +++ b/client/src/views/fields/address.js @@ -71,6 +71,10 @@ Espo.define('views/fields/address', 'views/fields/base', function (Dep) { return data; }, + setupSearch: function () { + this.searchData.value = this.getSearchParamsData().value || this.searchParams.additionalValue; + }, + getFormattedAddress: function () { var postalCodeValue = this.model.get(this.postalCodeField); var streetValue = this.model.get(this.streetField); @@ -366,42 +370,42 @@ Espo.define('views/fields/address', 'views/fields/base', function (Dep) { fetchSearch: function () { var value = this.$el.find('[name="'+this.name+'"]').val().toString().trim(); if (value) { - value += '%'; var data = { type: 'or', value: [ { type: 'like', field: this.postalCodeField, - value: value + value: value + '%' }, { type: 'like', field: this.streetField, - value: value + value: value + '%' }, { type: 'like', field: this.cityField, - value: value + value: value + '%' }, { type: 'like', field: this.stateField, - value: value + value: value + '%' }, { type: 'like', field: this.countryField, - value: value + value: value + '%' }, ], - additionalValue: value + data: { + value: value + } }; return data; } return false; - }, + } }); }); - From cc245b3de88d67bb2d8fef78ad13c6b7a2d3b20e Mon Sep 17 00:00:00 2001 From: yuri Date: Wed, 22 Nov 2017 11:48:46 +0200 Subject: [PATCH 2/4] fix link parent link --- client/res/templates/fields/link-parent/list-link.tpl | 7 +++++++ client/src/views/fields/link-parent.js | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 client/res/templates/fields/link-parent/list-link.tpl diff --git a/client/res/templates/fields/link-parent/list-link.tpl b/client/res/templates/fields/link-parent/list-link.tpl new file mode 100644 index 0000000000..048a1c655c --- /dev/null +++ b/client/res/templates/fields/link-parent/list-link.tpl @@ -0,0 +1,7 @@ + +{{#if idValue}} +{{#if value}}{{value}}{{else}}{{translate 'None'}}{{/if}} +{{else}} + {{translate 'None'}} +{{/if}} + \ No newline at end of file diff --git a/client/src/views/fields/link-parent.js b/client/src/views/fields/link-parent.js index 3f8d2e0e0b..7fe9b56ab1 100644 --- a/client/src/views/fields/link-parent.js +++ b/client/src/views/fields/link-parent.js @@ -40,6 +40,8 @@ Espo.define('views/fields/link-parent', 'views/fields/base', function (Dep) { searchTemplate: 'fields/link-parent/search', + listLinkTemplate: 'fields/link-parent/list-link', + nameName: null, idName: null, @@ -274,7 +276,7 @@ Espo.define('views/fields/link-parent', 'views/fields/base', function (Dep) { }, getValueForDisplay: function () { - return this.model.get(this.model.get(this.nameName)); + return this.model.get(this.nameName); }, validateRequired: function () { From b66732bcd0bc5be299209a0a06f8ecaeea73aaad Mon Sep 17 00:00:00 2001 From: yuri Date: Wed, 22 Nov 2017 11:52:56 +0200 Subject: [PATCH 3/4] ms before mrs --- application/Espo/Core/Templates/Metadata/Person/entityDefs.json | 2 +- .../Espo/Modules/Crm/Resources/metadata/entityDefs/Contact.json | 2 +- .../Espo/Modules/Crm/Resources/metadata/entityDefs/Lead.json | 2 +- application/Espo/Resources/metadata/entityDefs/User.json | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/application/Espo/Core/Templates/Metadata/Person/entityDefs.json b/application/Espo/Core/Templates/Metadata/Person/entityDefs.json index 634f8db40c..8c7abd817a 100644 --- a/application/Espo/Core/Templates/Metadata/Person/entityDefs.json +++ b/application/Espo/Core/Templates/Metadata/Person/entityDefs.json @@ -5,7 +5,7 @@ }, "salutationName": { "type": "enum", - "options": ["", "Mr.", "Mrs.", "Ms.", "Dr."] + "options": ["", "Mr.", "Ms.", "Mrs.", "Dr."] }, "firstName": { "type": "varchar", diff --git a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Contact.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Contact.json index 04a32f6a8d..a6430659a8 100644 --- a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Contact.json +++ b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Contact.json @@ -5,7 +5,7 @@ }, "salutationName": { "type": "enum", - "options": ["", "Mr.", "Mrs.", "Ms.", "Dr."] + "options": ["", "Mr.", "Ms.", "Mrs.", "Dr."] }, "firstName": { "type": "varchar", diff --git a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Lead.json b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Lead.json index 115b734c92..151ad29058 100644 --- a/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Lead.json +++ b/application/Espo/Modules/Crm/Resources/metadata/entityDefs/Lead.json @@ -5,7 +5,7 @@ }, "salutationName": { "type": "enum", - "options": ["", "Mr.", "Mrs.", "Ms.", "Dr."] + "options": ["", "Mr.", "Ms.", "Mrs.", "Dr."] }, "firstName": { "type": "varchar", diff --git a/application/Espo/Resources/metadata/entityDefs/User.json b/application/Espo/Resources/metadata/entityDefs/User.json index 2a6ce90e76..98d6efca90 100644 --- a/application/Espo/Resources/metadata/entityDefs/User.json +++ b/application/Espo/Resources/metadata/entityDefs/User.json @@ -30,7 +30,7 @@ }, "salutationName": { "type": "enum", - "options": ["", "Mr.", "Mrs.", "Ms.", "Dr."] + "options": ["", "Mr.", "Ms.", "Mrs.", "Dr."] }, "firstName": { "type": "varchar", From 047c5d5f652eed7b6d5713ec78a605a032bbbae8 Mon Sep 17 00:00:00 2001 From: yuri Date: Wed, 22 Nov 2017 12:54:18 +0200 Subject: [PATCH 4/4] fixes category and storing list view --- client/res/templates/record/list-tree.tpl | 2 +- client/src/views/list-with-categories.js | 6 +++++- client/src/views/user/list.js | 2 ++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/client/res/templates/record/list-tree.tpl b/client/res/templates/record/list-tree.tpl index 58910cf0b4..52838275e4 100644 --- a/client/res/templates/record/list-tree.tpl +++ b/client/res/templates/record/list-tree.tpl @@ -20,7 +20,7 @@ {{rootName}} {{/if}} {{#if showEditLink}} - + {{/if}}
    diff --git a/client/src/views/list-with-categories.js b/client/src/views/list-with-categories.js index 96647506e9..6c686ea810 100644 --- a/client/src/views/list-with-categories.js +++ b/client/src/views/list-with-categories.js @@ -156,8 +156,12 @@ Espo.define('views/list-with-categories', 'views/list', function (Dep) { data[nameAttribute] = this.currentCategoryName; return data; } + }, + + actionManageCategories: function () { + this.clearView('categories'); + this.getRouter().navigate('#' + this.categoryScope, {trigger: true}); } }); }); - diff --git a/client/src/views/user/list.js b/client/src/views/user/list.js index ca6d81b16c..55d48d895b 100644 --- a/client/src/views/user/list.js +++ b/client/src/views/user/list.js @@ -30,6 +30,8 @@ Espo.define('views/user/list', 'views/list', function (Dep) { return Dep.extend({ + storeViewAfterUpdate: false, + setup: function () { Dep.prototype.setup.call(this); }