Author: dpillot
Date: Mon Aug 20 16:26:02 2007
New Revision: 769
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D769&repname=
=3Dcorporate_portal_templates_v2
Log:
http://www.jahia.net/jira/browse/TEMPLATES-109
added categories right checks on post info
Modified:
branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/entries.inc
Modified: branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/entries.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/src/jsp/blogs/entries.inc&rev=3D769&repname=3Dcorporate_portal_temp=
lates_v2
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/entries.inc (original)
+++ branches/JAHIA-5-0-SP-BRANCH/src/jsp/blogs/entries.inc Mon Aug 20 16:26=
:02 2007
@@ -161,20 +161,24 @@
Set selectedCategories =3D Category.getObjectCategories(Conten=
tContainer.getContainer(entry.getID()).getObjectKey());
Iterator catIter =3D selectedCategories.iterator();
while (catIter.hasNext()) {
- Category curCategory =3D (Category) catIter.next();//Categ=
ory.getCategory(categoryKey,user);
+ Category curCategory =3D (Category) catIter.next();
+ String categoryKey =3D curCategory.getKey();
+ if(Category.getCategory(categoryKey,user)!=3Dnull){
+
categCount++;
if (categCount =3D=3D 1) {
%> <content:resourceBundle resourceBundle=3D"jahiatemp=
lates.Corporate_portal_templates_v2"
- resourceName=3D"blog.in"/> <%
+ resourceName=3D"blog.in"/><%
}
- String categoryTitle =3D curCategory.getTitle(jParams.getL=
ocale());
- String categoryKey =3D curCategory.getKey();
+ String categoryTitle =3D curCategory.getTitle(jParams.getL=
ocale()); =
if (categoryTitle =3D=3D null) {
categoryTitle =3D categoryKey;
}
%><a href=3D"<%=3DbypassUrl%>?category=3D<%=3DcategoryKey%=
>"><%=3DcategoryTitle%></a><%
+
if (catIter.hasNext()){
%>, <%
+ }
}
}
JahiaContainerList comments =3D entry.getContainerList( "comme=
nts" );
@@ -262,12 +266,13 @@
resourceName=3D"blog.the"/> <%=3Dsdf.format( =
(new Date(lowerVal.getTime())) )%>
<%
} else {
- Date creationDate =3D contentPage.getMetadataAsDate("c=
reationDate",jParams);
+ String doc=3DjData.page().getDoc();
+ long tdoc=3DLong.parseLong(doc);
=
%>
=
<content:resourceBundle resourceBundle=3D"jahiatemplat=
es.Corporate_portal_templates_v2"
- resourceName=3D"blog.to"/> <%=3Dsdf.format( c=
reationDate )%><%--<%=3Dsdf.format( (new Date(lowerVal.getTime())) )%>
+ resourceName=3D"blog.to"/> <%=3Dsdf.format( (=
new Date(tdoc)) )%><%--<%=3Dsdf.format( (new Date(lowerVal.getTime())) )%>
<content:resourceBundle resourceBundle=3D"jahiatemplat=
es.Corporate_portal_templates_v2"
resourceName=3D"blog.to"/>
<%=3Dsdf.format( (new Date(upperVal.getTime())) ) %>--=
%>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
