Merge branch 'fix'
This commit is contained in:
@@ -0,0 +1,46 @@
|
||||
/************************************************************************
|
||||
* This file is part of EspoCRM.
|
||||
*
|
||||
* EspoCRM – Open Source CRM application.
|
||||
* Copyright (C) 2014-2026 EspoCRM, Inc.
|
||||
* 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 ActionHandler from 'action-handler';
|
||||
import {inject} from 'di';
|
||||
import Router from 'router';
|
||||
|
||||
// noinspection JSUnusedGlobalSymbols
|
||||
export default class extends ActionHandler {
|
||||
|
||||
/**
|
||||
* @type {Router}
|
||||
* @private
|
||||
*/
|
||||
@inject(Router)
|
||||
router
|
||||
|
||||
process() {
|
||||
window.open('api/v1/OpenApi', '_blank');
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,112 @@
|
||||
/************************************************************************
|
||||
* This file is part of EspoCRM.
|
||||
*
|
||||
* EspoCRM – Open Source CRM application.
|
||||
* Copyright (C) 2014-2026 EspoCRM, Inc.
|
||||
* 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.
|
||||
************************************************************************/
|
||||
|
||||
/**
|
||||
* @since 9.3.1
|
||||
*/
|
||||
export default class LinkFieldIconHelper {
|
||||
|
||||
/**
|
||||
* @param {import('views/fields/link').default} view
|
||||
* @param {{
|
||||
* iconClass: string,
|
||||
* getIconClass: function(): string|null,
|
||||
* getColor: function(): string,
|
||||
* }} options
|
||||
*/
|
||||
constructor(view, options) {
|
||||
this.view = view;
|
||||
this.options = options;
|
||||
|
||||
view.listenTo(view, 'after:render', () => {
|
||||
if (view.isEditMode()) {
|
||||
this.control();
|
||||
}
|
||||
});
|
||||
|
||||
view.addHandler('keydown', `input[data-name="${view.nameName}"]`, (/** KeyboardEvent */e, target) => {
|
||||
if (e.code === 'Enter') {
|
||||
return;
|
||||
}
|
||||
|
||||
target.classList.add('being-typed');
|
||||
});
|
||||
|
||||
view.addHandler('change', `input[data-name="${view.nameName}"]`, (e, target) => {
|
||||
setTimeout(() => target.classList.remove('being-typed'), 200);
|
||||
});
|
||||
|
||||
view.addHandler('blur', `input[data-name="${view.nameName}"]`, (e, target) => {
|
||||
target.classList.remove('being-typed');
|
||||
});
|
||||
|
||||
view.on('change', () => {
|
||||
if (!view.isEditMode()) {
|
||||
return;
|
||||
}
|
||||
|
||||
const span = view.element.querySelector('span.icon-in-input');
|
||||
|
||||
if (span) {
|
||||
span.parentNode.removeChild(span);
|
||||
}
|
||||
|
||||
setTimeout(() => this.control(), 0);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* @private
|
||||
*/
|
||||
control() {
|
||||
const view = this.view;
|
||||
|
||||
const nameElement = view.element.querySelector(`input[data-name="${view.nameName}"]`);
|
||||
nameElement.classList.remove('being-typed');
|
||||
|
||||
const icon = document.createElement('span');
|
||||
icon.className = 'icon-in-input ' + this.options.iconClass;
|
||||
icon.style.color = this.options.getColor();
|
||||
|
||||
const iconClass = this.options.getIconClass();
|
||||
|
||||
if (!iconClass) {
|
||||
return;
|
||||
}
|
||||
|
||||
icon.className += ' ' + iconClass;
|
||||
|
||||
const input = view.element.querySelector('.input-group > input');
|
||||
|
||||
if (!input) {
|
||||
return;
|
||||
}
|
||||
|
||||
input.after(icon);
|
||||
}
|
||||
}
|
||||
@@ -118,6 +118,16 @@ class LayoutFiltersView extends LayoutRowsView {
|
||||
return false;
|
||||
}
|
||||
|
||||
/** @type {string[]|null} */
|
||||
const layoutList = model.getFieldParam(name, 'layoutAvailabilityList');
|
||||
|
||||
if (
|
||||
layoutList &&
|
||||
!layoutList.includes(this.type)
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return !model.getFieldParam(name, 'disabled') &&
|
||||
!model.getFieldParam(name, 'utility') &&
|
||||
!model.getFieldParam(name, 'layoutFiltersDisabled');
|
||||
|
||||
@@ -108,8 +108,14 @@ class ExpandedLayoutDashletFieldView extends BaseFieldView {
|
||||
|
||||
this.addActionHandler('editItem', (event, target) => this.editItem(target.dataset.name));
|
||||
|
||||
this.targetEntityType = this.model.get('entityType') ||
|
||||
this.targetEntityType = this.model.attributes.entityType ??
|
||||
this.getMetadata().get(['dashlets', this.dataObject.dashletName, 'entityType']);
|
||||
|
||||
this.listenTo(this.model, 'change:entityType', () => {
|
||||
if (this.model.attributes.entityType) {
|
||||
this.targetEntityType = this.model.attributes.entityType;
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -223,8 +223,7 @@ class DetailModalView extends ModalView {
|
||||
return;
|
||||
}
|
||||
|
||||
this.model = this.sourceModel.clone();
|
||||
this.model.collection = this.sourceModel.collection.clone();
|
||||
this.cloneSourceModel();
|
||||
|
||||
this.setupAfterModelCreated();
|
||||
|
||||
@@ -259,6 +258,23 @@ class DetailModalView extends ModalView {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @private
|
||||
*/
|
||||
cloneSourceModel() {
|
||||
this.model = this.sourceModel.clone();
|
||||
|
||||
const sourceCollection = this.sourceModel.collection;
|
||||
|
||||
if (!sourceCollection) {
|
||||
return;
|
||||
}
|
||||
|
||||
this.model.collection = sourceCollection.clone();
|
||||
|
||||
this.listenTo(this.model.collection, 'update-source', () => sourceCollection.fetch())
|
||||
}
|
||||
|
||||
/**
|
||||
* Additional setup with the model ready.
|
||||
*
|
||||
@@ -502,7 +518,7 @@ class DetailModalView extends ModalView {
|
||||
if (nextButtonEnabled) {
|
||||
this.enableButton('next');
|
||||
} else {
|
||||
this.disableButton('next');
|
||||
this.disableButton('next');
|
||||
}
|
||||
}
|
||||
|
||||
@@ -512,6 +528,7 @@ class DetailModalView extends ModalView {
|
||||
}
|
||||
|
||||
const previousModel = this.model;
|
||||
const previousCollection = this.model.collection;
|
||||
|
||||
this.sourceModel = this.model.collection.at(indexOfRecord);
|
||||
|
||||
@@ -524,12 +541,15 @@ class DetailModalView extends ModalView {
|
||||
this.id = this.sourceModel.id;
|
||||
this.scope = this.sourceModel.entityType;
|
||||
|
||||
this.model = this.sourceModel.clone();
|
||||
this.model.collection = this.sourceModel.collection.clone();
|
||||
this.cloneSourceModel();
|
||||
|
||||
this.stopListening(previousModel, 'change');
|
||||
this.stopListening(previousModel, 'sync');
|
||||
|
||||
if (previousCollection) {
|
||||
this.stopListening(previousCollection, 'update-source');
|
||||
}
|
||||
|
||||
this.listenTo(this.model, 'change', () => {
|
||||
this.sourceModel.set(this.model.getClonedAttributes());
|
||||
});
|
||||
|
||||
@@ -846,7 +846,8 @@ class DetailRecordView extends BaseRecordView {
|
||||
if (this.duplicateAction) {
|
||||
if (
|
||||
this.getAcl().check(this.entityType, 'create') &&
|
||||
!this.getMetadata().get(['clientDefs', this.scope, 'duplicateDisabled'])
|
||||
!this.getMetadata().get(['clientDefs', this.scope, 'duplicateDisabled']) &&
|
||||
!this.getMetadata().get(['clientDefs', this.scope, 'createDisabled'])
|
||||
) {
|
||||
this.addDropdownItem({
|
||||
label: 'Duplicate',
|
||||
|
||||
Reference in New Issue
Block a user