You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2009/09/01 23:34:36 UTC
svn commit: r810248 [3/13] - in /ofbiz/branches/executioncontext20090812: ./
applications/accounting/config/ applications/accounting/data/
applications/accounting/data/helpdata/ applications/accounting/documents/
applications/accounting/script/org/ofbi...
Modified: ofbiz/branches/executioncontext20090812/applications/content/data/ContentTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/data/ContentTypeData.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/data/ContentTypeData.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/data/ContentTypeData.xml Tue Sep 1 21:33:41 2009
@@ -62,7 +62,7 @@
<MetaDataPredicate metaDataPredicateId="author-name" description="Name of the author or creator of the subject."/>
<MetaDataPredicate metaDataPredicateId="author-email" description="eMail address of the author or creator of the subject."/>
- <MetaDataPredicate metaDataPredicateId="event-date" description="The date and time the subject event took place, preferably in the descending standard format: [yyyy-MM-dd hh:mm:ss]."/>
+ <MetaDataPredicate metaDataPredicateId="event-date" description="The date and time of the event in format [yyyy-MM-dd hh:mm:ss]."/>
<MetaDataPredicate metaDataPredicateId="event-location" description="The location where subject event took place."/>
<MetaDataPredicate metaDataPredicateId="event-person-name" description="The name of a person involved in the subject event."/>
@@ -261,4 +261,15 @@
<WebSite webSiteId="CONTENT_SITE" siteName="Content Manager" visualThemeSetId="BACKOFFICE"/>
+ <DataResource dataResourceId="DOCBOOK_HTML_TEMPL" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/content/template/docbook/html/docbook.xsl" dataTemplateTypeId="XSLT" statusId="CTNT_IN_PROGRESS" dataResourceName="Help template file" mimeTypeId="text/html" isPublic="Y"/>
+ <DataResource dataResourceId="DOCBOOK_PDF_TEMPL" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/content/template/docbook/fo/docbook.xsl" dataTemplateTypeId="XSLT" statusId="CTNT_IN_PROGRESS" dataResourceName="Help template file" mimeTypeId="text/html" isPublic="Y"/>
+ <DataResource dataResourceId="APACHE_OFBIZ" localeString="en" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/commonext/documents/ApacheOfbiz.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Apache OFBiz document" mimeTypeId="text/xml" isPublic="Y" />
+ <Content contentId="APACHE_OFBIZ_HTML" contentTypeId="DOCUMENT" templateDataResourceId="DOCBOOK_HTML_TEMPL" dataResourceId="APACHE_OFBIZ" localeString="en" statusId="CTNT_IN_PROGRESS" contentName="The general Apache document in one page HTML" mimeTypeId="text/html"/>
+ <Content contentId="APACHE_OFBIZ_PDF" contentTypeId="DOCUMENT" templateDataResourceId="DOCBOOK_PDF_TEMPL" dataResourceId="APACHE_OFBIZ" localeString="en" statusId="CTNT_IN_PROGRESS" contentName="The general Apache document in PDF format" mimeTypeId="application/pdf"/>
+ <DataResource dataResourceId="HELP_ROOT_NL" localeString="nl" dataResourceTypeId="OFBIZ_FILE" objectInfo="applications/content/data/helpdata/HELP_ROOT_NL.xml" dataTemplateTypeId="NONE" statusId="CTNT_IN_PROGRESS" dataResourceName="Help system root" mimeTypeId="text/xml" isPublic="Y" />
+ <Content contentId="DOCUMENTS" contentTypeId="DOCUMENT" contentName="Documents"/>
+ <ContentAssoc contentId="TREE_ROOT" contentIdTo="DOCUMENTS" contentAssocTypeId="TREE_CHILD" fromDate="2006-01-12 01:01:01" sequenceNum=""/>
+ <ContentAssoc contentId="DOCUMENTS" contentIdTo="APACHE_OFBIZ_HTML" contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01" sequenceNum=""/>
+ <ContentAssoc contentId="DOCUMENTS" contentIdTo="APACHE_OFBIZ_PDF" contentAssocTypeId="SUB_CONTENT" fromDate="2006-01-12 01:01:01" sequenceNum=""/>
+
</entity-engine-xml>
Modified: ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/blog/BlogRssServices.java Tue Sep 1 21:33:41 2009
@@ -116,7 +116,8 @@
GenericValue v = (GenericValue) i.next();
String sub = null;
try {
- sub = ContentWorker.renderSubContentAsText(dispatcher, delegator, v.getString("contentId"), mapKey, FastMap.newInstance(), locale, mimeTypeId, true);
+ Map<String, Object> dummy = FastMap.newInstance();
+ sub = ContentWorker.renderSubContentAsText(dispatcher, delegator, v.getString("contentId"), mapKey, dummy, locale, mimeTypeId, true);
} catch (GeneralException e) {
Debug.logError(e, module);
} catch (IOException e) {
Modified: ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/content/ContentWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/content/ContentWorker.java?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/content/ContentWorker.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/content/ContentWorker.java Tue Sep 1 21:33:41 2009
@@ -23,8 +23,6 @@
import java.io.StringWriter;
import java.io.Writer;
import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
@@ -62,6 +60,7 @@
import org.ofbiz.service.LocalDispatcher;
import org.ofbiz.service.ModelService;
import org.ofbiz.service.ServiceUtil;
+import org.ofbiz.webapp.view.ApacheFopWorker;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
@@ -85,24 +84,24 @@
return getCurrentContent(delegator, trail, userLogin, ctx, nullThruDatesOnly, contentAssocPredicateId);
}
- public String getMimeTypeIdExt(GenericDelegator delegator, GenericValue view, Map ctx) {
+ public String getMimeTypeIdExt(GenericDelegator delegator, GenericValue view, Map<String, Object> ctx) {
return getMimeTypeId(delegator, view, ctx);
}
// new rendering methods
- public void renderContentAsTextExt(LocalDispatcher dispatcher, GenericDelegator delegator, String contentId, Appendable out, Map templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException {
+ public void renderContentAsTextExt(LocalDispatcher dispatcher, GenericDelegator delegator, String contentId, Appendable out, Map<String, Object> templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException {
renderContentAsText(dispatcher, delegator, contentId, out, templateContext, locale, mimeTypeId, null, null, cache);
}
- public void renderSubContentAsTextExt(LocalDispatcher dispatcher, GenericDelegator delegator, String contentId, Appendable out, String mapKey, Map templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException {
+ public void renderSubContentAsTextExt(LocalDispatcher dispatcher, GenericDelegator delegator, String contentId, Appendable out, String mapKey, Map<String, Object> templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException {
renderSubContentAsText(dispatcher, delegator, contentId, out, mapKey, templateContext, locale, mimeTypeId, cache);
}
- public String renderSubContentAsTextExt(LocalDispatcher dispatcher, GenericDelegator delegator, String contentId, String mapKey, Map templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException {
+ public String renderSubContentAsTextExt(LocalDispatcher dispatcher, GenericDelegator delegator, String contentId, String mapKey, Map<String, Object> templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException {
return renderSubContentAsText(dispatcher, delegator, contentId, mapKey, templateContext, locale, mimeTypeId, cache);
}
- public String renderContentAsTextExt(LocalDispatcher dispatcher, GenericDelegator delegator, String contentId, Map templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException {
+ public String renderContentAsTextExt(LocalDispatcher dispatcher, GenericDelegator delegator, String contentId, Map<String, Object> templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException {
return renderContentAsText(dispatcher, delegator, contentId, templateContext, locale, mimeTypeId, cache);
}
@@ -156,7 +155,7 @@
// check for alternate content per party
if (partyId != null && roleTypeId != null) {
- List alternateViews = null;
+ List<GenericValue> alternateViews = null;
try {
alternateViews = content.getRelated("ContentAssocDataResourceViewTo", UtilMisc.toMap("caContentAssocTypeId", "ALTERNATE_ROLE"), UtilMisc.toList("-caFromDate"));
} catch (GenericEntityException e) {
@@ -164,9 +163,9 @@
}
alternateViews = EntityUtil.filterByDate(alternateViews, UtilDateTime.nowTimestamp(), "caFromDate", "caThruDate", true);
- Iterator alternateViewIter = alternateViews.iterator();
+ Iterator<GenericValue> alternateViewIter = alternateViews.iterator();
while (alternateViewIter.hasNext()) {
- GenericValue thisView = (GenericValue) alternateViewIter.next();
+ GenericValue thisView = alternateViewIter.next();
GenericValue altContentRole = EntityUtil.getFirst(EntityUtil.filterByDate(thisView.getRelatedByAnd("ContentRole", UtilMisc.toMap("partyId", partyId, "roleTypeId", roleTypeId))));
GenericValue altContent = null;
if (UtilValidate.isNotEmpty(altContentRole)) {
@@ -181,16 +180,16 @@
}
public static void renderContentAsText(LocalDispatcher dispatcher, GenericDelegator delegator, GenericValue content, Appendable out,
- Map templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException {
-
+ Map<String,Object>templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException {
// if the content has a service attached run the service
+
String serviceName = content.getString("serviceName");
if (dispatcher != null && UtilValidate.isNotEmpty(serviceName)) {
DispatchContext dctx = dispatcher.getDispatchContext();
ModelService service = dctx.getModelService(serviceName);
if (service != null) {
- Map serviceCtx = service.makeValid(templateContext, ModelService.IN_PARAM);
- Map serviceRes;
+ Map<String,Object> serviceCtx = service.makeValid(templateContext, ModelService.IN_PARAM);
+ Map<String,Object> serviceRes;
try {
serviceRes = dispatcher.runSync(serviceName, serviceCtx);
} catch (GenericServiceException e) {
@@ -277,18 +276,24 @@
// This part is using an xml file as the input data and an ftl file to present it.
if (UtilValidate.isNotEmpty(mimeType)) {
- if (mimeType.toLowerCase().indexOf("xml") >= 0) {
- StringReader sr = new StringReader(textData);
- try {
- NodeModel nodeModel = NodeModel.parse(new InputSource(sr));
- templateContext.put("doc", nodeModel);
- } catch (SAXException e) {
- throw new GeneralException(e.getMessage());
- } catch (ParserConfigurationException e2) {
- throw new GeneralException(e2.getMessage());
- }
- } else {
- // must be text
+ if (mimeType.toLowerCase().indexOf("xml") >= 0) {
+ GenericValue dataResource = delegator.findByPrimaryKey("DataResource", UtilMisc.toMap("dataResourceId", dataResourceId));
+ GenericValue templateDataResource = delegator.findByPrimaryKey("DataResource", UtilMisc.toMap("dataResourceId", templateDataResourceId));
+ if ("FTL".equals(templateDataResource.getString("dataTemplateTypeId"))) {
+ StringReader sr = new StringReader(textData);
+ try {
+ NodeModel nodeModel = NodeModel.parse(new InputSource(sr));
+ templateContext.put("doc", nodeModel) ;
+ } catch (SAXException e) {
+ throw new GeneralException(e.getMessage());
+ } catch (ParserConfigurationException e2) {
+ throw new GeneralException(e2.getMessage());
+ }
+ } else {
+ templateContext.put("docFile", DataResourceWorker.getContentFile(dataResource.getString("dataResourceTypeId"), dataResource.getString("objectInfo"), (String) templateContext.get("contextRoot")).getAbsoluteFile().toString());
+ }
+ } else {
+ // must be text
templateContext.put("textData", textData);
}
} else {
@@ -301,7 +306,7 @@
}
}
- public static String renderContentAsText(LocalDispatcher dispatcher, GenericDelegator delegator, String contentId, Map templateContext,
+ public static String renderContentAsText(LocalDispatcher dispatcher, GenericDelegator delegator, String contentId, Map<String, Object> templateContext,
Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException {
Writer writer = new StringWriter();
renderContentAsText(dispatcher, delegator, contentId, writer, templateContext, locale, mimeTypeId, null, null, cache);
@@ -309,12 +314,12 @@
}
public static void renderContentAsText(LocalDispatcher dispatcher, GenericDelegator delegator, String contentId, Appendable out,
- Map templateContext, Locale locale, String mimeTypeId, String partyId, String roleTypeId, boolean cache) throws GeneralException, IOException {
+ Map<String, Object> templateContext, Locale locale, String mimeTypeId, String partyId, String roleTypeId, boolean cache) throws GeneralException, IOException {
GenericValue content = ContentWorker.findContentForRendering(delegator, contentId, locale, partyId, roleTypeId, cache);
ContentWorker.renderContentAsText(dispatcher, delegator, content, out, templateContext, locale, mimeTypeId, cache);
}
- public static String renderSubContentAsText(LocalDispatcher dispatcher, GenericDelegator delegator, String contentId, String mapKey, Map templateContext,
+ public static String renderSubContentAsText(LocalDispatcher dispatcher, GenericDelegator delegator, String contentId, String mapKey, Map<String, Object> templateContext,
Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException {
Writer writer = new StringWriter();
renderSubContentAsText(dispatcher, delegator, contentId, writer, mapKey, templateContext, locale, mimeTypeId, cache);
@@ -322,16 +327,16 @@
}
public static void renderSubContentAsText(LocalDispatcher dispatcher, GenericDelegator delegator, String contentId, Appendable out, String mapKey,
- Map templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException {
+ Map<String,Object> templateContext, Locale locale, String mimeTypeId, boolean cache) throws GeneralException, IOException {
// find the sub-content with matching mapKey
- List orderBy = UtilMisc.toList("-fromDate");
- List exprs = UtilMisc.toList(EntityCondition.makeCondition("contentId", EntityOperator.EQUALS, contentId));
+ List<String> orderBy = UtilMisc.toList("-fromDate");
+ List<EntityExpr> exprs = UtilMisc.toList(EntityCondition.makeCondition("contentId", EntityOperator.EQUALS, contentId));
if (UtilValidate.isNotEmpty(mapKey)) {
exprs.add(EntityCondition.makeCondition("mapKey", EntityOperator.EQUALS, mapKey));
}
- List assocs;
+ List<GenericValue> assocs;
assocs = delegator.findList("ContentAssoc", EntityCondition.makeCondition(exprs, EntityOperator.AND), null, orderBy, null, cache);
assocs = EntityUtil.filterByDate(assocs);
GenericValue subContent = EntityUtil.getFirst(assocs);
@@ -355,7 +360,7 @@
String localeStr = locale.toString();
boolean isTwoLetterLocale = localeStr.length() == 2;
- List alternateViews = null;
+ List<GenericValue> alternateViews = null;
try {
alternateViews = view.getRelated("ContentAssocDataResourceViewTo", UtilMisc.toMap("caContentAssocTypeId", "ALTERNATE_LOCALE"), UtilMisc.toList("-caFromDate"));
} catch (GenericEntityException e) {
@@ -364,9 +369,9 @@
}
alternateViews = EntityUtil.filterByDate(alternateViews, UtilDateTime.nowTimestamp(), "caFromDate", "caThruDate", true);
- Iterator alternateViewIter = alternateViews.iterator();
+ Iterator<GenericValue> alternateViewIter = alternateViews.iterator();
while (alternateViewIter.hasNext()) {
- GenericValue thisView = (GenericValue) alternateViewIter.next();
+ GenericValue thisView = alternateViewIter.next();
String currentLocaleString = thisView.getString("localeString");
if (UtilValidate.isEmpty(currentLocaleString)) {
continue;
@@ -407,7 +412,7 @@
return contentAssocDataResourceViewFrom;
}
- public static void traverse(GenericDelegator delegator, GenericValue content, Timestamp fromDate, Timestamp thruDate, Map whenMap, int depthIdx, Map masterNode, String contentAssocTypeId, List pickList, String direction) {
+ public static void traverse(GenericDelegator delegator, GenericValue content, Timestamp fromDate, Timestamp thruDate, Map<String, Object> whenMap, int depthIdx, Map<String, Object> masterNode, String contentAssocTypeId, List<GenericValue> pickList, String direction) {
//String startContentAssocTypeId = null;
String contentTypeId = null;
@@ -418,28 +423,28 @@
}
contentId = (String) content.get("contentId");
contentTypeId = (String) content.get("contentTypeId");
- List topicList = content.getRelatedByAnd("ToContentAssoc", UtilMisc.toMap("contentAssocTypeId", "TOPIC"));
- List topics = FastList.newInstance();
+ List<GenericValue> topicList = content.getRelatedByAnd("ToContentAssoc", UtilMisc.toMap("contentAssocTypeId", "TOPIC"));
+ List<String> topics = FastList.newInstance();
for (int i = 0; i < topicList.size(); i++) {
GenericValue assoc = (GenericValue) topicList.get(i);
- topics.add(assoc.get("contentId"));
+ topics.add(assoc.getString("contentId"));
}
- List keywordList = content.getRelatedByAnd("ToContentAssoc", UtilMisc.toMap("contentAssocTypeId", "KEYWORD"));
- List keywords = FastList.newInstance();
+ List<GenericValue> keywordList = content.getRelatedByAnd("ToContentAssoc", UtilMisc.toMap("contentAssocTypeId", "KEYWORD"));
+ List<String> keywords = FastList.newInstance();
for (int i = 0; i < keywordList.size(); i++) {
GenericValue assoc = (GenericValue) keywordList.get(i);
- keywords.add(assoc.get("contentId"));
+ keywords.add(assoc.getString("contentId"));
}
- List purposeValueList = content.getRelatedCache("ContentPurpose");
- List purposes = FastList.newInstance();
+ List<GenericValue> purposeValueList = content.getRelatedCache("ContentPurpose");
+ List<String> purposes = FastList.newInstance();
for (int i = 0; i < purposeValueList.size(); i++) {
GenericValue purposeValue = (GenericValue) purposeValueList.get(i);
- purposes.add(purposeValue.get("contentPurposeTypeId"));
+ purposes.add(purposeValue.getString("contentPurposeTypeId"));
}
- List contentTypeAncestry = FastList.newInstance();
+ List<GenericValue> contentTypeAncestry = FastList.newInstance();
getContentTypeAncestry(delegator, contentTypeId, contentTypeAncestry);
- Map context = FastMap.newInstance();
+ Map<String, Object> context = FastMap.newInstance();
context.put("content", content);
context.put("contentAssocTypeId", contentAssocTypeId);
//context.put("related", related);
@@ -449,13 +454,13 @@
context.put("typeAncestry", contentTypeAncestry);
boolean isPick = checkWhen(context, (String) whenMap.get("pickWhen"));
boolean isReturnBefore = checkReturnWhen(context, (String) whenMap.get("returnBeforePickWhen"));
- Map thisNode = null;
+ Map<String, Object> thisNode = null;
if (isPick || !isReturnBefore) {
thisNode = FastMap.newInstance();
thisNode.put("contentId", contentId);
thisNode.put("contentTypeId", contentTypeId);
thisNode.put("contentAssocTypeId", contentAssocTypeId);
- List kids = (List) masterNode.get("kids");
+ List<Map<String, Object>> kids = (List) masterNode.get("kids");
if (kids == null) {
kids = FastList.newInstance();
masterNode.put("kids", kids);
@@ -469,9 +474,9 @@
boolean isReturnAfter = checkReturnWhen(context, (String) whenMap.get("returnAfterPickWhen"));
if (!isReturnAfter) {
- List relatedAssocs = getContentAssocsWithId(delegator, contentId, fromDate, thruDate, direction, FastList.newInstance());
- Iterator it = relatedAssocs.iterator();
- Map assocContext = FastMap.newInstance();
+ List<GenericValue> relatedAssocs = getContentAssocsWithId(delegator, contentId, fromDate, thruDate, direction, FastList.newInstance());
+ Iterator<GenericValue> it = relatedAssocs.iterator();
+ Map<String, Object> assocContext = FastMap.newInstance();
assocContext.put("related", relatedAssocs);
while (it.hasNext()) {
GenericValue assocValue = (GenericValue) it.next();
@@ -504,27 +509,27 @@
}
}
- public static boolean traverseSubContent(Map ctx) {
+ public static boolean traverseSubContent(Map<String, Object> ctx) {
boolean inProgress = false;
- List nodeTrail = (List)ctx.get("nodeTrail");
+ List<Map <String, Object>> nodeTrail = (List<Map <String, Object>>)ctx.get("nodeTrail");
ContentWorker.traceNodeTrail("11",nodeTrail);
int sz = nodeTrail.size();
if (sz == 0) {
return false;
}
- Map currentNode = (Map)nodeTrail.get(sz - 1);
+ Map<String, Object> currentNode = (Map<String, Object>)nodeTrail.get(sz - 1);
Boolean isReturnAfter = (Boolean)currentNode.get("isReturnAfter");
if (isReturnAfter != null && isReturnAfter.booleanValue()) {
return false;
}
- List kids = (List)currentNode.get("kids");
+ List<Map <String, Object>> kids = (List<Map <String, Object>>)currentNode.get("kids");
if (UtilValidate.isNotEmpty(kids)) {
int idx = 0;
while (idx < kids.size()) {
- currentNode = (Map)kids.get(idx);
+ currentNode = (Map<String, Object>)kids.get(idx);
ContentWorker.traceNodeTrail("12",nodeTrail);
Boolean isPick = (Boolean)currentNode.get("isPick");
@@ -552,17 +557,17 @@
if (!inProgress) {
// look for next sibling
while (sz > 1) {
- currentNode = (Map)nodeTrail.remove(--sz);
+ currentNode = (Map<String, Object>)nodeTrail.remove(--sz);
ContentWorker.traceNodeTrail("15",nodeTrail);
- Map parentNode = (Map)nodeTrail.get(sz - 1);
- kids = (List)parentNode.get("kids");
+ Map<String, Object> parentNode = (Map<String, Object>) nodeTrail.get(sz - 1);
+ kids = (List<Map <String, Object>>)parentNode.get("kids");
if (kids == null) {
continue;
}
int idx = kids.indexOf(currentNode);
while (idx < (kids.size() - 1)) {
- currentNode = (Map)kids.get(idx + 1);
+ currentNode = (Map<String, Object>)kids.get(idx + 1);
Boolean isFollow = (Boolean)currentNode.get("isFollow");
if (isFollow == null || !isFollow.booleanValue()) {
idx++;
@@ -715,7 +720,7 @@
return isWhen;
}
- public static boolean checkReturnWhen(Map context, String whenStr) {
+ public static boolean checkReturnWhen(Map<String, Object> context, String whenStr) {
boolean isWhen = false; //opposite default from checkWhen
if (whenStr != null && whenStr.length() > 0) {
FlexibleStringExpander fse = FlexibleStringExpander.getInstance(whenStr);
@@ -735,13 +740,13 @@
throws GenericEntityException {
GenericDelegator delegator = currentContent.getDelegator();
- List assocList = getAssociations(currentContent, linkDir, assocTypes, fromDate, thruDate);
+ List<GenericValue> assocList = getAssociations(currentContent, linkDir, assocTypes, fromDate, thruDate);
if (UtilValidate.isEmpty(assocList)) {
return assocList;
}
if (Debug.infoOn()) Debug.logInfo("assocList:" + assocList.size() + " contentId:" + currentContent.getString("contentId"), "");
- List contentList = FastList.newInstance();
+ List<GenericValue> contentList = FastList.newInstance();
String contentIdName = "contentId";
if (linkDir != null && linkDir.equalsIgnoreCase("TO")) {
contentIdName = contentIdName.concat("To");
@@ -749,9 +754,9 @@
GenericValue assoc = null;
GenericValue content = null;
String contentTypeId = null;
- Iterator assocIt = assocList.iterator();
+ Iterator<GenericValue> assocIt = assocList.iterator();
while (assocIt.hasNext()) {
- assoc = (GenericValue) assocIt.next();
+ assoc = assocIt.next();
String contentId = (String) assoc.get(contentIdName);
if (Debug.infoOn()) Debug.logInfo("contentId:" + contentId, "");
content = delegator.findByPrimaryKey("Content", UtilMisc.toMap("contentId", contentId));
@@ -808,7 +813,7 @@
return contentList;
}
- public static List getAssociations(GenericValue currentContent, String linkDir, List assocTypes, String strFromDate, String strThruDate) throws GenericEntityException {
+ public static List<GenericValue> getAssociations(GenericValue currentContent, String linkDir, List<GenericValue> assocTypes, String strFromDate, String strThruDate) throws GenericEntityException {
GenericDelegator delegator = currentContent.getDelegator();
String origContentId = (String) currentContent.get("contentId");
Timestamp fromDate = null;
@@ -819,12 +824,12 @@
if (strThruDate != null) {
thruDate = UtilDateTime.toTimestamp(strThruDate);
}
- List assocs = getContentAssocsWithId(delegator, origContentId, fromDate, thruDate, linkDir, assocTypes);
+ List<GenericValue> assocs = getContentAssocsWithId(delegator, origContentId, fromDate, thruDate, linkDir, assocTypes);
//if (Debug.infoOn()) Debug.logInfo(" origContentId:" + origContentId + " linkDir:" + linkDir + " assocTypes:" + assocTypes, "");
return assocs;
}
- public static List getContentAssocsWithId(GenericDelegator delegator, String contentId, Timestamp fromDate, Timestamp thruDate, String direction, List assocTypes) throws GenericEntityException {
+ public static List<GenericValue> getContentAssocsWithId(GenericDelegator delegator, String contentId, Timestamp fromDate, Timestamp thruDate, String direction, List assocTypes) throws GenericEntityException {
List exprList = FastList.newInstance();
EntityExpr joinExpr = null;
EntityExpr expr = null;
@@ -913,9 +918,9 @@
andMap = UtilMisc.toMap(contentIdField, contentId, "contentAssocTypeId", contentAssocTypeId);
}
try {
- List lst = delegator.findByAndCache("ContentAssoc", andMap);
+ List<GenericValue> lst = delegator.findByAndCache("ContentAssoc", andMap);
//if (Debug.infoOn()) Debug.logInfo("getContentAncestry, lst:" + lst, "");
- List lst2 = EntityUtil.filterByDate(lst);
+ List<GenericValue> lst2 = EntityUtil.filterByDate(lst);
//if (Debug.infoOn()) Debug.logInfo("getContentAncestry, lst2:" + lst2, "");
if (lst2.size() > 0) {
GenericValue contentAssoc = (GenericValue)lst2.get(0);
@@ -942,11 +947,11 @@
if (Debug.infoOn()) Debug.logInfo("getContentAncestry, contentId:" + contentId, "");
Map andMap = UtilMisc.toMap(contentIdField, contentId);
try {
- List lst = delegator.findByAndCache("ContentAssoc", andMap);
+ List<GenericValue> lst = delegator.findByAndCache("ContentAssoc", andMap);
//if (Debug.infoOn()) Debug.logInfo("getContentAncestry, lst:" + lst, "");
- List lst2 = EntityUtil.filterByDate(lst);
+ List<GenericValue> lst2 = EntityUtil.filterByDate(lst);
//if (Debug.infoOn()) Debug.logInfo("getContentAncestry, lst2:" + lst2, "");
- Iterator iter = lst2.iterator();
+ Iterator<GenericValue> iter = lst2.iterator();
while (iter.hasNext()) {
GenericValue contentAssoc = (GenericValue)iter.next();
String contentIdOther = contentAssoc.getString(contentIdOtherField);
@@ -966,15 +971,15 @@
}
}
- public static List getContentAncestryNodeTrail(GenericDelegator delegator, String contentId, String contentAssocTypeId, String direction) throws GenericEntityException {
+ public static List<Map<String, Object>> getContentAncestryNodeTrail(GenericDelegator delegator, String contentId, String contentAssocTypeId, String direction) throws GenericEntityException {
List contentAncestorList = FastList.newInstance();
- List nodeTrail = FastList.newInstance();
+ List<Map<String, Object>> nodeTrail = FastList.newInstance();
getContentAncestry(delegator, contentId, contentAssocTypeId, direction, contentAncestorList);
- Iterator contentAncestorListIter = contentAncestorList.iterator();
+ Iterator<GenericValue> contentAncestorListIter = contentAncestorList.iterator();
while (contentAncestorListIter.hasNext()) {
- GenericValue value = (GenericValue) contentAncestorListIter.next();
- Map thisNode = ContentWorker.makeNode(value);
+ GenericValue value = contentAncestorListIter.next();
+ Map<String, Object> thisNode = ContentWorker.makeNode(value);
nodeTrail.add(thisNode);
}
return nodeTrail;
@@ -1414,7 +1419,7 @@
return val;
}
- public static Map makeNode(GenericValue thisContent) {
+ public static Map<String, Object> makeNode(GenericValue thisContent) {
Map thisNode = null;
if (thisContent == null)
return thisNode;
Modified: ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java Tue Sep 1 21:33:41 2009
@@ -18,6 +18,7 @@
*******************************************************************************/
package org.ofbiz.content.data;
+import java.io.BufferedOutputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -40,7 +41,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import javax.xml.parsers.ParserConfigurationException;
import javolution.util.FastList;
import javolution.util.FastMap;
@@ -49,6 +49,11 @@
import org.apache.commons.fileupload.FileUploadException;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
import org.apache.commons.fileupload.servlet.ServletFileUpload;
+import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.apps.Fop;
+import org.apache.fop.apps.FopFactory;
+import org.apache.fop.apps.MimeConstants;
import org.ofbiz.base.location.FlexibleLocation;
import org.ofbiz.base.util.Debug;
import org.ofbiz.base.util.FileUtil;
@@ -60,8 +65,10 @@
import org.ofbiz.base.util.UtilXml;
import org.ofbiz.base.util.collections.MapStack;
import org.ofbiz.base.util.template.FreeMarkerWorker;
+import org.ofbiz.base.util.template.XslTransform;
import org.ofbiz.common.email.NotificationServices;
import org.ofbiz.content.content.UploadContentAndImage;
+import org.ofbiz.content.content.ContentMapFacade;
import org.ofbiz.entity.GenericDelegator;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
@@ -72,12 +79,28 @@
import org.ofbiz.widget.screen.ScreenFactory;
import org.ofbiz.widget.screen.ScreenRenderer;
import org.ofbiz.widget.screen.ScreenStringRenderer;
-import org.w3c.dom.Document;
-import org.xml.sax.SAXException;
+import org.ofbiz.widget.screen.ScreenFopViewHandler;
+import org.ofbiz.webapp.view.ApacheFopWorker;
+import org.ofbiz.webapp.view.FopRenderer;
import freemarker.template.Template;
import freemarker.template.TemplateException;
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
+
+import com.meterware.httpunit.GetMethodWebRequest;
+
+import javax.xml.transform.Result;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerConfigurationException;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.sax.SAXResult;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.parsers.ParserConfigurationException;
+
/**
* DataResourceWorker Class
*/
@@ -662,6 +685,18 @@
throw new GeneralException("Error rendering FTL template", e);
}
+ } else if ("XSLT".equals(dataTemplateTypeId)) {
+ // get the template data for rendering
+ String templateLocation = DataResourceWorker.getContentFile(dataResource.getString("dataResourceTypeId"), dataResource.getString("objectInfo"), (String) templateContext.get("contextRoot")).toString();
+ // render the XSLT template and file
+ String outDoc = null;
+ try {
+ outDoc = XslTransform.renderTemplate(templateLocation, (String) templateContext.get("docFile"));
+ } catch (TransformerException c) {
+ Debug.logError("XSL TransformerException: " + c.getMessage(), module);
+ }
+ out.append(outDoc);
+
// Screen Widget template
} else if ("SCREEN_COMBINED".equals(dataTemplateTypeId)) {
try {
Modified: ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/src/org/ofbiz/content/survey/SurveyWrapper.java Tue Sep 1 21:33:41 2009
@@ -407,7 +407,8 @@
try {
beganTransaction = TransactionUtil.begin();
- EntityListIterator eli = this.getEli(question);
+ int maxRows = startIndex + number;
+ EntityListIterator eli = this.getEli(question, maxRows);
if (startIndex > 0 && number > 0) {
resp = eli.getPartialList(startIndex, number);
} else {
@@ -545,7 +546,7 @@
// index 1 = total yes
// index 2 = total no
- EntityListIterator eli = this.getEli(question);
+ EntityListIterator eli = this.getEli(question, -1);
if (eli != null) {
GenericValue value;
@@ -592,7 +593,7 @@
try {
beganTransaction = TransactionUtil.begin();
- EntityListIterator eli = this.getEli(question);
+ EntityListIterator eli = this.getEli(question, -1);
if (eli != null) {
GenericValue value;
@@ -681,7 +682,7 @@
try {
beganTransaction = TransactionUtil.begin();
- EntityListIterator eli = this.getEli(question);
+ EntityListIterator eli = this.getEli(question, -1);
if (eli != null) {
GenericValue value;
while (((value = (GenericValue) eli.next()) != null)) {
@@ -729,12 +730,15 @@
EntityCondition.makeCondition("surveyId", EntityOperator.EQUALS, surveyId)), EntityOperator.AND);
}
- private EntityListIterator getEli(GenericValue question) throws GenericEntityException {
+ private EntityListIterator getEli(GenericValue question, int maxRows) throws GenericEntityException {
EntityFindOptions efo = new EntityFindOptions();
efo.setResultSetType(EntityFindOptions.TYPE_SCROLL_INSENSITIVE);
efo.setResultSetConcurrency(EntityFindOptions.CONCUR_READ_ONLY);
efo.setSpecifyTypeAndConcur(true);
efo.setDistinct(false);
+ if (maxRows > 0) {
+ efo.setMaxRows(maxRows);
+ }
EntityListIterator eli = null;
eli = delegator.find("SurveyResponseAndAnswer", makeEliCondition(question), null, null, null, efo);
Modified: ofbiz/branches/executioncontext20090812/applications/content/webapp/content/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/webapp/content/WEB-INF/controller.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/webapp/content/WEB-INF/controller.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/webapp/content/WEB-INF/controller.xml Tue Sep 1 21:33:41 2009
@@ -1791,7 +1791,15 @@
<response name="success" type="request-redirect" value="navigateContent"/>
<response name="error" type="request" value="navigateContent"/>
</request-map>
-
+ <request-map uri="showContent">
+ <security auth="true" https="true"/>
+ <response name="success" type="view" value="showContent"/>
+ </request-map>
+ <request-map uri="showContentPdf">
+ <security auth="true" https="true"/>
+ <response name="success" type="view" value="showContentPdf"/>
+ </request-map>
+
<!-- View Mappings -->
<view-map name="main" type="screen" page="component://content/widget/CommonScreens.xml#main"/>
<view-map name="fonts.fo" type="screenfop" page="component://content/widget/CommonScreens.xml#fonts.fo" content-type="application/pdf" encoding="none"/>
@@ -1957,6 +1965,8 @@
<view-map name="EditDocumentTree" type="screen" page="component://content/widget/content/ContentScreens.xml#EditDocumentTree"/>
<view-map name="EditDocument" type="screen" page="component://content/widget/content/ContentScreens.xml#EditDocument"/>
<view-map name="ListDocument" type="screen" page="component://content/widget/content/ContentScreens.xml#ListDocument"/>
-
+ <view-map name="showContent" type="screen" page="component://content/widget/content/ContentScreens.xml#ShowContent"/>
+ <view-map name="showContentPdf" type="screen" page="component://content/widget/content/ContentScreens.xml#ShowContent" content-type="application/pdf"/>
+
<!-- end of view mappings -->
</site-conf>
Modified: ofbiz/branches/executioncontext20090812/applications/content/webapp/content/cms/CMSForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/webapp/content/cms/CMSForms.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/webapp/content/cms/CMSForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/webapp/content/cms/CMSForms.xml Tue Sep 1 21:33:41 2009
@@ -38,6 +38,8 @@
<service service-name="performFind" result-map-list="listIt">
<field-map field-name="inputFields" from-field="requestParameters"/>
<field-map field-name="entityName" from-field="entityName"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
Modified: ofbiz/branches/executioncontext20090812/applications/content/webapp/content/layout/LayoutForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/webapp/content/layout/LayoutForms.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/webapp/content/layout/LayoutForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/webapp/content/layout/LayoutForms.xml Tue Sep 1 21:33:41 2009
@@ -149,6 +149,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="ContentDataResourceView"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<field name="contentId" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
Modified: ofbiz/branches/executioncontext20090812/applications/content/webapp/content/lookup/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/webapp/content/lookup/LookupForms.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/webapp/content/lookup/LookupForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/webapp/content/lookup/LookupForms.xml Tue Sep 1 21:33:41 2009
@@ -79,6 +79,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="DataResourceContentView"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<field name="replace" widget-style="buttontext" >
Modified: ofbiz/branches/executioncontext20090812/applications/content/webapp/content/survey/SurveyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/webapp/content/survey/SurveyForms.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/webapp/content/survey/SurveyForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/webapp/content/survey/SurveyForms.xml Tue Sep 1 21:33:41 2009
@@ -41,6 +41,8 @@
<service result-map-list="listIt" result-map="result" service-name="performFind">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="Survey"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<auto-fields-entity entity-name="Survey" default-field-type="display"/>
@@ -261,6 +263,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="SurveyResponse"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<auto-fields-entity entity-name="SurveyResponse" default-field-type="display"/>
@@ -288,6 +292,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="Survey"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<auto-fields-entity entity-name="Survey" default-field-type="display"/>
@@ -309,6 +315,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="SurveyResponse"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<auto-fields-entity entity-name="SurveyResponse" default-field-type="display"/>
Modified: ofbiz/branches/executioncontext20090812/applications/content/widget/compdoc/CompDocForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/widget/compdoc/CompDocForms.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/widget/compdoc/CompDocForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/widget/compdoc/CompDocForms.xml Tue Sep 1 21:33:41 2009
@@ -44,6 +44,8 @@
<service service-name="performFind" result-map="results" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="Content"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<field name="contentId"><display/></field>
Modified: ofbiz/branches/executioncontext20090812/applications/content/widget/content/ContentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/widget/content/ContentForms.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/widget/content/ContentForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/widget/content/ContentForms.xml Tue Sep 1 21:33:41 2009
@@ -74,6 +74,8 @@
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="Content"/>
<field-map field-name="orderBy" value="contentId"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
@@ -117,6 +119,8 @@
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="Content"/>
<field-map field-name="orderBy" value="contentId"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<field name="contentId">
@@ -555,19 +559,11 @@
</form>
<form name="ListDocument" target="" type="list" list-name="contentAssoc" paginate-target="navigateContent"
odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
- <row-actions>
- <entity-one entity-name="Content" value-field="content">
- <field-map field-name="contentId" from-field="contentIdTo"/>
- </entity-one>
- <set field="contentTypeId" from-field="content.contentTypeId"/>
- <set field="statusId" from-field="content.statusId"/>
- <entity-one entity-name="DataResource" value-field="dataResource">
- <field-map field-name="dataResourceId" from-field="content.dataResourceId"/>
- </entity-one>
- <set field="mimeTypeId" from-field="dataResource.mimeTypeId"/>
- </row-actions>
- <field name="contentId">
- <hyperlink also-hidden="false" description="${content.contentName} [${content.contentId}]" target="views/ShowDocument?contentId=${content.contentId}"/>
+ <field name="contentId" use-when=""application/pdf".equals(mimeTypeId)">
+ <hyperlink also-hidden="false" description="${contentName} [${contentId}]" target="showContentPdf?contentId=${contentId}" target-window="_blank"/>
+ </field>
+ <field name="contentId" use-when=""text/html".equals(mimeTypeId)">
+ <hyperlink also-hidden="false" description="${contentName} [${contentId}]" target="showContent?contentId=${contentId}" target-window="_blank"/>
</field>
<field name="contentTypeId">
<display-entity entity-name="ContentType" key-field-name="contentTypeId" description="${description}"/>
@@ -578,7 +574,7 @@
<field name="statusId">
<display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/>
</field>
- <field name="createdDate"><display description="${content.createdDate}"/></field>
+ <field name="caCreatedDate"><display/></field>
<field name="delete" title="${uiLabelMap.CommonDelete}">
<hyperlink target="removeDocumentFromTree" description="${uiLabelMap.CommonDelete}">
<parameter param-name="contentId"/>
Modified: ofbiz/branches/executioncontext20090812/applications/content/widget/content/ContentScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/widget/content/ContentScreens.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/widget/content/ContentScreens.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/widget/content/ContentScreens.xml Tue Sep 1 21:33:41 2009
@@ -141,10 +141,8 @@
<property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
<set field="contentIdTo" from-field="parameters.contentIdTo"/>
<set field="contentId" from-field="parameters.contentId"/>
- <entity-condition entity-name="ContentAssoc" list="contentAssoc">
- <condition-list combine="and">
- <condition-expr field-name="contentId" from-field="contentId" operator="equals"/>
- </condition-list>
+ <entity-condition entity-name="ContentAssocViewTo" list="contentAssoc">
+ <condition-expr field-name="contentIdStart" from-field="contentId" operator="equals"/>
</entity-condition>
</actions>
<widgets>
@@ -152,6 +150,26 @@
</widgets>
</section>
</screen>
+ <screen name="ShowContent">
+ <section>
+ <actions>
+ <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/>
+ <property-map resource="CommonExtUiLabels" map-name="uiLabelMap" global="true"/>
+ <set field="contentId" from-field="parameters.contentId" default-value="${contentId}"/>
+ <property-map resource="general" map-name="generalProperties" global="true"/>
+ <set field="defaultVisualThemeId" from-field="generalProperties.defaultVisualThemeId" default-value="SMOOTH_FEATHER"/>
+ <set field="visualThemeId" from-field="userPreferences.VISUAL_THEME" default-value="${defaultVisualThemeId}" global="true"/>
+ <service service-name="getVisualThemeResources">
+ <field-map field-name="visualThemeId"/>
+ <field-map field-name="themeResources" from-field="layoutSettings"/>
+ </service>
+ <set field="layoutSettings" from-field="themeResources" default-value="${layoutSettings}" global="true"/>
+ </actions>
+ <widgets>
+ <content content-id="${contentId}"/>
+ </widgets>
+ </section>
+ </screen>
<screen name="EditDocumentTree">
<section>
<actions>
Modified: ofbiz/branches/executioncontext20090812/applications/content/widget/content/DataResourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/content/widget/content/DataResourceForms.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/content/widget/content/DataResourceForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/content/widget/content/DataResourceForms.xml Tue Sep 1 21:33:41 2009
@@ -73,6 +73,8 @@
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="DataResource"/>
<field-map field-name="orderBy" value="dataResourceId"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<field name="dataResourceId"><hidden/></field>
@@ -131,6 +133,8 @@
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="DataResource"/>
<field-map field-name="orderBy" value="dataResourceId"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<field name="dataResourceId">
@@ -348,6 +352,8 @@
<service service-name="performFind" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" from-field="entityName" value="DataResourceAttribute"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<auto-fields-service service-name="updateDataResourceAttribute" default-field-type="display"/>
@@ -380,6 +386,8 @@
<service service-name="performFind" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" from-field="entityName" value="DataResourceRole"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<auto-fields-service service-name="updateDataResourceRole" default-field-type="display"/>
@@ -409,6 +417,8 @@
<service service-name="performFind" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" from-field="entityName" value="ProductFeatureDataResource"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<auto-fields-entity entity-name="ProductFeatureDataResource" default-field-type="display"/>
Modified: ofbiz/branches/executioncontext20090812/applications/humanres/data/HumanResDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/humanres/data/HumanResDemoData.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/humanres/data/HumanResDemoData.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/humanres/data/HumanResDemoData.xml Tue Sep 1 21:33:41 2009
@@ -20,10 +20,6 @@
<entity-engine-xml>
<Party partyId="DemoEmployee"/><PartyRole partyId="DemoEmployee" roleTypeId="EMPLOYEE"/><!-- data completed by components loaded later -->
- <EmplPositionType emplPositionTypeId="PROGRAMMER" hasTable="N" description="Programmer"/>
- <EmplPositionType emplPositionTypeId="SYS_ADMIN" hasTable="N" description="System Administrator"/>
- <EmplPositionType emplPositionTypeId="BIZ_ANALYST" hasTable="N" description="Business Analyst"/>
- <EmplPositionType emplPositionTypeId="_NA_"/>
<RateAmount rateTypeId="AVERAGE_PAY_RATE" rateCurrencyUomId="USD" periodTypeId="RATE_MONTH" workEffortId="_NA_" partyId="DemoEmployee" emplPositionTypeId="_NA_" fromDate="2000-01-30 17:58:56.038" rateAmount="2300"/>
<RateAmount rateTypeId="AVERAGE_PAY_RATE" rateCurrencyUomId="USD" periodTypeId="RATE_MONTH" workEffortId="_NA_" partyId="_NA_" emplPositionTypeId="PROGRAMMER" fromDate="2000-01-30 17:58:56.038" rateAmount="2000"/>
<EmplPosition emplPositionId="DEMO100" statusId="EMPL_POS_ACTIVE" partyId="Company" emplPositionTypeId="PROGRAMMER" salaryFlag="Y" exemptFlag="Y" fulltimeFlag="Y" temporaryFlag="Y"/>
@@ -31,24 +27,6 @@
<EmplPositionTypeRate emplPositionTypeId="PROGRAMMER" rateTypeId="AVERAGE_PAY_RATE" fromDate="2009-01-30 17:58:56.038"/>
<Employment roleTypeIdFrom="INTERNAL_ORGANIZATIO" roleTypeIdTo="EMPLOYEE" partyIdFrom="Company" partyIdTo="DemoEmployee" fromDate="2000-01-30 17:50:15.767"/>
- <!-- OFBiz Recruitment security -->
- <SecurityGroup groupId="HUMANRES_APPROVER" description="This security group is for those who will approve the internal job posting application."/>
- <SecurityGroup groupId="HUMANRES_EMPLOYEE" description="This security group is for all the employees who want to apply for internal Job Posting."/>
-
- <!-- Recruitment permission -->
- <SecurityPermission description="Approver can update the IJP approval status with this permission." permissionId="HUMANRES_APPROVE"/>
-
- <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="HUMANRES_VIEW"/>
- <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="HUMANRES_CREATE"/>
- <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="PARTYMGR_VIEW"/>
- <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="OFBTOOLS_VIEW"/>
- <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="HUMANRES_UPDATE"/>
- <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="HUMANRES_APPROVE"/>
- <SecurityGroupPermission groupId="HUMANRES_EMPLOYEE" permissionId="HUMANRES_VIEW"/>
- <SecurityGroupPermission groupId="HUMANRES_EMPLOYEE" permissionId="HUMANRES_CREATE"/>
- <SecurityGroupPermission groupId="HUMANRES_EMPLOYEE" permissionId="PARTYMGR_VIEW"/>
- <SecurityGroupPermission groupId="HUMANRES_EMPLOYEE" permissionId="OFBTOOLS_VIEW"/>
-
<Party partyId="DemoApprover" partyTypeId="PERSON"/>
<Person partyId="DemoApprover" firstName="Demo" lastName="Approver"/>
@@ -60,14 +38,4 @@
<UserLoginSecurityGroup groupId="HUMANRES_EMPLOYEE" userLoginId="demoemployee" fromDate="2001-01-01 12:00:00.0"/>
<UserToUserGroupRelationship userLoginId="demoemployee" groupId="OFBIZ_USERS"/>
- <JobInterviewType jobInterviewTypeId="JOB_INTERVW" description="It is a process in which an employee is evaluated by an employer for prospective employment in their company"/>
- <JobInterviewType jobInterviewTypeId="EXIT_INTERVW" description="It is conducted by an employer of a departing employee"/>
- <JobInterviewType jobInterviewTypeId="INFORMAL_INTERVW" description="It is a meeting in which a job seeker asks for advice rather than employment"/>
- <JobInterviewType jobInterviewTypeId="CASE_INTERVW" description="It is an interview in which the applicant is given a question/situation and asked to resolve it"/>
-
- <EnumerationType description="Exam Type" enumTypeId="EXAM_TYPE" hasTable="N" parentTypeId=""/>
- <Enumeration description="Written Aptitude Exam" enumCode="WRITTEN_APT" enumId="EXAM_WRITTEN_APT" sequenceId="01" enumTypeId="EXAM_TYPE"/>
- <Enumeration description="Technical Exam" enumCode="TECHNICAL" enumId="EXAM_TECHNICAL" sequenceId="02" enumTypeId="EXAM_TYPE"/>
- <Enumeration description="Group Discussion" enumCode="GROUP_DISCN" enumId="EXAM_GROUP_DISCN" sequenceId="03" enumTypeId="EXAM_TYPE"/>
-
</entity-engine-xml>
Modified: ofbiz/branches/executioncontext20090812/applications/humanres/data/HumanResTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/humanres/data/HumanResTypeData.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/humanres/data/HumanResTypeData.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/humanres/data/HumanResTypeData.xml Tue Sep 1 21:33:41 2009
@@ -110,4 +110,37 @@
<Enumeration description="Internal Job Posting" enumCode="POSTING_INTR" enumId="JOB_POSTING_INTR" sequenceId="01" enumTypeId="JOB_POSTING"/>
<Enumeration description="External Job Posting" enumCode="POSTING_INTR" enumId="JOB_POSTING_EXTR" sequenceId="02" enumTypeId="JOB_POSTING"/>
+ <EmplPositionType emplPositionTypeId="PROGRAMMER" hasTable="N" description="Programmer"/>
+ <EmplPositionType emplPositionTypeId="SYS_ADMIN" hasTable="N" description="System Administrator"/>
+ <EmplPositionType emplPositionTypeId="BIZ_ANALYST" hasTable="N" description="Business Analyst"/>
+ <EmplPositionType emplPositionTypeId="_NA_"/>
+
+ <!-- OFBiz Recruitment security -->
+ <SecurityGroup groupId="HUMANRES_APPROVER" description="This security group is for those who will approve the internal job posting application."/>
+ <SecurityGroup groupId="HUMANRES_EMPLOYEE" description="This security group is for all the employees who want to apply for internal Job Posting."/>
+
+ <!-- Recruitment permission -->
+ <SecurityPermission description="Approver can update the IJP approval status with this permission." permissionId="HUMANRES_APPROVE"/>
+
+ <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="HUMANRES_VIEW"/>
+ <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="HUMANRES_CREATE"/>
+ <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="PARTYMGR_VIEW"/>
+ <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="OFBTOOLS_VIEW"/>
+ <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="HUMANRES_UPDATE"/>
+ <SecurityGroupPermission groupId="HUMANRES_APPROVER" permissionId="HUMANRES_APPROVE"/>
+ <SecurityGroupPermission groupId="HUMANRES_EMPLOYEE" permissionId="HUMANRES_VIEW"/>
+ <SecurityGroupPermission groupId="HUMANRES_EMPLOYEE" permissionId="HUMANRES_CREATE"/>
+ <SecurityGroupPermission groupId="HUMANRES_EMPLOYEE" permissionId="PARTYMGR_VIEW"/>
+ <SecurityGroupPermission groupId="HUMANRES_EMPLOYEE" permissionId="OFBTOOLS_VIEW"/>
+
+ <JobInterviewType jobInterviewTypeId="JOB_INTERVW" description="It is a process in which an employee is evaluated by an employer for prospective employment in their company"/>
+ <JobInterviewType jobInterviewTypeId="EXIT_INTERVW" description="It is conducted by an employer of a departing employee"/>
+ <JobInterviewType jobInterviewTypeId="INFORMAL_INTERVW" description="It is a meeting in which a job seeker asks for advice rather than employment"/>
+ <JobInterviewType jobInterviewTypeId="CASE_INTERVW" description="It is an interview in which the applicant is given a question/situation and asked to resolve it"/>
+
+ <EnumerationType description="Exam Type" enumTypeId="EXAM_TYPE" hasTable="N" parentTypeId=""/>
+ <Enumeration description="Written Aptitude Exam" enumCode="WRITTEN_APT" enumId="EXAM_WRITTEN_APT" sequenceId="01" enumTypeId="EXAM_TYPE"/>
+ <Enumeration description="Technical Exam" enumCode="TECHNICAL" enumId="EXAM_TECHNICAL" sequenceId="02" enumTypeId="EXAM_TYPE"/>
+ <Enumeration description="Group Discussion" enumCode="GROUP_DISCN" enumId="EXAM_GROUP_DISCN" sequenceId="03" enumTypeId="EXAM_TYPE"/>
+
</entity-engine-xml>
Modified: ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/EmplLeaveForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/EmplLeaveForms.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/EmplLeaveForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/EmplLeaveForms.xml Tue Sep 1 21:33:41 2009
@@ -39,6 +39,8 @@
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="EmplLeave"/>
<field-map field-name="orderBy" value="fromDate"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
<set field="insideEmployee" from-field="parameters.insideEmployee"/>
</actions>
Modified: ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/EmplPositionForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/EmplPositionForms.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/EmplPositionForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/EmplPositionForms.xml Tue Sep 1 21:33:41 2009
@@ -27,6 +27,8 @@
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="EmplPosition"/>
<field-map field-name="orderBy" value="emplPositionId"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<auto-fields-entity entity-name="EmplPosition" default-field-type="display"/>
Modified: ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/EmploymentAppForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/EmploymentAppForms.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/EmploymentAppForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/EmploymentAppForms.xml Tue Sep 1 21:33:41 2009
@@ -29,6 +29,8 @@
<field-map field-name="inputFields" from-field="employmentAppCtx"/>
<field-map field-name="entityName" value="EmploymentApp"/>
<field-map field-name="orderBy" value="applicationId"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
<set field="insideEmployee" from-field="parameters.insideEmployee"/>
</actions>
Modified: ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/EmploymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/EmploymentForms.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/EmploymentForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/EmploymentForms.xml Tue Sep 1 21:33:41 2009
@@ -53,6 +53,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="employmentCtx"/>
<field-map field-name="entityName" value="EmploymentAndPerson"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<field name="partyIdFrom" title="${uiLabelMap.HumanResEmploymentPartyIdFrom}"><display></display></field>
@@ -83,6 +85,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="employmentCtx"/>
<field-map field-name="entityName" value="Employment"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<field name="partyIdFrom" title="${uiLabelMap.HumanResEmploymentPartyIdFrom}"><display></display></field>
Modified: ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/GlobalHRSettingForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/GlobalHRSettingForms.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/GlobalHRSettingForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/GlobalHRSettingForms.xml Tue Sep 1 21:33:41 2009
@@ -105,6 +105,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="emplPositionTypeCtx"/>
<field-map field-name="entityName" value="EmplPositionType"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<auto-fields-service service-name="updateEmplPositionType" default-field-type="hidden"/>
Modified: ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/LookupForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/LookupForms.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/LookupForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/LookupForms.xml Tue Sep 1 21:33:41 2009
@@ -39,6 +39,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="Budget"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<auto-fields-entity entity-name="Budget" default-field-type="display"/>
@@ -65,6 +67,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="BudgetItem"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<auto-fields-entity entity-name="BudgetItem" default-field-type="display"/>
@@ -98,6 +102,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="EmplPosition"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<field name="emplPositionId" widget-style="buttontext">
@@ -122,6 +128,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="TerminationReason"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<field name="terminationReasonId" widget-style="buttontext">
@@ -142,6 +150,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="SalaryStep"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<field name="salaryStepSeqId" title="${uiLabelMap.HumanResLookupSalaryStepSeqId}" widget-style="buttontext">
@@ -162,6 +172,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="PayGrade"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<field name="payGradeId" widget-style="buttontext">
@@ -182,6 +194,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="PayrollPreference"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<field name="payrollPreferenceSeqId" title="${uiLabelMap.HumanResLookupPayrollPreferenceSeqId}" widget-style="buttontext">
@@ -202,6 +216,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="UnemploymentClaim"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<field name="unemploymentClaimId" widget-style="buttontext">
@@ -222,6 +238,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="AgreementEmploymentAppl"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<field name="agreementItemSeqId" widget-style="buttontext">
@@ -242,6 +260,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="PerfReview"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<field name="perfReviewId" widget-style="buttontext">
@@ -262,6 +282,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="PartyResume"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<field name="resumeId" widget-style="buttontext">
@@ -282,6 +304,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="EmploymentApp"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<field name="applicationId" widget-style="buttontext">
@@ -316,6 +340,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="JobRequisition"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<field name="jobRequisitionId" widget-style="buttontext">
@@ -338,6 +364,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="TrainingClassType"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<field name="trainingClassTypeId" title="${uiLabelMap.HumanResTrainingClassType}" widget-style="buttontext">
Modified: ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/PartyQualForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/PartyQualForms.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/PartyQualForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/PartyQualForms.xml Tue Sep 1 21:33:41 2009
@@ -56,6 +56,8 @@
<field-map field-name="inputFields" from-field="partyQualCtx"/>
<field-map field-name="entityName" value="PartyQual"/>
<field-map field-name="orderBy" value="fromDate"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
<set field="insideEmployee" from-field="parameters.insideEmployee"/>
</actions>
Modified: ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/PartyResumeForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/PartyResumeForms.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/PartyResumeForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/PartyResumeForms.xml Tue Sep 1 21:33:41 2009
@@ -35,6 +35,8 @@
<field-map field-name="inputFields" from-field="partyResumeCtx"/>
<field-map field-name="entityName" value="PartyResume"/>
<field-map field-name="orderBy" value="resumeId"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<auto-fields-entity entity-name="PartyResume" default-field-type="display"/>
Modified: ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/PayGradeForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/PayGradeForms.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/PayGradeForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/PayGradeForms.xml Tue Sep 1 21:33:41 2009
@@ -33,6 +33,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="payGradeCtx"/>
<field-map field-name="entityName" value="PayGrade"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<auto-fields-service default-field-type="display" service-name="updatePayGrade"/>
Modified: ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/PerfReviewForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/PerfReviewForms.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/PerfReviewForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/PerfReviewForms.xml Tue Sep 1 21:33:41 2009
@@ -39,6 +39,8 @@
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="PerfReview"/>
<field-map field-name="orderBy" value="perfReviewId"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<auto-fields-entity entity-name="PerfReview" default-field-type="display"/>
Modified: ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/PersonTrainingForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/PersonTrainingForms.xml?rev=810248&r1=810247&r2=810248&view=diff
==============================================================================
--- ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/PersonTrainingForms.xml (original)
+++ ofbiz/branches/executioncontext20090812/applications/humanres/widget/forms/PersonTrainingForms.xml Tue Sep 1 21:33:41 2009
@@ -68,6 +68,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="PersonTraining"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<auto-fields-entity entity-name="PersonTraining" default-field-type="hidden"/>
@@ -102,6 +104,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="PersonTraining"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<auto-fields-entity entity-name="PersonTraining" default-field-type="display"/>
@@ -168,6 +172,8 @@
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" value="PersonTraining"/>
+ <field-map field-name="viewIndex" from-field="viewIndex"/>
+ <field-map field-name="viewSize" from-field="viewSize"/>
</service>
</actions>
<auto-fields-entity entity-name="PersonTraining" default-field-type="display"/>