This commit is contained in:
Yuri Kuznetsov
2022-06-19 18:03:04 +03:00
parent e1af7b22f0
commit 313d52ad14
6 changed files with 34 additions and 16 deletions
+6
View File
@@ -60,6 +60,9 @@ define('views/fields/currency', ['views/fields/float'], function (Dep) {
maxDecimalPlaces: 3,
/**
* @inheritDoc
*/
data: function () {
var currencyValue = this.model.get(this.currencyFieldName) ||
this.getPreferences().get('defaultCurrency') ||
@@ -74,6 +77,9 @@ define('views/fields/currency', ['views/fields/float'], function (Dep) {
}, Dep.prototype.data.call(this));
},
/**
* @inheritDoc
*/
setup: function () {
Dep.prototype.setup.call(this);
+3
View File
@@ -46,6 +46,9 @@ define('views/fields/float', ['views/fields/int'], function (Dep) {
validations: ['required', 'float', 'range'],
/**
* @inheritDoc
*/
setup: function () {
Dep.prototype.setup.call(this);
@@ -26,9 +26,17 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
define('views/fields/link-multiple-with-primary', 'views/fields/link-multiple', function (Dep) {
define('views/fields/link-multiple-with-primary', ['views/fields/link-multiple'], function (Dep) {
return Dep.extend({
/**
* A link-multiple field with a primary.
*
* @class
* @name Class
* @extends module:views/fields/link-multiple.Class
* @memberOf module:views/fields/link-multiple-with-primary
*/
return Dep.extend(/** @lends module:views/fields/link-multiple-with-primary.Class# */{
primaryLink: null,
@@ -48,9 +56,12 @@ define('views/fields/link-multiple-with-primary', 'views/fields/link-multiple',
this.setPrimaryId(id);
}
}
},
},
/**
* @inheritDoc
*/
getAttributeList: function () {
var list = Dep.prototype.getAttributeList.call(this);
@@ -71,10 +82,10 @@ define('views/fields/link-multiple-with-primary', 'views/fields/link-multiple',
this.primaryId = this.model.get(this.primaryIdFieldName);
this.primaryName = this.model.get(this.primaryNameFieldName);
this.listenTo(this.model, 'change:' + this.primaryIdFieldName, function () {
this.listenTo(this.model, 'change:' + this.primaryIdFieldName, () => {
this.primaryId = this.model.get(this.primaryIdFieldName);
this.primaryName = this.model.get(this.primaryNameFieldName);
}.bind(this));
});
},
setPrimaryId: function (id) {
@@ -95,11 +106,11 @@ define('views/fields/link-multiple-with-primary', 'views/fields/link-multiple',
this.addLinkHtml(this.primaryId, this.primaryName);
}
this.ids.forEach(function (id) {
this.ids.forEach((id) => {
if (id !== this.primaryId) {
this.addLinkHtml(id, this.nameHash[id]);
}
}, this);
});
},
getValueForDisplay: function () {
@@ -114,11 +125,11 @@ define('views/fields/link-multiple-with-primary', 'views/fields/link-multiple',
return;
}
this.ids.forEach(function (id) {
this.ids.forEach((id) => {
if (id !== this.primaryId) {
names.push(this.getDetailLinkHtml(id));
}
}, this);
});
return '<div>' + names.join('</div><div>') + '</div>';
}
@@ -158,7 +169,8 @@ define('views/fields/link-multiple-with-primary', 'views/fields/link-multiple',
var nameHtml = '<div>' + name + '&nbsp;' + '</div>';
var removeHtml = '<a href="javascript:" class="pull-right" data-id="' + id + '" data-action="clearLink">' +
var removeHtml = '<a href="javascript:" class="pull-right" ' +
'data-id="' + id + '" data-action="clearLink">' +
'<span class="fas fa-times"></a>';
let $left = $('<div>');
@@ -224,7 +236,6 @@ define('views/fields/link-multiple-with-primary', 'views/fields/link-multiple',
return data;
},
});
});
@@ -26,7 +26,7 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
define('views/fields/link-multiple-with-role', 'views/fields/link-multiple', function (Dep) {
define('views/fields/link-multiple-with-role', ['views/fields/link-multiple'], function (Dep) {
return Dep.extend({
@@ -26,7 +26,7 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
define('views/fields/link-multiple-with-status', 'views/fields/link-multiple', function (Dep) {
define('views/fields/link-multiple-with-status', ['views/fields/link-multiple'], function (Dep) {
return Dep.extend({
@@ -82,6 +82,5 @@ define('views/fields/link-multiple-with-status', 'views/fields/link-multiple', f
return '<span class="' + iconStyle + '"></span> ' +
Dep.prototype.getDetailLinkHtml.call(this, id, name);
},
});
});
+1 -2
View File
@@ -26,7 +26,7 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
define('views/fields/link-one', 'views/fields/link', function (Dep) {
define('views/fields/link-one', ['views/fields/link'], function (Dep) {
return Dep.extend({
@@ -88,6 +88,5 @@ define('views/fields/link-one', 'views/fields/link', function (Dep) {
return data;
}
},
});
});