From 79cd806f22e8df0b9291f931f19744fb08663fc1 Mon Sep 17 00:00:00 2001 From: Victor Saisa Lopez Date: Mon, 6 Oct 2014 17:20:24 -0400 Subject: [PATCH 1/2] BUG-238 "La lista de documentos generados despliega..." SOLVED MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Issue: La lista de documentos generados despliega una columna extra que se encuentra vacíal igual que su label Cause: Ninguna Solution: La columna es necesaria ya que tiene su funcionalidad, se ha completado añendo el label de la columna y se ha quitado esta columna de los menus emergentes que tiene cada columna --- .../cases/casesGenerateDocumentPage.js | 28 +++++++++---------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/workflow/engine/templates/cases/casesGenerateDocumentPage.js b/workflow/engine/templates/cases/casesGenerateDocumentPage.js index 6376c191d..a8e1d07b3 100644 --- a/workflow/engine/templates/cases/casesGenerateDocumentPage.js +++ b/workflow/engine/templates/cases/casesGenerateDocumentPage.js @@ -289,9 +289,9 @@ function renderDeleteFile(val,p,r) { if (r.data.DELETE_FILE) { - return ''; + return ""; } else { - return ''; + return "-"; } } @@ -316,8 +316,7 @@ }, cm: new Ext.grid.ColumnModel({ defaults: { - width: 200, - sortable: true + width: 200 }, columns: [ @@ -326,13 +325,12 @@ {id:'FILEPDFEXIST', dataIndex: 'FILEPDFEXIST', hidden:true, hideable:false}, {id:'FILEDOC', dataIndex: 'FILEDOC', hidden:true, hideable:false}, {id:'FILEPDF', dataIndex: 'FILEPDF', hidden:true, hideable:false}, - {header: _("ID_TITLE_FIELD"), dataIndex: 'TITLE', width: 70}, - {header: _("ID_OUTPUT_DOCUMENT"), dataIndex: 'OUTDOCTITLE', width: 70}, - {header: _("ID_ORIGIN_TASK"), dataIndex: 'ORIGIN', width: 70}, - {header: _("ID_CREATED_BY"), dataIndex: 'CREATED_BY', width: 70}, - {header: _("ID_CREATE_DATE"), dataIndex: 'CREATE_DATE', width: 70,renderer:startDateRender}, - {header: '', dataIndex: 'DELETE_FILE', width: 30,renderer:renderDeleteFile} - + {dataIndex: "TITLE", header: _("ID_TITLE_FIELD"), sortable: true, width: 70}, + {dataIndex: "OUTDOCTITLE", header: _("ID_OUTPUT_DOCUMENT"), sortable: true, width: 70}, + {dataIndex: "ORIGIN", header: _("ID_ORIGIN_TASK"), sortable: true, width: 70}, + {dataIndex: "CREATED_BY", header: _("ID_CREATED_BY"), sortable: true, width: 70}, + {dataIndex: "CREATE_DATE", header: _("ID_CREATE_DATE"), sortable: true, width: 70, renderer: startDateRender}, + {dataIndex: "DELETE_FILE", header: _("ID_ACTION"), sortable: false, menuDisabled: true, hideable: false, width: 30, align: "center", renderer: renderDeleteFile} ] }), store: store, @@ -360,12 +358,12 @@ icon: Ext.MessageBox.ERROR, buttons: Ext.MessageBox.OK, fn : function(btn) { - try + try { prnt = parent.parent; top.location = top.location; } - catch (err) + catch (err) { parent.location = parent.location; } @@ -434,12 +432,12 @@ icon: Ext.MessageBox.ERROR, buttons: Ext.MessageBox.OK, fn : function(btn) { - try + try { prnt = parent.parent; top.location = top.location; } - catch (err) + catch (err) { parent.location = parent.location; } From 5fb4ab900c90e5bc4abdcaa05cce3a8664dc981d Mon Sep 17 00:00:00 2001 From: Victor Saisa Lopez Date: Tue, 7 Oct 2014 10:44:08 -0400 Subject: [PATCH 2/2] BUG-238 "La lista de documentos generados despliega..." SOLVED MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Issue: La lista de documentos generados despliega una columna extra que se encuentra vacíal igual que su label Cause: Ninguna Solution: La columna es necesaria ya que tiene su funcionalidad, se ha completado añendo el label de la columna y se ha quitado esta columna de los menus emergentes que tiene cada columna --- workflow/engine/templates/cases/casesGenerateDocumentPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/workflow/engine/templates/cases/casesGenerateDocumentPage.js b/workflow/engine/templates/cases/casesGenerateDocumentPage.js index a8e1d07b3..2c0924bcd 100644 --- a/workflow/engine/templates/cases/casesGenerateDocumentPage.js +++ b/workflow/engine/templates/cases/casesGenerateDocumentPage.js @@ -330,7 +330,7 @@ {dataIndex: "ORIGIN", header: _("ID_ORIGIN_TASK"), sortable: true, width: 70}, {dataIndex: "CREATED_BY", header: _("ID_CREATED_BY"), sortable: true, width: 70}, {dataIndex: "CREATE_DATE", header: _("ID_CREATE_DATE"), sortable: true, width: 70, renderer: startDateRender}, - {dataIndex: "DELETE_FILE", header: _("ID_ACTION"), sortable: false, menuDisabled: true, hideable: false, width: 30, align: "center", renderer: renderDeleteFile} + {dataIndex: "DELETE_FILE", header: _("ID_ACTIONS"), sortable: false, menuDisabled: true, hideable: false, width: 30, align: "center", renderer: renderDeleteFile} ] }), store: store,