pvollenweider 2005/04/07 18:27:53 CEST
Modified files: (Branch: JAHIA-4-1-BRANCH)
src/view/jsp blog.jsp
src/view/jsp/include blog_declarations.inc blog_entry.inc
blog_filters.inc
Log:
Add category filter
Revision Changes Path
1.1.2.9 +18 -0 corporate_portal_templates/src/view/jsp/blog.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/blog.jsp.diff?r1=1.1.2.8&r2=1.1.2.9&f=h
1.1.2.2 +7 -0
corporate_portal_templates/src/view/jsp/include/blog_declarations.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/blog_declarations.inc.diff?r1=1.1.2.1&r2=1.1.2.2&f=h
1.1.2.4 +1 -1
corporate_portal_templates/src/view/jsp/include/blog_entry.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/blog_entry.inc.diff?r1=1.1.2.3&r2=1.1.2.4&f=h
1.1.2.2 +48 -41
corporate_portal_templates/src/view/jsp/include/blog_filters.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/blog_filters.inc.diff?r1=1.1.2.1&r2=1.1.2.2&f=h
Index: blog.jsp
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/Attic/blog.jsp,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -r1.1.2.8 -r1.1.2.9
--- blog.jsp 7 Apr 2005 15:56:13 -0000 1.1.2.8
+++ blog.jsp 7 Apr 2005 16:27:53 -0000 1.1.2.9
@@ -15,6 +15,24 @@
<td width="100%" valign="top">
<h1><%@ include file="include/page_title.inc"%></h1>
<div class="blog">
+ <%
+ if (requestedCategory != null) {
+ try {
+ Category curCategory =
Category.getCategory(requestedCategory);
+ if (curCategory != null) {
+ String categoryTitle =
curCategory.getTitle(jParams.getLocale());
+ if (categoryTitle == null) {
+ categoryTitle = requestedCategory;
+ }
+ %><h2>Category <%=categoryTitle%></h2><%
+ } else {
+ logger.debug("Category is null for categoryKey
["+requestedCategory+"]");
+ }
+ } catch (JahiaException je) {
+ logger.debug("Could not get category with key [" +
requestedCategory +"]");
+ }
+ }
+ %>
<dl class="previously">
<%
if (blogId != -1) {
Index: blog_declarations.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/Attic/blog_declarations.inc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- blog_declarations.inc 7 Apr 2005 13:55:17 -0000 1.1.2.1
+++ blog_declarations.inc 7 Apr 2005 16:27:53 -0000 1.1.2.2
@@ -197,6 +197,13 @@
blogId = blogIdInteger.intValue();
}
}
+String requestedCategory = request.getParameter("category");
+if (requestedCategory != null) {
+ blogId = -1;
+ session.removeAttribute(currentPageId + "_blogId");
+}
+
+
logger.debug("blogId is [" + blogId +"]");
String range = request.getParameter("range");
if (range == null) {
Index: blog_entry.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/Attic/blog_entry.inc,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- blog_entry.inc 7 Apr 2005 15:56:13 -0000 1.1.2.3
+++ blog_entry.inc 7 Apr 2005 16:27:53 -0000 1.1.2.4
@@ -130,7 +130,7 @@
</tr>
</table>
<input type="hidden" name="addComment" value="Submit"/>
- <input type="hidden" name="commentDate" value="<%=(new
GregorianCalendar()).getTimeInMillis()%>"/>
+ <input type="hidden" name="commentDate"
value="<%=System.currentTimeMillis()%>"/>
</form>
</div>
Index: blog_filters.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/Attic/blog_filters.inc,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- blog_filters.inc 7 Apr 2005 13:55:17 -0000 1.1.2.1
+++ blog_filters.inc 7 Apr 2005 16:27:53 -0000 1.1.2.2
@@ -3,48 +3,55 @@
Vector containerFilterVector = new Vector();
-// add filter on field date
-
-// Adding equality comparison with selected values
-Calendar cal = Calendar.getInstance();
-cal.setTimeZone(TimeZone.getTimeZone("UTC"));
-cal.setTime(new Date(t));
-
-cal.set( Calendar.HOUR_OF_DAY, 0 );
-cal.set( Calendar.MINUTE, 0);
-cal.set( Calendar.SECOND, -1);
-
-if ("week".equals(range)){
- cal.set( Calendar.DAY_OF_WEEK, Calendar.MONDAY);
-}
-if ("month".equals(range)){
- cal.set( Calendar.DAY_OF_MONTH, 1);
-}
-if ("year".equals(range)){
- cal.set( Calendar.DAY_OF_YEAR, 1);
-}
-Date lowerVal = cal.getTime();
-cal.add( Calendar.HOUR_OF_DAY, 24 );
-if ("week".equals(range)){
- cal.add( Calendar.HOUR_OF_DAY, 24*6 );
+if (requestedCategory != null) {
+ ContainerFilterBean categoryFilter =
+ new ContainerFilterBean("categories", false, true,
jParams.getEntryLoadRequest());
+ categoryFilter.addClause(ContainerFilterBean.COMP_EQUAL,
requestedCategory );
+ containerFilterVector.add(categoryFilter);
+} else {
+
+ // add filter on field date
+
+ // Adding equality comparison with selected values
+ Calendar cal = Calendar.getInstance();
+ cal.setTimeZone(TimeZone.getTimeZone("UTC"));
+ cal.setTime(new Date(t));
+
+ cal.set( Calendar.HOUR_OF_DAY, 0 );
+ cal.set( Calendar.MINUTE, 0);
+ cal.set( Calendar.SECOND, -1);
+
+ if ("week".equals(range)){
+ cal.set( Calendar.DAY_OF_WEEK, Calendar.MONDAY);
+ }
+ if ("month".equals(range)){
+ cal.set( Calendar.DAY_OF_MONTH, 1);
+ }
+ if ("year".equals(range)){
+ cal.set( Calendar.DAY_OF_YEAR, 1);
+ }
+ Date lowerVal = cal.getTime();
+ cal.add( Calendar.HOUR_OF_DAY, 24 );
+ if ("week".equals(range)){
+ cal.add( Calendar.HOUR_OF_DAY, 24*6 );
+ }
+ if ("month".equals(range)){
+ cal.add( Calendar.MONTH, 1 );
+ }
+ if ("year".equals(range)){
+ cal.add( Calendar.YEAR, 1 );
+ }
+ Date upperVal = cal.getTime();
+
+ logger.debug("Filter from " + sdf.format( (new Date(lowerVal.getTime()))
) + " to " +
+ sdf.format( (new Date(upperVal.getTime())) ));
+ ContainerFilterBean dateFilter = new
ContainerFilterBean("date",true,jParams.getEntryLoadRequest());
+ dateFilter.addClause(ContainerFilterBean.COMP_SMALLER,
String.valueOf(upperVal.getTime()) );
+ containerFilterVector.add(dateFilter);
+ dateFilter = new
ContainerFilterBean("date",true,jParams.getEntryLoadRequest());
+ dateFilter.addClause(ContainerFilterBean.COMP_BIGGER,
String.valueOf(lowerVal.getTime()) );
+ containerFilterVector.add(dateFilter);
}
-if ("month".equals(range)){
- cal.add( Calendar.MONTH, 1 );
-}
-if ("year".equals(range)){
- cal.add( Calendar.YEAR, 1 );
-}
-Date upperVal = cal.getTime();
-
-logger.debug("Filter from " + sdf.format( (new Date(lowerVal.getTime())) ) +
" to " +
- sdf.format( (new Date(upperVal.getTime())) ));
-ContainerFilterBean dateFilter = new
ContainerFilterBean("date",true,jParams.getEntryLoadRequest());
-dateFilter.addClause(ContainerFilterBean.COMP_SMALLER,
String.valueOf(upperVal.getTime()) );
-containerFilterVector.add(dateFilter);
-dateFilter = new
ContainerFilterBean("date",true,jParams.getEntryLoadRequest());
-dateFilter.addClause(ContainerFilterBean.COMP_BIGGER,
String.valueOf(lowerVal.getTime()) );
-containerFilterVector.add(dateFilter);
-
if ( containerFilterVector.size()>0 ) {
ContainerFilters containerFilters = new
ContainerFilters(containerFilterVector,jParams.getSiteID(),"entries");
request.setAttribute("entries_filter_handler",containerFilters);
