From c3727c2f109348cc82fbb4480cf12f29cd146e83 Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Thu, 12 Apr 2018 17:08:14 +0200 Subject: [PATCH] IDEMPIERE-3685 Client field is shown empty in Included Roles grid mode --- migration/i5.1/oracle/201804121657_IDEMPIERE-3685.sql | 11 +++++++++++ .../i5.1/postgresql/201804121657_IDEMPIERE-3685.sql | 8 ++++++++ .../adempiere/webui/adwindow/GridTabRowRenderer.java | 2 +- 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 migration/i5.1/oracle/201804121657_IDEMPIERE-3685.sql create mode 100644 migration/i5.1/postgresql/201804121657_IDEMPIERE-3685.sql diff --git a/migration/i5.1/oracle/201804121657_IDEMPIERE-3685.sql b/migration/i5.1/oracle/201804121657_IDEMPIERE-3685.sql new file mode 100644 index 0000000000..b1578a80b7 --- /dev/null +++ b/migration/i5.1/oracle/201804121657_IDEMPIERE-3685.sql @@ -0,0 +1,11 @@ +SET SQLBLANKLINES ON +SET DEFINE OFF + +-- IDEMPIERE-3685 +-- Apr 12, 2018 4:51:48 PM CEST +UPDATE AD_Tab SET WhereClause='(AD_Field.IsDisplayed=''Y'' OR AD_Field.IsDisplayedGrid=''Y'')', OrderByClause='AD_Field.SeqNo, AD_Field.SeqNoGrid',Updated=TO_DATE('2018-04-12 16:51:48','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=107 +; + +SELECT register_migration_script('201804121657_IDEMPIERE-3685.sql') FROM dual +; + diff --git a/migration/i5.1/postgresql/201804121657_IDEMPIERE-3685.sql b/migration/i5.1/postgresql/201804121657_IDEMPIERE-3685.sql new file mode 100644 index 0000000000..4dab3d3c60 --- /dev/null +++ b/migration/i5.1/postgresql/201804121657_IDEMPIERE-3685.sql @@ -0,0 +1,8 @@ +-- IDEMPIERE-3685 +-- Apr 12, 2018 4:51:48 PM CEST +UPDATE AD_Tab SET WhereClause='(AD_Field.IsDisplayed=''Y'' OR AD_Field.IsDisplayedGrid=''Y'')', OrderByClause='SeqNo, SeqNoGrid',Updated=TO_TIMESTAMP('2018-04-12 16:51:48','YYYY-MM-DD HH24:MI:SS'),UpdatedBy=100 WHERE AD_Tab_ID=107 +; + +SELECT register_migration_script('201804121657_IDEMPIERE-3685.sql') FROM dual +; + diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridTabRowRenderer.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridTabRowRenderer.java index afbf8d835f..39a8f79726 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridTabRowRenderer.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/adwindow/GridTabRowRenderer.java @@ -567,7 +567,7 @@ public class GridTabRowRenderer implements RowRenderer, RowRendererExt } GridRowCtx ctx = new GridRowCtx(Env.getCtx(), gridTab, rowIndex); - if (!gridPanelFields[i].isDisplayed(ctx, true)){ + if (! (gridPanelFields[i].isDisplayed(ctx, true) || gridPanelFields[i].isDisplayedGrid())){ // IDEMPIERE-2253 component.setVisible(false); }