EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
salutationField prop
Yuri Kuznetsovd179b4b792d0
diff --git a/client/res/templates/fields/person-name/edit-first-middle-last.tpl b/client/res/templates/fields/person-name/edit-first-middle-last.tplindex 6efbc804ab..ce0e6d121f 100644--- a/client/res/templates/fields/person-name/edit-first-middle-last.tpl+++ b/client/res/templates/fields/person-name/edit-first-middle-last.tpl@@ -1,7 +1,7 @@<div class="row"><div class="col-sm-3 col-xs-3"><select data-name="salutation{{ucName}}" class="form-control">- {{options salutationOptions salutationValue field='salutationName' scope=scope}}+ {{options salutationOptions salutationValue field=salutationField scope=scope}}</select></div><div class="col-sm-5 col-xs-5">diff --git a/client/res/templates/fields/person-name/edit-last-first-middle.tpl b/client/res/templates/fields/person-name/edit-last-first-middle.tplindex d87be7ce9d..db8e0e49d0 100644--- a/client/res/templates/fields/person-name/edit-last-first-middle.tpl+++ b/client/res/templates/fields/person-name/edit-last-first-middle.tpl@@ -1,7 +1,7 @@<div class="row"><div class="col-sm-3 col-xs-3"><select data-name="salutation{{ucName}}" class="form-control">- {{options salutationOptions salutationValue field='salutationName' scope=scope}}+ {{options salutationOptions salutationValue field=salutationField scope=scope}}</select></div><div class="col-sm-9 col-xs-9">diff --git a/client/res/templates/fields/person-name/edit-last-first.tpl b/client/res/templates/fields/person-name/edit-last-first.tplindex 621e2d600c..29d7d041ce 100644--- a/client/res/templates/fields/person-name/edit-last-first.tpl+++ b/client/res/templates/fields/person-name/edit-last-first.tpl@@ -1,7 +1,7 @@<div class="row"><div class="col-sm-3 col-xs-3"><select data-name="salutation{{ucName}}" class="form-control">- {{options salutationOptions salutationValue field='salutationName' scope=scope}}+ {{options salutationOptions salutationValue field=salutationField scope=scope}}</select></div><div class="col-sm-5 col-xs-5">diff --git a/client/res/templates/fields/person-name/edit.tpl b/client/res/templates/fields/person-name/edit.tplindex 19b08d2cc4..56cab3caf2 100644--- a/client/res/templates/fields/person-name/edit.tpl+++ b/client/res/templates/fields/person-name/edit.tpl@@ -1,7 +1,7 @@<div class="row"><div class="col-sm-3 col-xs-3"><select data-name="salutation{{ucName}}" class="form-control">- {{options salutationOptions salutationValue field='salutationName' scope=scope}}+ {{options salutationOptions salutationValue field=salutationField scope=scope}}</select></div><div class="col-sm-4 col-xs-4">diff --git a/client/src/views/fields/person-name.js b/client/src/views/fields/person-name.jsindex 3bca2a6738..e92de160ae 100644--- a/client/src/views/fields/person-name.js+++ b/client/src/views/fields/person-name.js@@ -50,6 +50,13 @@ class PersonNameFieldView extends VarcharFieldView {'pattern',]+ /**+ * @protected+ * @type {string}+ * @since 9.3.0+ */+ salutationField+data() {const data = super.data();@@ -59,6 +66,7 @@ class PersonNameFieldView extends VarcharFieldView {data.lastValue = this.model.get(this.lastField);data.middleValue = this.model.get(this.middleField);data.salutationOptions = this.salutationOptions;+ data.salutationField = this.salutationField;if (this.isEditMode()) {data.firstMaxLength = this.model.getFieldParam(this.firstField, 'maxLength');