From e7aee3e466aa292e65c0e846ca4c05eab92b3ace Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Fri, 9 Nov 2012 11:56:08 -0500 Subject: [PATCH] IDEMPIERE-357 Ticket #1001002 Move the Menu to be a Portlet / enable dashboard for System user --- .../compiere/model/MDashboardPreference.java | 28 ++++--------------- .../webui/desktop/DashboardController.java | 5 +--- 2 files changed, 7 insertions(+), 26 deletions(-) diff --git a/org.adempiere.base/src/org/compiere/model/MDashboardPreference.java b/org.adempiere.base/src/org/compiere/model/MDashboardPreference.java index 43bf3725b6..48f3207b21 100644 --- a/org.adempiere.base/src/org/compiere/model/MDashboardPreference.java +++ b/org.adempiere.base/src/org/compiere/model/MDashboardPreference.java @@ -49,17 +49,9 @@ public class MDashboardPreference extends X_PA_DashboardPreference { Properties ctx = Env.getCtx(); - StringBuilder whereClause = new StringBuilder(COLUMNNAME_IsShowInDashboard).append("=?"); - - if (AD_Role_ID == 0) - whereClause.append(" AND (").append(COLUMNNAME_AD_Role_ID).append(" IS NULL OR ").append(COLUMNNAME_AD_Role_ID).append("=?)"); - else - whereClause.append(" AND ").append(COLUMNNAME_AD_Role_ID).append("=?"); - - if (AD_User_ID == 0) - whereClause.append(" AND (").append(COLUMNNAME_AD_User_ID).append(" IS NULL OR ").append(COLUMNNAME_AD_User_ID).append("=?)"); - else - whereClause.append(" AND ").append(COLUMNNAME_AD_User_ID).append("=?"); + StringBuilder whereClause = new StringBuilder(COLUMNNAME_IsShowInDashboard).append("=?") + .append(" AND ").append(COLUMNNAME_AD_Role_ID).append("=?") + .append(" AND ").append(COLUMNNAME_AD_User_ID).append("=?"); List parameters = new ArrayList(); parameters.add(isShowInDashboard); @@ -83,17 +75,9 @@ public class MDashboardPreference extends X_PA_DashboardPreference { Properties ctx = Env.getCtx(); - StringBuilder whereClause = new StringBuilder(); - - if (AD_Role_ID == 0) - whereClause.append("(").append(COLUMNNAME_AD_Role_ID).append(" IS NULL OR ").append(COLUMNNAME_AD_Role_ID).append("=?)"); - else - whereClause.append(COLUMNNAME_AD_Role_ID).append("=?"); - - if (AD_User_ID == 0) - whereClause.append(" AND (").append(COLUMNNAME_AD_User_ID).append(" IS NULL OR ").append(COLUMNNAME_AD_User_ID).append("=?)"); - else - whereClause.append(" AND ").append(COLUMNNAME_AD_User_ID).append("=?"); + StringBuilder whereClause = new StringBuilder() + .append(COLUMNNAME_AD_Role_ID).append("=?") + .append(" AND ").append(COLUMNNAME_AD_User_ID).append("=?"); List parameters = new ArrayList(); parameters.add(AD_Role_ID); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DashboardController.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DashboardController.java index 5bdc7a0179..4b2cc77383 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DashboardController.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/desktop/DashboardController.java @@ -516,16 +516,13 @@ public class DashboardController implements EventListener { private void createDashboardPreference() { - if (Env.getAD_User_ID(Env.getCtx()) == 0 && Env.getAD_Role_ID(Env.getCtx()) == 0) - return; - MDashboardContent[] dcs = MDashboardContent.getForSession(0, 0); for (MDashboardContent dc : dcs) { MDashboardPreference preference = new MDashboardPreference(Env.getCtx(), 0, null); preference.setAD_Org_ID(Env.getAD_Org_ID(Env.getCtx())); preference.setAD_Role_ID(Env.getAD_Role_ID(Env.getCtx())); - preference.setAD_User_ID(Env.getAD_User_ID(Env.getCtx())); + preference.set_ValueNoCheck("AD_User_ID", Env.getAD_User_ID(Env.getCtx())); preference.setColumnNo(dc.getColumnNo()); preference.setIsCollapsedByDefault(dc.isCollapsedByDefault()); preference.setIsShowInDashboard(dc.isShowInDashboard());