EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
predefined default date dynamic values
Yuri Kuznetsov500bd35ff268
diff --git a/application/Espo/Resources/metadata/entityDefs/User.json b/application/Espo/Resources/metadata/entityDefs/User.jsonindex 2fc1669517..4b38ea199f 100644--- a/application/Espo/Resources/metadata/entityDefs/User.json+++ b/application/Espo/Resources/metadata/entityDefs/User.json@@ -350,7 +350,6 @@"additionalAttributeList": ["columns"],"layoutDetailDisabled": true,"view": "views/user/fields/teams",- "default": "javascript: return {teamsIds: []}","audited": true},"roles": {diff --git a/client/src/app.js b/client/src/app.jsindex 0599caf2c1..91934b2b5b 100644--- a/client/src/app.js+++ b/client/src/app.js@@ -728,7 +728,6 @@ class App {*/initUtils() {this.dateTime = new DateTime();- this.modelFactory.dateTime = this.dateTime;this.dateTime.setSettingsAndPreferences(this.settings, this.preferences);this.numberUtil = new NumberUtil(this.settings, this.preferences);diff --git a/client/src/helpers/model/default-value-provider.js b/client/src/helpers/model/default-value-provider.jsnew file mode 100644index 0000000000..d75e137a53--- /dev/null+++ b/client/src/helpers/model/default-value-provider.js@@ -0,0 +1,84 @@+/************************************************************************+ * This file is part of EspoCRM.+ *+ * EspoCRM – Open Source CRM application.+ * Copyright (C) 2014-2025 Yurii Kuznietsov, Taras Machyshyn, Oleksii Avramenko+ * Website: https://www.espocrm.com+ *+ * This program is free software: you can redistribute it and/or modify+ * it under the terms of the GNU Affero General Public License as published by+ * the Free Software Foundation, either version 3 of the License, or+ * (at your option) any later version.+ *+ * This program is distributed in the hope that it will be useful,+ * but WITHOUT ANY WARRANTY; without even the implied warranty of+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+ * GNU Affero General Public License for more details.+ *+ * You should have received a copy of the GNU Affero General Public License+ * along with this program. If not, see <https://www.gnu.org/licenses/>.+ *+ * The interactive user interfaces in modified source and object code versions+ * of this program must display Appropriate Legal Notices, as required under+ * Section 5 of the GNU Affero General Public License version 3.+ *+ * In accordance with Section 7(b) of the GNU Affero General Public License version 3,+ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word.+ ************************************************************************/++import DateTime from 'date-time';+import {inject} from 'di';++const nowExpression = /return this\.dateTime\.getNow\(([0-9]+)\);/;+const shiftTodayExpression = /return this\.dateTime\.getDateShiftedFromToday\(([0-9]+), '([a-z]+)'\);/;+const shiftNowExpression = /return this\.dateTime\.getDateTimeShiftedFromNow\(([0-9]+), '([a-z]+)', ([0-9]+)\);/;++export default class DefaultValueProvider {++ /**+ * @type {DateTime}+ */+ @inject(DateTime)+ dateTime++ /**+ * Get a value.+ *+ * @param {string} key+ * @return {*}+ */+ get(key) {+ if (key === "return this.dateTime.getToday();") {+ return this.dateTime.getToday();+ }++ const matchNow = key.match(nowExpression);++ if (matchNow) {+ const multiplicity = parseInt(matchNow[1]);++ return this.dateTime.getNow(multiplicity);+ }++ const matchTodayShift = key.match(shiftTodayExpression);++ if (matchTodayShift) {+ const shift = parseInt(matchTodayShift[1]);+ const unit = matchTodayShift[2];++ return this.dateTime.getDateShiftedFromToday(shift, unit);+ }++ const matchNowShift = key.match(shiftNowExpression);++ if (matchNowShift) {+ const shift = parseInt(matchNowShift[1]);+ const unit = matchNowShift[2];+ const multiplicity = parseInt(matchNowShift[3]);++ return this.dateTime.getDateTimeShiftedFromNow(shift, unit, multiplicity);+ }++ return undefined;+ }+}diff --git a/client/src/model-factory.js b/client/src/model-factory.jsindex 7031f3dab6..1a5e4a66ef 100644--- a/client/src/model-factory.js+++ b/client/src/model-factory.js@@ -39,14 +39,6 @@ class ModelFactory {this.metadata = metadata;}- /**- * Used by default value expressions.- * @public- * @type {module:date-time|null}- * @internal- */- dateTime = null-/*** Create a model.*@@ -63,7 +55,6 @@ class ModelFactory {const model = new Seed({}, {entityType: entityType,defs: this.metadata.get(['entityDefs', entityType]) || {},- dateTime: this.dateTime,});if (callback) {diff --git a/client/src/model.js b/client/src/model.jsindex fdb4675664..4144e3c076 100644--- a/client/src/model.js+++ b/client/src/model.js@@ -30,6 +30,7 @@import {Events, View as BullView} from 'bullbone';import _ from 'underscore';+import DefaultValueProvider from 'helpers/model/default-value-provider';/*** When attributes have changed.@@ -123,7 +124,6 @@ class Model {* url?: string,* defs?: module:model~defs,* user?: module:models/user,- * dateTime?: module:date-time,* }} [options]*/constructor(attributes, options) {@@ -177,9 +177,6 @@ class Model {this.urlRoot = options.urlRoot || this.urlRoot;this.url = options.url || this.url;- /** @private */- this.dateTime = options.dateTime || null;-/** @private */this.changed = {};/** @private */@@ -726,7 +723,6 @@ class Model {urlRoot: this.urlRoot,url: this.url,defs: this.defs,- dateTime: this.dateTime,});}@@ -765,8 +761,7 @@ class Model {if (this.hasFieldParam(field, 'default')) {try {defaultHash[field] = this.parseDefaultValue(this.getFieldParam(field, 'default'));- }- catch (e) {+ } catch (e) {console.error(e);}}@@ -792,7 +787,7 @@ class Model {}/**- * @protected+ * @private* @param {*} defaultValue* @returns {*}*/@@ -801,9 +796,11 @@ class Model {typeof defaultValue === 'string' &&defaultValue.indexOf('javascript:') === 0) {- const code = defaultValue.substring(11);+ const code = defaultValue.substring(11).trim();++ const provider = new DefaultValueProvider();- defaultValue = (new Function( "with(this) { " + code + "}")).call(this);+ defaultValue = provider.get(code);}return defaultValue;