Author: hoang_to
Date: 2010-08-10 02:22:12 -0400 (Tue, 10 Aug 2010)
New Revision: 3786
Modified:
portal/branches/branched-r3776/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardPortlet.java
portal/branches/branched-r3776/webui/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/DashboardParent.java
portal/branches/branched-r3776/webui/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardEditForm.java
Log:
Apply patch for GTNPORTAL-759
Modified:
portal/branches/branched-r3776/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardPortlet.java
===================================================================
---
portal/branches/branched-r3776/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardPortlet.java 2010-08-10
04:28:14 UTC (rev 3785)
+++
portal/branches/branched-r3776/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardPortlet.java 2010-08-10
06:22:12 UTC (rev 3786)
@@ -98,12 +98,4 @@
return false;
}
- /**
- * For now returns null.
- */
- public String getDashboardOwner()
- {
- return null;
- }
-
}
Modified:
portal/branches/branched-r3776/webui/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/DashboardParent.java
===================================================================
---
portal/branches/branched-r3776/webui/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/DashboardParent.java 2010-08-10
04:28:14 UTC (rev 3785)
+++
portal/branches/branched-r3776/webui/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/DashboardParent.java 2010-08-10
06:22:12 UTC (rev 3786)
@@ -21,11 +21,5 @@
public interface DashboardParent
{
- public static final String ISPRIVATE = "isPrivate";
-
- public static final String OWNER = "owner";
-
- String getDashboardOwner();
-
boolean canEdit();
}
Modified:
portal/branches/branched-r3776/webui/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardEditForm.java
===================================================================
---
portal/branches/branched-r3776/webui/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardEditForm.java 2010-08-10
04:28:14 UTC (rev 3785)
+++
portal/branches/branched-r3776/webui/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardEditForm.java 2010-08-10
06:22:12 UTC (rev 3786)
@@ -49,20 +49,13 @@
public UIDashboardEditForm() throws Exception
{
- PortletRequestContext pcontext =
(PortletRequestContext)WebuiRequestContext.getCurrentInstance();
- PortletPreferences pref = pcontext.getRequest().getPreferences();
addUIFormInput(new UIFormStringInput(TOTAL_COLUMNS, TOTAL_COLUMNS, null));
- addUIFormInput(new UIFormStringInput(DashboardParent.OWNER, DashboardParent.OWNER,
pref.getValue(
- DashboardParent.OWNER, null)));
- addUIFormInput(new UIFormStringInput(DashboardParent.ISPRIVATE,
DashboardParent.ISPRIVATE, pref.getValue(
- DashboardParent.ISPRIVATE, null)));
}
public static class SaveActionListener extends
EventListener<UIDashboardEditForm>
{
public final void execute(final Event<UIDashboardEditForm> event) throws
Exception
{
-
UIDashboardEditForm uiForm = event.getSource();
UIFormStringInput uiInput = uiForm.getUIStringInput(TOTAL_COLUMNS);
@@ -101,12 +94,6 @@
throw new MessageException(new
ApplicationMessage("NumberFormatValidator.msg.Invalid-number", args));
}
- uiInput = uiForm.getUIStringInput(DashboardParent.ISPRIVATE);
- pref.setValue(DashboardParent.ISPRIVATE, uiInput.getValue());
-
- uiInput = uiForm.getUIStringInput(DashboardParent.OWNER);
- pref.setValue(DashboardParent.OWNER, uiInput.getValue());
-
UIDashboardContainer uiDashboardContainer =
((UIContainer)uiForm.getParent()).getChild(UIDashboard.class).getChild(UIDashboardContainer.class);
uiDashboardContainer.setColumns(totalCols);