From bba40907c39bcb61ceb9675514e8fc2705c599c7 Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Wed, 10 Dec 2008 08:30:44 +0000 Subject: [PATCH] * Allow user to control the dashboard panel to be static or collapsible --- .../compiere/model/I_PA_DashboardContent.java | 16 +++++++-------- .../compiere/model/X_PA_DashboardContent.java | 20 +++++++++---------- .../src/org/adempiere/webui/Desktop.java | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/base/src/org/compiere/model/I_PA_DashboardContent.java b/base/src/org/compiere/model/I_PA_DashboardContent.java index ddb5481350..a96a696704 100644 --- a/base/src/org/compiere/model/I_PA_DashboardContent.java +++ b/base/src/org/compiere/model/I_PA_DashboardContent.java @@ -106,18 +106,18 @@ public interface I_PA_DashboardContent /** Get HTML */ public String getHTML(); - /** Column name IsCollapsable */ - public static final String COLUMNNAME_IsCollapsable = "IsCollapsable"; + /** Column name IsCollapsible */ + public static final String COLUMNNAME_IsCollapsible = "IsCollapsible"; - /** Set Collapsable. - * Flag to indicate the state of dashboard panel (i.e. collapsable or static) + /** Set Collapsible. + * Flag to indicate the state of the dashboard panel */ - public void setIsCollapsable (boolean IsCollapsable); + public void setIsCollapsible (boolean IsCollapsible); - /** Get Collapsable. - * Flag to indicate the state of dashboard panel (i.e. collapsable or static) + /** Get Collapsible. + * Flag to indicate the state of the dashboard panel */ - public boolean isCollapsable(); + public boolean isCollapsible(); /** Column name Line */ public static final String COLUMNNAME_Line = "Line"; diff --git a/base/src/org/compiere/model/X_PA_DashboardContent.java b/base/src/org/compiere/model/X_PA_DashboardContent.java index e25e541fac..661fe30de3 100644 --- a/base/src/org/compiere/model/X_PA_DashboardContent.java +++ b/base/src/org/compiere/model/X_PA_DashboardContent.java @@ -42,7 +42,7 @@ public class X_PA_DashboardContent extends PO implements I_PA_DashboardContent, super (ctx, PA_DashboardContent_ID, trxName); /** if (PA_DashboardContent_ID == 0) { - setIsCollapsable (true); + setIsCollapsible (true); // Y setName (null); setPA_DashboardContent_ID (0); @@ -167,21 +167,21 @@ public class X_PA_DashboardContent extends PO implements I_PA_DashboardContent, return (String)get_Value(COLUMNNAME_HTML); } - /** Set Collapsable. - @param IsCollapsable - Flag to indicate the state of dashboard panel (i.e. collapsable or static) + /** Set Collapsible. + @param IsCollapsible + Flag to indicate the state of the dashboard panel */ - public void setIsCollapsable (boolean IsCollapsable) + public void setIsCollapsible (boolean IsCollapsible) { - set_Value (COLUMNNAME_IsCollapsable, Boolean.valueOf(IsCollapsable)); + set_Value (COLUMNNAME_IsCollapsible, Boolean.valueOf(IsCollapsible)); } - /** Get Collapsable. - @return Flag to indicate the state of dashboard panel (i.e. collapsable or static) + /** Get Collapsible. + @return Flag to indicate the state of the dashboard panel */ - public boolean isCollapsable () + public boolean isCollapsible () { - Object oo = get_Value(COLUMNNAME_IsCollapsable); + Object oo = get_Value(COLUMNNAME_IsCollapsible); if (oo != null) { if (oo instanceof Boolean) diff --git a/zkwebui/WEB-INF/src/org/adempiere/webui/Desktop.java b/zkwebui/WEB-INF/src/org/adempiere/webui/Desktop.java index f3ec2b5488..36e0a56325 100644 --- a/zkwebui/WEB-INF/src/org/adempiere/webui/Desktop.java +++ b/zkwebui/WEB-INF/src/org/adempiere/webui/Desktop.java @@ -232,8 +232,8 @@ public class Desktop extends AbstractUIPart implements MenuListener, Serializabl if(description != null) panel.setTooltiptext(description); - boolean collapsible = rs.getString(X_PA_DashboardContent.COLUMNNAME_IsCollapsable).equals("Y"); - panel.setCollapsible(collapsible); + String collapsible = rs.getString(X_PA_DashboardContent.COLUMNNAME_IsCollapsible); + panel.setCollapsible(collapsible.equals("Y")); panel.setBorder("normal"); portalchildren.appendChild(panel);