Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| b2a4f80408 | |||
| 9153fbf280 | |||
| cb16bc9254 | |||
| dc8f674248 | |||
| 803b07866a | |||
| 50f422ded8 |
@@ -7,6 +7,7 @@
|
||||
/data/config-internal.php
|
||||
/data/config-override.php
|
||||
/data/config-internal-override.php
|
||||
/data/state.php
|
||||
/data/tmp/*
|
||||
/build
|
||||
/node_modules
|
||||
|
||||
@@ -227,6 +227,7 @@
|
||||
"type": "enum",
|
||||
"notStorable": true,
|
||||
"orderDisabled": true,
|
||||
"directUpdateDisabled": true,
|
||||
"layoutMassUpdateDisabled": true,
|
||||
"layoutDetailDisabled": true,
|
||||
"layoutAvailabilityList": ["listForContact"],
|
||||
|
||||
@@ -86,7 +86,11 @@
|
||||
},
|
||||
"user": {
|
||||
"type": "index",
|
||||
"columns": ["userId", "createdAt"]
|
||||
"columns": ["userId", "number"]
|
||||
},
|
||||
"userIdReadRelatedParentType": {
|
||||
"type": "index",
|
||||
"columns": ["userId", "deleted", "read", "relatedParentType"]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -216,7 +216,7 @@ class LabelManager implements
|
||||
}
|
||||
}
|
||||
|
||||
return json_decode(Json::encode($finalData));
|
||||
return json_decode(Json::encode((object) $finalData));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -44,6 +44,12 @@ class EntityManagerEditView extends View {
|
||||
additionalParams
|
||||
defaultParamLocation = 'scopes'
|
||||
|
||||
/**
|
||||
* @private
|
||||
* @type {string[]}
|
||||
*/
|
||||
enumFieldList
|
||||
|
||||
data() {
|
||||
return {
|
||||
isNew: this.isNew,
|
||||
@@ -131,7 +137,8 @@ class EntityManagerEditView extends View {
|
||||
}
|
||||
|
||||
if (scope) {
|
||||
const fieldDefs = this.getMetadata().get('entityDefs.' + scope + '.fields') || {};
|
||||
/** @type {Record.<string, Record>} */
|
||||
const fieldDefs = this.getMetadata().get(`entityDefs.${scope}.fields`) || {};
|
||||
|
||||
this.orderableFieldList = Object.keys(fieldDefs)
|
||||
.filter(item => {
|
||||
@@ -180,13 +187,19 @@ class EntityManagerEditView extends View {
|
||||
|
||||
this.enumFieldList = Object.keys(fieldDefs)
|
||||
.filter(item => {
|
||||
if (fieldDefs[item].disabled) {
|
||||
return;
|
||||
if (
|
||||
fieldDefs[item].disabled ||
|
||||
fieldDefs[item].utility ||
|
||||
fieldDefs[item].directUpdateDisabled
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if (fieldDefs[item].type === 'enum') {
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
})
|
||||
.sort((v1, v2) => {
|
||||
return this.translate(v1, 'fields', scope)
|
||||
|
||||
Generated
+2
-2
@@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "espocrm",
|
||||
"version": "9.2.1",
|
||||
"version": "9.2.2",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "espocrm",
|
||||
"version": "9.2.1",
|
||||
"version": "9.2.2",
|
||||
"hasInstallScript": true,
|
||||
"license": "AGPL-3.0-or-later",
|
||||
"dependencies": {
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "espocrm",
|
||||
"version": "9.2.1",
|
||||
"version": "9.2.2",
|
||||
"description": "Open-source CRM.",
|
||||
"repository": {
|
||||
"type": "git",
|
||||
|
||||
Reference in New Issue
Block a user