From 733648c40ac41b64a025439c7947a73e91a6a429 Mon Sep 17 00:00:00 2001 From: Paula Quispe Date: Tue, 7 Jul 2020 12:35:27 -0400 Subject: [PATCH] PMCORE-1767 --- workflow/engine/templates/processes/main.js | 42 +++++++++------------ 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/workflow/engine/templates/processes/main.js b/workflow/engine/templates/processes/main.js index 2b9e15d72..b72f2bf8c 100644 --- a/workflow/engine/templates/processes/main.js +++ b/workflow/engine/templates/processes/main.js @@ -435,36 +435,30 @@ Ext.onReady(function(){ columns: [ proSelModel, expander, - // There is a list of allowed columns to sort: - // workflow/engine/methods/cases/proxyProcessList.php - // This is to prevent ORDER BY injection attacks - - // It is identical to this list. - // If you need to add a new column that is sortable, please - // make sure it is added there or sorting will not work. - {id:'PRO_UID', dataIndex: 'PRO_UID', hidden:true, hideable:false}, - {header: "", dataIndex: 'PRO_STATUS', width: 50, hidden:true, hideable:false}, - {header: _('ID_PRO_DESCRIPTION'), dataIndex: 'PRO_DESCRIPTION', hidden:true, hideable:false}, - {header: _('ID_PRO_TITLE'), dataIndex: 'PRO_TITLE', width: 200, hideable:false, renderer:function(v,p,r){ + // There is a list of allowed columns to sort: workflow/engine/methods/process/processList.php + // The following columns can not hidden: + {id:'PRO_UID', dataIndex: 'PRO_UID', hidden:true, hideable:false} + ,{header: _('ID_PRO_TITLE'), dataIndex: 'PRO_TITLE', width: 200, hideable:false, renderer:function(v,p,r){ // TODO Labels for var 'type' are hardcoded, they must be replaced on the future var color = r.get('PROJECT_TYPE') == 'bpmn'? 'green': 'blue'; var type = r.get('PROJECT_TYPE') == 'bpmn'? ' (BPMN Project)': ''; return Ext.util.Format.htmlEncode(v) + ' ' + String.format("{1}", color, type); - }}, - {header: _('ID_TYPE'), dataIndex: 'PROJECT_TYPE', width: 60, hidden:false}, - {header: _('ID_CATEGORY'), dataIndex: 'PRO_CATEGORY_LABEL', width: 100, hidden:false}, - - {header: _('ID_STATUS'), dataIndex: 'PRO_STATUS_LABEL', width: 50, renderer:function(v,p,r){ + }} + // The following columns can hidden and show: + ,{header: _('ID_TYPE'), dataIndex: 'PROJECT_TYPE', width: 60, hidden:false} + ,{header: _('ID_CATEGORY'), dataIndex: 'PRO_CATEGORY_LABEL', width: 100, hidden:false} + ,{header: _('ID_STATUS'), dataIndex: 'PRO_STATUS_LABEL', width: 50, renderer:function(v,p,r){ color = r.get('PRO_STATUS') == 'ACTIVE'? 'green': 'red'; 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_INBOX'), dataIndex: 'CASES_COUNT_TO_DO', width: 50, align:'right'}, - {header: _('ID_DRAFT'), dataIndex: 'CASES_COUNT_DRAFT', width: 50, align:'right'}, - {header: _('ID_COMPLETED'), dataIndex: 'CASES_COUNT_COMPLETED', width: 50, align:'right'}, - {header: _('ID_CANCELLED'), dataIndex: 'CASES_COUNT_CANCELLED', width: 50, align:'right'}, - {header: _('ID_TOTAL_CASES'), dataIndex: 'CASES_COUNT', width: 75, renderer:function(v){return ""+v+"";}, align:'right'} + }} + ,{header: _('ID_OWNER'), dataIndex: 'PRO_CREATE_USER_LABEL', width: 90} + ,{header: _('ID_PRO_CREATE_DATE'), dataIndex: 'PRO_CREATE_DATE', width: 90} + ,{header: _('ID_INBOX'), dataIndex: 'CASES_COUNT_TO_DO', width: 50, align:'right'} + ,{header: _('ID_DRAFT'), dataIndex: 'CASES_COUNT_DRAFT', width: 50, align:'right'} + ,{header: _('ID_COMPLETED'), dataIndex: 'CASES_COUNT_COMPLETED', width: 50, align:'right'} + ,{header: _('ID_CANCELLED'), dataIndex: 'CASES_COUNT_CANCELLED', width: 50, align:'right'} + ,{header: _('ID_TOTAL_CASES'), dataIndex: 'CASES_COUNT', width: 70, renderer:function(v){return ""+v+"";}, align:'right'} + ,{header: _('ID_PRO_DEBUG'), dataIndex: 'PRO_DEBUG_LABEL', width: 5, align:'right'} /*----------------------------------********---------------------------------*/ ,{header: _("ID_TYPE_PROCESS"), dataIndex: "PRO_TYPE_PROCESS", width: 75, align:"right"} /*----------------------------------********---------------------------------*/