portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r830440 - /portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui-portlet.jsp
Date Wed, 28 Oct 2009 04:42:30 GMT
Author: taylor
Date: Wed Oct 28 04:42:29 2009
New Revision: 830440

URL: http://svn.apache.org/viewvc?rev=830440&view=rev
Log:
https://issues.apache.org/jira/browse/JS2-1057
improve error checking

Modified:
    portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui-portlet.jsp

Modified: portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui-portlet.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui-portlet.jsp?rev=830440&r1=830439&r2=830440&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui-portlet.jsp
(original)
+++ portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui-portlet.jsp
Wed Oct 28 04:42:29 2009
@@ -30,12 +30,15 @@
 <%
 	String content = (String)request.getAttribute("content");
 	String pageDec = (String)request.getAttribute("pageDec");
-	ContentFragment fragment = (ContentFragment)request.getAttribute("fragment");	
+	ContentFragment fragment = (ContentFragment)request.getAttribute("fragment");
+	String title = "";
+	if (fragment.getPortletContent() != null)
+	    title = fragment.getPortletContent().getTitle();
 %>
 	<div class="portal-layout-cell portal-layout-cell-OneColumn-1-0" id="<%=fragment.getId()%>"
name="<%=fragment.getName()%>">
 		<div class="portlet <%=pageDec%>">
 		    <div class="PTitle" >
-	          <div class="PTitleContent"><%=fragment.getPortletContent().getTitle()%></div>
+	          <div class="PTitleContent"><%=title%></div>
 		  	    <div class="PActionBar">
 <%
 				    for(DecoratorAction action : (List<DecoratorAction>)fragment.getDecoration().getActions())



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message