Merge branch 'hotfix/4.8.5'

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",

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",

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",

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",

client/res/templates/fields/address/search.tpl

@@ -1,3 +1,3 @@
 
-<input type="text" class="main-element form-control input-sm" name="{{name}}" value="{{searchParams.additionalValue}}" {{#if params.maxLength}} maxlength="{{params.maxLength}}"{{/if}}{{#if params.size}} size="{{params.size}}"{{/if}}>
+<input type="text" class="main-element form-control input-sm" name="{{name}}" value="{{searchData.value}}" {{#if params.maxLength}} maxlength="{{params.maxLength}}"{{/if}}{{#if params.size}} size="{{params.size}}"{{/if}}>
 

client/res/templates/fields/link-parent/list-link.tpl

@@ -0,0 +1,7 @@
+<a href="#{{model.name}}/view/{{model.id}}" class="link" data-id="{{model.id}}" title="{{value}}">
+{{#if idValue}}
+{{#if value}}{{value}}{{else}}{{translate 'None'}}{{/if}}
+{{else}}
+    {{translate 'None'}}
+{{/if}}
+</a>

client/res/templates/record/list-tree.tpl

@@ -20,7 +20,7 @@
     <a href="#{{scope}}" class="action link{{#if rootIsSelected}} text-bold{{/if}}" data-action="selectRoot">{{rootName}}</a>
     {{/if}}
     {{#if showEditLink}}
-    <a href="#{{scope}}" class="small pull-right" title="{{translate 'Manage Categories' scope=scope}}"><span class="glyphicon glyphicon-th-list"></span></a>
+    <a href="#{{scope}}" class="small pull-right action" data-action="manageCategories" title="{{translate 'Manage Categories' scope=scope}}"><span class="glyphicon glyphicon-th-list"></span></a>
     {{/if}}
 
     <ul class="list-group list-group-tree list-group-no-border">

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;
-        },
+        }
     });
 });
-

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 () {

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});
         }
 
     });
 });
-

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);
         }