cmailleux 2005/11/23 17:15:42 CET
Modified files:
src/view/jsp/include doc.inc page_categories_list.inc
src/view/jsp document_detail.jsp eventlistener.jsp
Log:
Use metadata in document listing
Revision Changes Path
1.5 +8 -54
corporate_portal_templates/src/view/jsp/document_detail.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/document_detail.jsp.diff?r1=1.4&r2=1.5&f=h
1.9 +1 -124 corporate_portal_templates/src/view/jsp/eventlistener.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/eventlistener.jsp.diff?r1=1.8&r2=1.9&f=h
1.13 +2 -14 corporate_portal_templates/src/view/jsp/include/doc.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/doc.inc.diff?r1=1.12&r2=1.13&f=h
1.4 +0 -0
corporate_portal_templates/src/view/jsp/include/page_categories_list.inc
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/corporate_portal_templates/src/view/jsp/include/page_categories_list.inc.diff?r1=1.3&r2=1.4&f=h
Index: doc.inc
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/include/doc.inc,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- doc.inc 7 Oct 2005 08:39:30 -0000 1.12
+++ doc.inc 23 Nov 2005 16:15:41 -0000 1.13
@@ -1,4 +1,3 @@
-<%@ page import = "org.jahia.bin.Jahia" %>
<%// flush cache after 5 sec.
long cacheExpirationDelay = 5000; // [ms]
jParams.setCacheExpirationDelay(cacheExpirationDelay);
@@ -34,24 +33,13 @@
jData.containers().declareField( "directoryShortDocDescription",
ResourceBundleMarker.drawMarker(resBundleID, "description","Description"),
FieldTypes.SMALLTEXT, "" );
jData.containers().declareField( "directoryDocType",
ResourceBundleMarker.drawMarker(resBundleID, "type","Type"),
FieldTypes.SMALLTEXT_SHARED_LANG, "<jahia_multivalue_single[" +
typeValues.toString() + "]>None" );
jData.containers().declareField( "directoryDocSource", "Source",
FieldTypes.SMALLTEXT_SHARED_LANG, "<jahia_multivalue_single[" +
sourceValues.toString() + "]>None" );
-jData.containers().declareField( "metaDataCreationDate", "Creation Date",
FieldTypes.DATE, "<jahia_calendar[dd.MM.yyyy / HH:mm]>" );
-jData.containers().declareField( "metaDataPublishingDate", "Publishing
Date", FieldTypes.DATE, "<jahia_calendar[dd.MM.yyyy / HH:mm]>" );
-jData.containers().declareField( "metaDataLastModificationDate", "Last
Modification Date", FieldTypes.DATE, "<jahia_calendar[dd.MM.yyyy / HH:mm]>" );
-jData.containers().declareField( "metaDataCreator", "Creator",
FieldTypes.SMALLTEXT_SHARED_LANG, "" );
-jData.containers().declareField( "metaDataPublisher", "Publisher",
FieldTypes.SMALLTEXT_SHARED_LANG, "" );
-jData.containers().declareField( "metaDataLastContributor", "Last
Contributor", FieldTypes.SMALLTEXT_SHARED_LANG, "" );
+
Vector directoryDocFields = new Vector();
directoryDocFields.add( "directoryDocPage" );
directoryDocFields.add( "directoryShortDocDescription" );
directoryDocFields.add( "directoryDocSource" );
directoryDocFields.add( "directoryDocType" );
-directoryDocFields.add( "metaDataCreationDate" );
-directoryDocFields.add( "metaDataPublishingDate" );
-directoryDocFields.add( "metaDataLastModificationDate" );
-directoryDocFields.add( "metaDataCreator" );
-directoryDocFields.add( "metaDataPublisher" );
-directoryDocFields.add( "metaDataLastContributor" );
jData.containers().declareContainer( "directoryDocContainer", "Doc
container", directoryDocFields );
JahiaContainerList containerList = jData.containers().getContainerList(
"directoryDocContainer" );
@@ -185,7 +173,7 @@
String directoryDocSourceKey =
(String)directoryDocContainer.getFieldValue("directoryDocSource");
- String metaDataLastModificationDate =
directoryDocContainer.getFieldValue("metaDataLastModificationDate","");
+ String metaDataLastModificationDate =
directoryDocContainer.getContentContainer().getMetadataValue("lastModificationDate",jParams,""+System.currentTimeMillis());
%>
<tr class="boxEPcontentcolor1">
<td valign="top">
Index: document_detail.jsp
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/document_detail.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- document_detail.jsp 26 Aug 2005 15:13:55 -0000 1.4
+++ document_detail.jsp 23 Nov 2005 16:15:42 -0000 1.5
@@ -11,52 +11,16 @@
String templatesPath = jParams.settings().getJspContext() + "templates/"
+
jParams.getSite().getSiteKey() + "/corporate_portal_templates/";
-jData.containers().declareFieldDefProp("metaDataCreationDate",
-
JahiaFieldDefinitionProperties.FIELD_UPDATE_JSP_FILE_PROP,
- templatesPath + "metadata_dates.jsp");
-
-jData.containers().declareFieldDefProp("metaDataPublishingDate",
-
JahiaFieldDefinitionProperties.FIELD_UPDATE_JSP_FILE_PROP,
- templatesPath + "metadata_dates.jsp");
-
-jData.containers().declareFieldDefProp("metaDataLastModificationDate",
-
JahiaFieldDefinitionProperties.FIELD_UPDATE_JSP_FILE_PROP,
- templatesPath + "metadata_dates.jsp");
-
-jData.containers().declareFieldDefProp("metaDataCreator",
-
JahiaFieldDefinitionProperties.FIELD_UPDATE_JSP_FILE_PROP,
- templatesPath + "metadata_users.jsp");
-
-jData.containers().declareFieldDefProp("metaDataPublisher",
-
JahiaFieldDefinitionProperties.FIELD_UPDATE_JSP_FILE_PROP,
- templatesPath + "metadata_users.jsp");
-
-jData.containers().declareFieldDefProp("metaDataLastContributor",
-
JahiaFieldDefinitionProperties.FIELD_UPDATE_JSP_FILE_PROP,
- templatesPath + "metadata_users.jsp");
-
jData.containers().declareField( "directoryDocPage",
ResourceBundleMarker.drawMarker(resBundleID, "docPage","Doc page"),
FieldTypes.PAGE, "" );
jData.containers().declareField( "directoryShortDocDescription",
ResourceBundleMarker.drawMarker(resBundleID, "description","Description"),
FieldTypes.SMALLTEXT, "" );
jData.containers().declareField( "directoryDocType",
ResourceBundleMarker.drawMarker(resBundleID, "type","Type"),
FieldTypes.SMALLTEXT_SHARED_LANG, "<jahia_multivalue_single[" +
typeValues.toString() + "]>None" );
jData.containers().declareField( "directoryDocSource", "Source",
FieldTypes.SMALLTEXT_SHARED_LANG, "<jahia_multivalue_single[" +
sourceValues.toString() + "]>None" );
-jData.containers().declareField( "metaDataCreationDate", "Creation Date",
FieldTypes.DATE, "<jahia_calendar[dd.mm.yyyy]>" );
-jData.containers().declareField( "metaDataPublishingDate", "Publishing
Date", FieldTypes.DATE, "<jahia_calendar[dd.mm.yyyy]>" );
-jData.containers().declareField( "metaDataLastModificationDate", "Last
Modification Date", FieldTypes.DATE, "<jahia_calendar[dd.mm.yyyy]>" );
-jData.containers().declareField( "metaDataCreator", "Creator",
FieldTypes.SMALLTEXT_SHARED_LANG, "" );
-jData.containers().declareField( "metaDataPublisher", "Publisher",
FieldTypes.SMALLTEXT_SHARED_LANG, "" );
-jData.containers().declareField( "metaDataLastContributor", "Last
Contributor", FieldTypes.SMALLTEXT_SHARED_LANG, "" );
Vector directoryDocFields = new Vector();
directoryDocFields.add( "directoryDocPage" );
directoryDocFields.add( "directoryShortDocDescription" );
directoryDocFields.add( "directoryDocSource" );
directoryDocFields.add( "directoryDocType" );
-directoryDocFields.add( "metaDataCreationDate" );
-directoryDocFields.add( "metaDataPublishingDate" );
-directoryDocFields.add( "metaDataLastModificationDate" );
-directoryDocFields.add( "metaDataCreator" );
-directoryDocFields.add( "metaDataPublisher" );
-directoryDocFields.add( "metaDataLastContributor" );
jData.containers().declareContainer( "directoryDocContainer", "Doc
container", directoryDocFields );%>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
@@ -86,13 +50,11 @@
pageContext.setAttribute("directoryDocSource",directoryDocSource);
String directoryShortDocDescription =
jc.getFieldValue("directoryShortDocDescription","",true , jData.params());
pageContext.setAttribute("directoryShortDocDescription",directoryShortDocDescription);
+ String creationDate =
jc.getContentContainer().getMetadataValue("creationDate",jParams,""+System.currentTimeMillis());
+ String creator =
jc.getContentContainer().getMetadataValue("creator",jParams,""+System.currentTimeMillis());
+ String lastContributor =
jc.getContentContainer().getMetadataValue("lastContributor",jParams,""+System.currentTimeMillis());
+ String lastModificationDate =
jc.getContentContainer().getMetadataValue("lastModificationDate",jParams,""+System.currentTimeMillis());
%>
- <bean:define id="metaDataCreationDate"
name="parentContainerBean" property="field(metaDataCreationDate).value"/>
- <bean:define id="metaDataPublishingDate"
name="parentContainerBean" property="field(metaDataPublishingDate).value"/>
- <bean:define id="metaDataLastModificationDate"
name="parentContainerBean"
property="field(metaDataLastModificationDate).value"/>
- <bean:define id="metaDataCreator"
name="parentContainerBean" property="field(metaDataCreator).value"/>
- <bean:define id="metaDataPublisher"
name="parentContainerBean" property="field(metaDataPublisher).value"/>
- <bean:define id="metaDataLastContributor"
name="parentContainerBean" property="field(metaDataLastContributor).value"/>
<H1><%=jData.page().getTitle()%></H1>
<jahiaHtml:actionMenu name="parentContainerBean"
namePostFix="" resourceBundle="jahiatemplates.Corporate_portal_templates">
@@ -113,26 +75,18 @@
<td class="EPMetaDataTitle">:</td>
<td class="EPMetaDataValue"><bean:write
name="directoryDocSource" filter="false"/></td></tr>
</logic:notEmpty>
- <logic:notEmpty name="metaDataCreationDate">
<tr><td
class="EPMetaDataTitle"><%=getResourceBundle("docCreationDate","docCreationDate",jData)%></td>
<td class="EPMetaDataTitle">:</td>
- <td class="EPMetaDataValue"><bean:write
name="metaDataCreationDate" filter="false"/></td></tr>
- </logic:notEmpty>
- <logic:notEmpty name="metaDataCreator">
+ <td
class="EPMetaDataValue"><%=creationDate%></td></tr>
<tr><td
class="EPMetaDataTitle"><%=getResourceBundle("docCreatorLbl","docCreatorLbl",jData)%></td>
<td class="EPMetaDataTitle">:</td>
- <td class="EPMetaDataValue"><bean:write
name="metaDataCreator" filter="false"/></td></tr>
- </logic:notEmpty>
- <logic:notEmpty name="metaDataLastModificationDate">
+ <td class="EPMetaDataValue"><%=creator%></td></tr>
<tr><td
class="EPMetaDataTitle"><%=getResourceBundle("docLastModDate","docLastModDate",jData)%></td>
<td class="EPMetaDataTitle">:</td>
- <td class="EPMetaDataValue"><bean:write
name="metaDataLastModificationDate" filter="false"/></td></tr>
- </logic:notEmpty>
- <logic:notEmpty name="metaDataLastContributor">
+ <td
class="EPMetaDataValue"><%=lastModificationDate%></td></tr>
<tr><td
class="EPMetaDataTitle"><%=getResourceBundle("docModifLabel","docModifLabel",jData)%></td>
<td class="EPMetaDataTitle">:</td>
- <td class="EPMetaDataValue"><bean:write
name="metaDataLastContributor" filter="false"/></td></tr>
- </logic:notEmpty>
+ <td
class="EPMetaDataValue"><%=lastContributor%></td></tr>
<tr><td
class="EPMetaDataTitle"><%=getResourceBundle("docListCatLabel","docListCatLabel",jData)%></td><td
class="EPMetaDataTitle">:</td>
<td><%@ include
file="include/page_categories_list.inc"%></td></tr></table></td></tr></table>
</jahiaHtml:actionMenu><%}}%>
Index: eventlistener.jsp
===================================================================
RCS file:
/home/cvs/repository/corporate_portal_templates/src/view/jsp/eventlistener.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- eventlistener.jsp 11 Jul 2005 15:00:15 -0000 1.8
+++ eventlistener.jsp 23 Nov 2005 16:15:42 -0000 1.9
@@ -259,11 +259,6 @@
pageBean.sharedTitle(true);
pageBeans.put("directoryDocPage", pageBean);
-
- creator = jParams.getUser().getUsername();
- Date d = new java.util.Date();
- creationDate = String.valueOf(d.getTime());
- lastContributor = jParams.getUser().getUsername();
}
} else {
@@ -315,71 +310,8 @@
cContainer.getJahiaContainer(jParams,
jParams.getEntryLoadRequest());
- JahiaField jField =
jContainer.getField("metaDataCreator");
+ JahiaField jField;
String fieldValue = "";
- if ( jField != null && jField.getValue() !=
null){
- fieldValue = jField.getValue().trim();
- }
- if ( !"".equals(fieldValue) ){
- creator = fieldValue;
- }
-
- jField =
jContainer.getField("metaDataCreationDate");
- fieldValue = "";
- if ( jField != null && jField.getObject() !=
null){
- fieldValue =
((String)jField.getObject()).trim();
- }
- if ( !"".equals(fieldValue) ){
- creationDate = fieldValue;
- }
-
- jField =
jContainer.getField("metaDataLastContributor");
- fieldValue = "";
- if ( jField != null && jField.getValue() !=
null){
- fieldValue = jField.getValue().trim();
- }
- if ( !"".equals(fieldValue) ){
- lastContributor = fieldValue;
- }
-
- jField =
jContainer.getField("metaDataLastModificationDate");
- fieldValue = "";
- if ( jField != null && jField.getObject() !=
null){
- fieldValue =
((String)jField.getObject()).trim();
- }
- if ( !"".equals(fieldValue) ){
- // we want to set the last modification date
field
- jField =
theContainer.getField("metaDataLastModificationDate");
- jField.setObject(fieldValue);
- feh.addUpdatedField(jField.getID(),
jField.getLanguageCode());
- updatedFields.add(new
Integer(jField.getID()));
- }
-
- jField =
jContainer.getField("metaDataPublishingDate");
- fieldValue = "";
- if ( jField != null && jField.getObject() !=
null){
- fieldValue =
((String)jField.getObject()).trim();
- }
- if ( !"".equals(fieldValue) ){
- // we want to set the last publishing date
- jField =
theContainer.getField("metaDataPublishingDate");
- jField.setObject(fieldValue);
- feh.addUpdatedField(jField.getID(),
jField.getLanguageCode());
- updatedFields.add(new
Integer(jField.getID()));
- }
-
- jField =
jContainer.getField("metaDataPublisher");
- fieldValue = "";
- if ( jField != null && jField.getValue() !=
null){
- fieldValue = jField.getValue().trim();
- }
- if ( !"".equals(fieldValue) ){
- // we want to set the last publisher
- jField =
theContainer.getField("metaDataPublisher");
- jField.setValue(fieldValue);
- feh.addUpdatedField(jField.getID(),
jField.getLanguageCode());
- updatedFields.add(new
Integer(jField.getID()));
- }
jField = jContainer.getField("directoryDocType");
fieldValue = "";
@@ -452,39 +384,7 @@
}
}
- // we want to init the creator field
- if ( creator != null ){
- theField = theContainer.getField("metaDataCreator");
- theField.setValue(creator);
- feh.addUpdatedField(theField.getID(),
theField.getLanguageCode());
- updatedFields.add(new Integer(theField.getID()));
- }
-
- // we want to init the creation date field
- if ( creationDate != null ){
- Date d = new java.util.Date();
- theField = theContainer.getField("metaDataCreationDate");
- theField.setObject(creationDate);
- feh.addUpdatedField(theField.getID(),
theField.getLanguageCode());
- updatedFields.add(new Integer(theField.getID()));
- }
- // we want set the last contributor field
- if ( lastContributor != null ){
- theField = theContainer.getField("metaDataLastContributor");
- theField.setValue(lastContributor);
- feh.addUpdatedField(theField.getID(),
theField.getLanguageCode());
- updatedFields.add(new Integer(theField.getID()));
- }
-
- theField = theContainer.getField("metaDataLastModificationDate");
- feh.addUpdatedField(theField.getID(),
theField.getLanguageCode());
- theField = theContainer.getField("metaDataLastContributor");
- feh.addUpdatedField(theField.getID(),
theField.getLanguageCode());
- theField = theContainer.getField("metaDataPublishingDate");
- feh.addUpdatedField(theField.getID(),
theField.getLanguageCode());
- theField = theContainer.getField("metaDataPublisher");
- feh.addUpdatedField(theField.getID(),
theField.getLanguageCode());
} else if ( "addContainerEngineBeforeSave".equals(eventName) ) {
// we want set the page title
@@ -500,29 +400,6 @@
pageBeans.put("directoryDocPage", pageBean);
}
}
- } else if ( "containerAdded".equals(eventName) ||
"containerUpdated".equals(eventName) ){
-
- // we want to set the last modification date field
- JahiaField theField =
theContainer.getField("metaDataLastModificationDate");
- theField.setObject(String.valueOf(jahiaEvent.getEventTime()));
- theField.save(jParams);
-
- // we want set the last contributor field
- theField = theContainer.getField("metaDataLastContributor");
- theField.setValue(jParams.getUser().getUsername());
- theField.save(jParams);
-
- // we want to create a staged entry for the field
"metaDataPublishingDate"
- // to have it activated
- theField = theContainer.getField("metaDataPublishingDate");
- theField.setObject(theField.getValue());
- theField.save(jParams);
-
- // we want to create a staged entry for the field
"metaDataPublisher"
- // to have it activated
- theField = theContainer.getField("metaDataPublisher");
- theField.setValue(theField.getValue());
- theField.save(jParams);
}
}
}
