JBoss Portal SVN: r12425 - branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin.
by portal-commits@lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-01-02 19:50:20 -0500 (Fri, 02 Jan 2009)
New Revision: 12425
Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
Log:
JBPORTAL-2150 - null pointer exception raise when clicking a langue
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2009-01-03 00:38:03 UTC (rev 12424)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2009-01-03 00:50:20 UTC (rev 12425)
@@ -175,7 +175,19 @@
if (contentList.size() > 0)
{
Content content = (Content)contentList.get(0);
+
+ boolean hasPublishedContent = false;
+ for (int i = 0; i < contentList.size(); i++) // cycle thru list of version nodes
+ {
+ Content version = (Content)contentList.get(i);
+ if (!version.isWaitingForPublishApproval())
+ {
+ hasPublishedContent = true;
+ break;
+ }
+ }
%>
+<%if(hasPublishedContent){%>
<tr>
<td height="15"></td>
</tr>
@@ -325,6 +337,7 @@
<td><%= version.getTitle() %>
</td>
</tr>
+<%}%>
<%
}
}
17 years, 4 months
JBoss Portal SVN: r12424 - branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin.
by portal-commits@lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-01-02 19:38:03 -0500 (Fri, 02 Jan 2009)
New Revision: 12424
Modified:
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
Log:
JBPORTAL-2150 - null pointer exception raise when clicking a langue
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2009-01-03 00:09:10 UTC (rev 12423)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/viewfile.jsp 2009-01-03 00:38:03 UTC (rev 12424)
@@ -175,7 +175,19 @@
if (contentList.size() > 0)
{
Content content = (Content)contentList.get(0);
+
+ boolean hasPublishedContent = false;
+ for (int i = 0; i < contentList.size(); i++) // cycle thru list of version nodes
+ {
+ Content version = (Content)contentList.get(i);
+ if (!version.isWaitingForPublishApproval())
+ {
+ hasPublishedContent = true;
+ break;
+ }
+ }
%>
+<%if(hasPublishedContent){%>
<tr>
<td height="15"></td>
</tr>
@@ -325,6 +337,7 @@
<td><%= version.getTitle() %>
</td>
</tr>
+<%}%>
<%
}
}
17 years, 4 months
JBoss Portal SVN: r12423 - branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin.
by portal-commits@lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-01-02 19:09:10 -0500 (Fri, 02 Jan 2009)
New Revision: 12423
Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp
Log:
JBPORTAL-2151 - WYSIWYG not working in preview with files with no content
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2009-01-01 20:48:31 UTC (rev 12422)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/pending_items.jsp 2009-01-03 00:09:10 UTC (rev 12423)
@@ -94,9 +94,12 @@
<!-- Preview of Content being approved -->
<%
String pendingPreviewContent = (String)request.getAttribute("pendingPreviewContent");
- String contentBeingPreviewed = "-1";
+ String contentBeingPreviewed = "-1";
+ if(pendingPreviewContent == null)
+ {
+ pendingPreviewContent = "";
+ }
%>
-<%if(pendingPreviewContent != null && pendingPreviewContent.trim().length() >0){%>
<%
String pid = request.getParameter("pid");
String path = request.getParameter("path");
@@ -177,7 +180,6 @@
</form>
</div>
<br/></br>
-<%}%>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
17 years, 4 months