EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
Record view hasChanged method
Yurii723b06ab8280
diff --git a/client/src/controllers/record.js b/client/src/controllers/record.jsindex 3a275022bf..71930916e7 100644--- a/client/src/controllers/record.js+++ b/client/src/controllers/record.js@@ -303,7 +303,7 @@ class RecordController extends Controller {/*** @param {{* options?: Record,- * relate?: model:model~setRelateItem | model:model~setRelateItem[],+ * relate?: import('model').SetRelateItem | import('model').SetRelateItem [],* returnUrl?: string,* returnDispatchParams?: Record,* attributes?: Record,@@ -344,7 +344,7 @@ class RecordController extends Controller {/*** @param {{* options?: Record,- * relate?: model:model~setRelateItem | model:model~setRelateItem[],+ * relate?: import('model').SetRelateItem | import('model').SetRelateItem [],* returnUrl?: string,* returnDispatchParams?: Record,* options?: Record,diff --git a/client/src/helpers/record-modal.js b/client/src/helpers/record-modal.jsindex 4591dc7356..c3c728e47e 100644--- a/client/src/helpers/record-modal.js+++ b/client/src/helpers/record-modal.js@@ -290,7 +290,7 @@ class RecordModalHelper {* fullFormDisabled?: boolean,* fullFormUrl?: string,* returnUrl?: string,- * relate?: model:model~setRelateItem | model:model~setRelateItem[],+ * relate?: import('model').SetRelateItem | import('model').SetRelateItem[],* attributes?: Record.<string, *>,* afterSave?: function(import('model').default, {bypassClose: boolean} & Record),* beforeRender?: function(import('views/modals/edit').default),diff --git a/client/src/views/dashlets/options/base.js b/client/src/views/dashlets/options/base.jsindex 25ac403912..faecac82c9 100644--- a/client/src/views/dashlets/options/base.js+++ b/client/src/views/dashlets/options/base.js@@ -89,7 +89,7 @@ class BaseDashletOptionsModalView extends ModalView {this.model.set(focusedFieldView.fetch(), {skipReRender: true});}- if (this.getRecordView().isChanged) {+ if (this.getRecordView().hasChanged()) {this.confirm(this.translate('confirmLeaveOutMessage', 'messages')).then(() => this.actionClose());@@ -184,7 +184,7 @@ class BaseDashletOptionsModalView extends ModalView {setupBeforeFinal() {}onBackdropClick() {- if (this.getRecordView().isChanged) {+ if (this.getRecordView().hasChanged()) {return;}@@ -192,7 +192,7 @@ class BaseDashletOptionsModalView extends ModalView {}/**- * @return {module:views/record/edit}+ * @return {import('views/record/edit').default}*/getRecordView() {return this.recordView;diff --git a/client/src/views/modals/compose-email.js b/client/src/views/modals/compose-email.jsindex aab8a779c7..48a897dee7 100644--- a/client/src/views/modals/compose-email.js+++ b/client/src/views/modals/compose-email.js@@ -73,7 +73,7 @@ class ComposeEmailModalView extends EditModalView {this.model.set(focusedFieldView.fetch());}- if (this.getRecordView().isChanged) {+ if (this.getRecordView().hasChanged()) {this.confirm(this.translate('confirmLeaveOutMessage', 'messages')).then(() => this.actionClose());diff --git a/client/src/views/modals/detail.js b/client/src/views/modals/detail.jsindex 298938efc4..55d7eedcec 100644--- a/client/src/views/modals/detail.js+++ b/client/src/views/modals/detail.js@@ -33,6 +33,7 @@ import ActionItemSetup from 'helpers/action-item-setup';import Backbone from 'backbone';import RecordModal from 'helpers/record-modal';import Utils from 'utils';+import _ from 'underscore';/*** A quick view modal.@@ -463,10 +464,10 @@ class DetailModalView extends ModalView {}/**- * @return {module:views/record/detail}+ * @return {import('views/record/detail').default}*/getRecordView() {- return this.getView('record');+ return /** @type {import('views/record/detail').default} */this.getView('record');}afterRender() {@@ -708,7 +709,7 @@ class DetailModalView extends ModalView {const model = this.getRecordView().model;this.confirm(this.translate('removeRecordConfirmation', 'messages'), () => {- const $buttons = this.dialog.$el.find('.modal-footer button');+ const $buttons = $(this.dialog.getElement()).find('.modal-footer button');$buttons.addClass('disabled').attr('disabled', 'disabled');diff --git a/client/src/views/modals/edit.js b/client/src/views/modals/edit.jsindex 8b3ff2d079..5f61bfcc12 100644--- a/client/src/views/modals/edit.js+++ b/client/src/views/modals/edit.js@@ -121,7 +121,7 @@ class EditModalView extends ModalView {this.model.set(focusedFieldView.fetch(), {skipReRender: true});}- if (!this.getRecordView().isChanged) {+ if (!this.getRecordView().hasChanged()) {this.actionClose();return;@@ -144,7 +144,7 @@ class EditModalView extends ModalView {* @property {string} [id] An ID.* @property {string} [layoutName] A layout name.* @property {Record} [attributes] Attributes.- * @property {model:model~setRelateItem | model:model~setRelateItem[]} [relate] A relate data.+ * @property {import('model').SetRelateItem | import('model').SetRelateItem[]} [relate] A relate data.* @property {import('view-record-helper')} [recordHelper] A record helper.* @property {boolean} [saveDisabled] Disable save.* @property {boolean} [fullFormDisabled] Disable full-form.@@ -325,14 +325,14 @@ class EditModalView extends ModalView {handleRecordViewOptions(options) {}/**- * @return {module:views/record/edit}+ * @return {import('views/record/edit').default}*/getRecordView() {- return this.getView('edit');+ return /** @type {import('views/record/edit').default} */this.getView('edit');}onBackdropClick() {- if (this.getRecordView().isChanged) {+ if (this.getRecordView().hasChanged()) {return;}diff --git a/client/src/views/record/base.ts b/client/src/views/record/base.tsindex 631c01624d..650fbf688b 100644--- a/client/src/views/record/base.ts+++ b/client/src/views/record/base.ts@@ -1557,6 +1557,15 @@ class BaseRecordView<S extends BaseRecordViewSchema = BaseRecordViewSchema> exte// noinspection BadExpressionStatementJSafter;}++ /**+ * Is changed.+ *+ * @since 10.0.0+ */+ public hasChanged(): boolean {+ return this.isChanged+ }}export default BaseRecordView;diff --git a/client/src/views/user/modals/select-position.js b/client/src/views/user/modals/select-position.jsindex 989c07cca6..eb4b4687e8 100644--- a/client/src/views/user/modals/select-position.js+++ b/client/src/views/user/modals/select-position.js@@ -115,7 +115,7 @@ export default class UserSelectPositionModalView extends ModalView {}onBackdropClick() {- if (this.recordView.isChanged) {+ if (this.recordView.hasChanged()) {return;}