job front end fixes

This commit is contained in:
yuri
2019-10-02 11:44:28 +03:00
parent 00230f50d6
commit c752e8fc91
3 changed files with 31 additions and 4 deletions
@@ -0,0 +1,28 @@
[
{
"label":"",
"rows":[
[{"name":"name"}, {"name": "status"}],
[{"name":"queue"}, {"name":"number"}]
]
},
{
"label":"",
"rows":[
[{"name":"executeTime"}, {"name": "createdAt"}],
[{"name":"startedAt"}, {"name": "modifiedAt"}],
[{"name":"executedAt"}, false],
[{"name":"attempts"}, false],
[{"name":"failedAttempts"}, false]
]
},
{
"label":"",
"rows":[
[{"name":"scheduledJob"}, {"name":"targetType"}],
[{"name":"serviceName"}, {"name":"targetId"}],
[{"name":"methodName"}, {"name":"job"}],
[{"name": "data", "fullWidth": true}]
]
}
]
@@ -104,7 +104,7 @@
"collection": {
"orderBy": "number",
"order": "desc",
"textFilterFields": ["name", "methodName", "serviceName", "scheduledJob"]
"textFilterFields": ["id", "name", "methodName", "serviceName", "scheduledJob"]
},
"indexes": {
"executeTime": {
+2 -3
View File
@@ -26,12 +26,12 @@
* these Appropriate Legal Notices must retain the display of the "EspoCRM" word.
************************************************************************/
Espo.define('views/admin/job/fields/name', 'views/fields/varchar', function (Dep) {
define('views/admin/job/fields/name', 'views/fields/varchar', function (Dep) {
return Dep.extend({
getValueForDisplay: function () {
if (this.mode == 'list' || this.mode == 'detail') {
if (this.mode == 'list' || this.mode == 'detail' || this.mode === 'listLink') {
if (!this.model.get('name')) {
return this.model.get('serviceName') + ': ' + this.model.get('methodName');
} else {
@@ -42,4 +42,3 @@ Espo.define('views/admin/job/fields/name', 'views/fields/varchar', function (Dep
});
});