[gatein-commits] gatein SVN: r2029 - in portal/trunk: web/portal/src/main/webapp/login/jsp and 1 other directory.
Author: tan_pham_dinh
Date: 2010-03-07 23:09:16 -0500 (Sun, 07 Mar 2010)
New Revision: 2029
Modified:
portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardPortlet.java
portal/trunk/web/portal/src/main/webapp/login/jsp/login.jsp
Log:
GTNPORTAL-804: Only root can add gadgetAdd onkeypress for checkbox in private login
Modified:
portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardPortlet.java
===================================================================
---
portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardPortlet.java 2010-03-08
03:58:29 UTC (rev 2028)
+++
portal/trunk/portlet/dashboard/src/main/java/org/exoplatform/dashboard/webui/component/UIDashboardPortlet.java 2010-03-08
04:09:16 UTC (rev 2029)
@@ -84,7 +84,7 @@
if (page != null)
{
UserACL userACL = portal.getApplicationComponent(UserACL.class);
- return userACL.hasPermission(page.getEditPermission());
+ return userACL.hasPermission(page);
}
}
}
Modified: portal/trunk/web/portal/src/main/webapp/login/jsp/login.jsp
===================================================================
--- portal/trunk/web/portal/src/main/webapp/login/jsp/login.jsp 2010-03-08 03:58:29 UTC
(rev 2028)
+++ portal/trunk/web/portal/src/main/webapp/login/jsp/login.jsp 2010-03-08 04:09:16 UTC
(rev 2029)
@@ -80,7 +80,7 @@
<td
class="FieldLabel"><%=res.getString("UILoginForm.label.password")%></td>
<td><input class="Password" type="password"
name="password" value=""/></td>
</tr>
- <tr class="FieldContainer">
+ <tr class="FieldContainer"
onkeypress="eXo.portal.UIPortalControl.onEnterPress(event);">
<td class="FieldLabel"><input
type="checkbox" name="rememberme"
value="true"/></td>
<td><%=res.getString("UILoginForm.label.RememberOnComputer")%></td>
</tr>