diff --git a/workflow/engine/methods/processes/processesList.php b/workflow/engine/methods/processes/processesList.php index ed4a524ab..7d23e841f 100644 --- a/workflow/engine/methods/processes/processesList.php +++ b/workflow/engine/methods/processes/processesList.php @@ -33,6 +33,12 @@ switch ($sort) { case 'PRO_CATEGORY_LABEL': $sort = 'PRO_CATEGORY'; break; + case 'PRO_CREATE_DATE_LABEL': + $sort = 'PRO_CREATE_DATE'; + break; + case 'PRO_UPDATE_DATE_LABEL': + $sort = 'PRO_UPDATE_DATE'; + break; default: // keep the sort value } diff --git a/workflow/engine/templates/processes/main.js b/workflow/engine/templates/processes/main.js index 56668a626..2e713dc86 100644 --- a/workflow/engine/templates/processes/main.js +++ b/workflow/engine/templates/processes/main.js @@ -150,7 +150,7 @@ Ext.onReady(function(){ {name : 'PRO_TITLE'}, {name : 'PRO_STATUS'}, {name : 'PRO_STATUS_LABEL'}, - {name : 'PRO_CREATE_DATE'}, + {name : 'PRO_CREATE_DATE_LABEL'}, {name : 'PRO_DEBUG'}, {name : 'PRO_DEBUG_LABEL'}, {name : 'PRO_CREATE_USER_LABEL'}, @@ -163,7 +163,7 @@ Ext.onReady(function(){ /*----------------------------------********---------------------------------*/ ,{name : "PRO_TYPE_PROCESS", type: "string"} /*----------------------------------********---------------------------------*/ - ,{name : "PRO_UPDATE_DATE"} + ,{name : "PRO_UPDATE_DATE_LABEL"} ] }), @@ -410,7 +410,7 @@ Ext.onReady(function(){ return String.format("{1}", color, v); }} ,{header: _('ID_OWNER'), dataIndex: 'PRO_CREATE_USER_LABEL', width: 90} - ,{header: _('ID_PRO_CREATE_DATE'), dataIndex: 'PRO_CREATE_DATE', width: 90} + ,{header: _('ID_PRO_CREATE_DATE'), dataIndex: 'PRO_CREATE_DATE_LABEL', width: 90} ,{header: _('ID_INBOX'), dataIndex: 'CASES_COUNT_TO_DO', width: 50, align:'right', sortable: false} ,{header: _('ID_DRAFT'), dataIndex: 'CASES_COUNT_DRAFT', width: 50, align:'right', sortable: false} ,{header: _('ID_COMPLETED'), dataIndex: 'CASES_COUNT_COMPLETED', width: 50, align:'right', sortable: false} @@ -420,7 +420,7 @@ Ext.onReady(function(){ /*----------------------------------********---------------------------------*/ ,{header: _("ID_TYPE_PROCESS"), dataIndex: "PRO_TYPE_PROCESS", width: 70} /*----------------------------------********---------------------------------*/ - ,{header: _("ID_LAN_UPDATE_DATE"), dataIndex: "PRO_UPDATE_DATE", width: 90} + ,{header: _("ID_LAN_UPDATE_DATE"), dataIndex: "PRO_UPDATE_DATE_LABEL", width: 90} ] }), sm: proSelModel,