Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
In directory
james.mmbase.org:/tmp/cvs-serv11444/portlets-login/src/java/com/finalist/cmsc/portlets
Modified Files:
Tag: b1_4
LoginPortlet.java
Log Message:
Undo get template from preferences
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets
Index: LoginPortlet.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java,v
retrieving revision 1.5.2.5
retrieving revision 1.5.2.6
diff -u -b -r1.5.2.5 -r1.5.2.6
--- LoginPortlet.java 21 Mar 2008 16:46:23 -0000 1.5.2.5
+++ LoginPortlet.java 25 Mar 2008 15:17:43 -0000 1.5.2.6
@@ -74,9 +74,7 @@
@Override
protected void doView(RenderRequest request, RenderResponse response)
throws PortletException, IOException {
- PortletPreferences preferences = request.getPreferences();
- String template =
preferences.getValue(PortalConstants.CMSC_PORTLET_VIEW_TEMPLATE, null);
- if (template==null) template = "login/login.jsp";
+ String template;
String error = request.getParameter("errormessage");
if (!StringUtils.isBlank(error)) {
@@ -86,8 +84,7 @@
if (Community.isAuthenticated()) {
template = "login/logout.jsp";
} else {
- // take template from preferences
- // template = "login/login.jsp";
+ template = "login/login.jsp";
String action = request.getParameter("action");
if (!StringUtils.isBlank(action) &&
"send_password".equals(action)) {
template = "login/send_password.jsp";
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
