pvollenweider 2005/10/27 11:47:44 CEST
Modified files:
src/jsp/box news.inc
src/jsp/news definitions.inc eventlistener.inc
filters.inc news.jsp
Log:
fix news
Revision Changes Path
1.7 +8 -5 corporate_portal_templates_v2/src/jsp/box/news.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates_v2/src/jsp/box/news.inc.diff?r1=1.6&r2=1.7&f=h
1.4 +1 -1
corporate_portal_templates_v2/src/jsp/news/definitions.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates_v2/src/jsp/news/definitions.inc.diff?r1=1.3&r2=1.4&f=h
1.2 +2 -11
corporate_portal_templates_v2/src/jsp/news/eventlistener.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates_v2/src/jsp/news/eventlistener.inc.diff?r1=1.1&r2=1.2&f=h
1.3 +1 -1 corporate_portal_templates_v2/src/jsp/news/filters.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates_v2/src/jsp/news/filters.inc.diff?r1=1.2&r2=1.3&f=h
1.4 +0 -2 corporate_portal_templates_v2/src/jsp/news/news.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates_v2/src/jsp/news/news.jsp.diff?r1=1.3&r2=1.4&f=h
Index: news.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates_v2/src/jsp/box/news.inc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- news.inc 7 Oct 2005 13:08:22 -0000 1.6
+++ news.inc 27 Oct 2005 09:47:43 -0000 1.7
@@ -43,10 +43,9 @@
filtersVector.add(containerFilter);
}
-// set filter for start/end date
+// set filter for date
if (! isEditMode) {
long now = (new Date()).getTime();
-
ContainerFilterBean dateFilter = new
ContainerFilterBean("date",true,jParams.getEntryLoadRequest());
dateFilter.addClause(ContainerFilterBean.COMP_SMALLER,
String.valueOf(now) );
filtersVector.add(dateFilter);
@@ -68,8 +67,8 @@
}
// sort by date desc
-ContainerSorterBean entries_sort_handler =
- new ContainerSorterBean("news",jParams,"startDate", true);
+ContainerSorterByContainerDefinition entries_sort_handler =
+ new ContainerSorterByContainerDefinition(siteId, "date", "news", true,
entryLoadRequest) ;
entries_sort_handler.setDescOrdering();
request.setAttribute("news_sort_handler",entries_sort_handler);
@@ -78,6 +77,8 @@
if ( newsContainerList !=null && newsContainerList.getID()==0 ) {
ServicesRegistry.getInstance().getJahiaContainersService().
saveContainerListInfo(newsContainerList,
jParams.getContentPage().getAclID());
+} else {
+ logger.debug("newsContainerList exist");
}
logger.debug("Set container list pagination on newsContainerList to " +
windowSize + " (" + pageContext.getAttribute("boxtitle") + ")");
newsContainerList.getDefinition().setProperty("windowSize",windowSize);
@@ -86,14 +87,16 @@
newsContainerList.setIsContainersLoaded(false);
logger.debug("newsContainerList has " + newsContainerList.getFullSize() + "
elements");
Enumeration newsContainers = newsContainerList.getContainers();
+
while (newsContainers.hasMoreElements()) {
JahiaContainer newsContainer = (JahiaContainer)
newsContainers.nextElement();
String newsTitle = newsContainer.getFieldValue("newsTitle","");
String description = newsContainer.getFieldValue("description","");
JahiaPage link = (JahiaPage) newsContainer.getFieldObject( "link" );
+ String newsPageUrl = jParams.composePageUrl(newsContainer.getPageID());
%>
<div class="new">
- <strong><%=newsTitle%></strong><br/>
+ <strong><a
href="<%=newsPageUrl%>?newsContainerId=<%=newsContainer.getID()%>"><%=newsTitle%></strong><br/>
<%=description%>
<%
if (link != null) {
Index: definitions.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates_v2/src/jsp/news/definitions.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- definitions.inc 7 Oct 2005 13:08:23 -0000 1.3
+++ definitions.inc 27 Oct 2005 09:47:44 -0000 1.4
@@ -8,7 +8,7 @@
titleKey="news.title" bundleKey="<%=resBundleID%>"
/>
<content:declareField name="description"
- title="Description" type="SmallText"
+ title="Description" type="BigText"
titleKey="news.description" bundleKey="<%=resBundleID%>"
/>
<content:declareField name="link"
Index: eventlistener.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates_v2/src/jsp/news/eventlistener.inc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- eventlistener.inc 30 Sep 2005 08:48:10 -0000 1.1
+++ eventlistener.inc 27 Oct 2005 09:47:44 -0000 1.2
@@ -2,23 +2,14 @@
if ( "news".equals(theContainer.getDefinition().getName()) ){
if ( "addContainerEngineAfterInit".equals(eventName) ) {
logger.debug("Start eventlistner for event
addContainerEngineAfterInit for news Container List");
- JahiaField theField = theContainer.getField("startDate");
+ JahiaField theField = theContainer.getField("date");
if (theField.getObject() == null) {
Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
long now = cal.getTime().getTime();
String nowStr = String.valueOf(now);
theField.setObject(nowStr);
updatedFields.add(new Integer(theField.getID()));
- logger.debug("Set value for field [startDate] to : [" +
theField.getObject() +"]");
- }
- theField = theContainer.getField("endDate");
- if (theField.getObject() == null) {
- Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
- long max = Long.MAX_VALUE;
- String maxStr = String.valueOf(max);
- theField.setObject(maxStr);
- updatedFields.add(new Integer(theField.getID()));
- logger.debug("Set value for field [endDate] to : [" +
theField.getObject() +"]");
+ logger.debug("Set value for field [date] to : [" +
theField.getObject() +"]");
}
}
}
Index: filters.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates_v2/src/jsp/news/filters.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- filters.inc 7 Oct 2005 13:08:23 -0000 1.2
+++ filters.inc 27 Oct 2005 09:47:44 -0000 1.3
@@ -4,7 +4,7 @@
Vector containerFilterVector = new Vector();
long now = (new Date()).getTime();
-if (! isEditMode) {
+if (! isEditMode) {
ContainerFilterBean dateFilter = new
ContainerFilterBean("date",true,jParams.getEntryLoadRequest());
dateFilter.addClause(ContainerFilterBean.COMP_SMALLER,
String.valueOf(now) );
containerFilterVector.add(dateFilter);
Index: news.jsp
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates_v2/src/jsp/news/news.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- news.jsp 7 Oct 2005 13:08:23 -0000 1.3
+++ news.jsp 27 Oct 2005 09:47:44 -0000 1.4
@@ -36,5 +36,3 @@
</logic:present>
</jahiaHtml:actionMenu>
</content:containerList>
-
-
