Skip to content

EspoCRM – Open Source CRM Application

Jobs fields cleanup

Yuriidd77d4c618f6
diff --git a/application/Espo/Resources/i18n/en_US/Job.json b/application/Espo/Resources/i18n/en_US/Job.json
index e7b4d8f6d5..b874985d83 100644
--- a/application/Espo/Resources/i18n/en_US/Job.json
+++ b/application/Espo/Resources/i18n/en_US/Job.json
@@ -6,9 +6,6 @@
"startedAt": "Started At",
"attempts": "Attempts Left",
"failedAttempts": "Failed Attempts",
- "serviceName": "Service",
- "method": "Method (deprecated)",
- "methodName": "Method",
"scheduledJob": "Scheduled Job",
"scheduledJobJob": "Scheduled Job Name",
"data": "Data",
diff --git a/application/Espo/Resources/layouts/Job/detail.json b/application/Espo/Resources/layouts/Job/detail.json
index 9645a1cd0a..0d603e9790 100644
--- a/application/Espo/Resources/layouts/Job/detail.json
+++ b/application/Espo/Resources/layouts/Job/detail.json
@@ -1,6 +1,5 @@
[
{
- "label": "",
"rows": [
[{"name":"name"}, {"name": "status"}],
[{"name":"queue"}, {"name":"number"}],
@@ -8,7 +7,6 @@
]
},
{
- "label": "",
"rows": [
[{"name":"executeTime"}, {"name": "createdAt"}],
[{"name":"startedAt"}, {"name": "modifiedAt"}],
@@ -18,13 +16,11 @@
]
},
{
- "label": "",
"rows": [
[{"name":"scheduledJob"}, {"name":"targetType"}],
[{"name":"className"}, {"name":"targetId"}],
- [{"name":"serviceName"}, {"name":"job"}],
- [{"name":"methodName"}, false],
- [{"name": "data", "fullWidth": true}]
+ [{"name":"job"}, false],
+ [{"name": "data"}]
]
}
]
diff --git a/application/Espo/Resources/layouts/Job/detailSmall.json b/application/Espo/Resources/layouts/Job/detailSmall.json
index 9645a1cd0a..0d603e9790 100644
--- a/application/Espo/Resources/layouts/Job/detailSmall.json
+++ b/application/Espo/Resources/layouts/Job/detailSmall.json
@@ -1,6 +1,5 @@
[
{
- "label": "",
"rows": [
[{"name":"name"}, {"name": "status"}],
[{"name":"queue"}, {"name":"number"}],
@@ -8,7 +7,6 @@
]
},
{
- "label": "",
"rows": [
[{"name":"executeTime"}, {"name": "createdAt"}],
[{"name":"startedAt"}, {"name": "modifiedAt"}],
@@ -18,13 +16,11 @@
]
},
{
- "label": "",
"rows": [
[{"name":"scheduledJob"}, {"name":"targetType"}],
[{"name":"className"}, {"name":"targetId"}],
- [{"name":"serviceName"}, {"name":"job"}],
- [{"name":"methodName"}, false],
- [{"name": "data", "fullWidth": true}]
+ [{"name":"job"}, false],
+ [{"name": "data"}]
]
}
]
diff --git a/application/Espo/Resources/metadata/entityDefs/Job.json b/application/Espo/Resources/metadata/entityDefs/Job.json
index e2d212f3c5..410c09448b 100644
--- a/application/Espo/Resources/metadata/entityDefs/Job.json
+++ b/application/Espo/Resources/metadata/entityDefs/Job.json
@@ -111,7 +111,7 @@
"collection": {
"orderBy": "number",
"order": "desc",
- "textFilterFields": ["id", "name", "methodName", "serviceName"],
+ "textFilterFields": ["id", "name"],
"countDisabled": true
},
"indexes": {