[OFBiz] SVN: r6898 - in trunk/applications/content: data script/org/ofbiz/content/compdoc webapp/content/WEB-INF widget widget/compdoc
byersa@svn.ofbiz.org
byersa at svn.ofbiz.org
Fri Mar 3 03:58:28 CST 2006
Author: byersa
Date: 2006-03-03 03:58:19 -0600 (Fri, 03 Mar 2006)
New Revision: 6898
Modified:
trunk/applications/content/data/CompDocData.xml
trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml
trunk/applications/content/webapp/content/WEB-INF/controller.xml
trunk/applications/content/widget/CommonScreens.xml
trunk/applications/content/widget/compdoc/CompDocForms.xml
trunk/applications/content/widget/compdoc/CompDocMenus.xml
trunk/applications/content/widget/compdoc/CompDocScreens.xml
trunk/applications/content/widget/compdoc/CompDocTemplateTree.xml
Log:
Some more fixes in the course of testing ContentApprovals.
Modified: trunk/applications/content/data/CompDocData.xml
===================================================================
--- trunk/applications/content/data/CompDocData.xml 2006-03-03 07:05:00 UTC (rev 6897)
+++ trunk/applications/content/data/CompDocData.xml 2006-03-03 09:58:19 UTC (rev 6898)
@@ -26,6 +26,7 @@
<Content contentId="CDT0211" contentTypeId="COMPDOC_TEMPLATE" ownerContentId="" contentName="2J Placeholder (CDT Root/Sub-Root)" description=""/>
+ <!--
<Content contentId="CDT1121" contentTypeId="TEMPLATE" contentName="Receive letter of inquiry" description="" ownerContentId="" />
<Content contentId="CDT1122" contentTypeId="TEMPLATE" contentName="POA Contract" description="" ownerContentId="" />
<Content contentId="CDT1123" contentTypeId="TEMPLATE" contentName="Personal Profile" description="" ownerContentId="" />
@@ -38,7 +39,7 @@
<ContentAssoc contentIdTo="CDT1201" contentId="CDT1124" contentAssocTypeId="COMPDOC_PART" fromDate="2006-01-12 01:01:01"/>
<ContentAssoc contentIdTo="CDT1201" contentId="CDT1125" contentAssocTypeId="COMPDOC_PART" fromDate="2006-01-12 01:01:01"/>
<ContentAssoc contentIdTo="CDT1201" contentId="CDT1126" contentAssocTypeId="COMPDOC_PART" fromDate="2006-01-12 01:01:01"/>
-
+ -->
<Content contentId="CDT1101" contentTypeId="TEMPLATE" contentName="Letter of inquiry" description="" ownerContentId=""/>
<Content contentId="CDT1102" contentTypeId="TEMPLATE" contentName="POA Contract" description="" ownerContentId="" />
@@ -108,10 +109,12 @@
<ContentRevisionItem contentId="CDT1201" contentRevisionSeqId="000002" itemContentId="CDT1116"/>
<ContentRevision contentId="CDT1201" contentRevisionSeqId="000013"/>
+ <!--
<ContentRevisionItem contentId="CDT1201" contentRevisionSeqId="000013" itemContentId="CDT1121"/>
<ContentRevisionItem contentId="CDT1201" contentRevisionSeqId="000013" itemContentId="CDT1122"/>
<ContentRevisionItem contentId="CDT1201" contentRevisionSeqId="000013" itemContentId="CDT1123"/>
<ContentRevisionItem contentId="CDT1201" contentRevisionSeqId="000013" itemContentId="CDT1124"/>
+ -->
<ContentRevision contentId="CDT1201" contentRevisionSeqId="000004"/>
<ContentRevisionItem contentId="CDT1201" contentRevisionSeqId="000004" itemContentId="CDT1102" oldDataResourceId="DR1102a" newDataResourceId="DR1102b" />
Modified: trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml
===================================================================
--- trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml 2006-03-03 07:05:00 UTC (rev 6897)
+++ trunk/applications/content/script/org/ofbiz/content/compdoc/CompDocServices.xml 2006-03-03 09:58:19 UTC (rev 6898)
@@ -943,12 +943,15 @@
</iterate>
<log level="info" message="roles: ${roles}"/>
- <!-- find approvals belonging to user -->
+ <!-- find approvals belonging to roles that the user has or to the user -->
<entity-condition entity-name="MaxContentApprovalView" list-name="compdocApprovalList" use-cache="false">
<condition-list>
<condition-expr field-name="contentRevisionSeqId" env-name="parameters.contentRevisionSeqId" operator="less-equals" ignore-if-empty="true"/>
<condition-expr field-name="contentTypeId" operator="equals" value="COMPDOC_INSTANCE"/>
- <condition-expr field-name="roleTypeId" operator="in" env-name="roles"/>
+ <condition-list combine="or">
+ <condition-expr field-name="partyId" operator="equals" env-name="partyId"/>
+ <condition-expr field-name="roleTypeId" operator="in" env-name="roles"/>
+ </condition-list>
</condition-list>
<select-field field-name="contentId"/>
<select-field field-name="contentTypeId"/>
@@ -983,10 +986,6 @@
<entity-condition entity-name="ContentApproval" list-name="contentApprovalList">
<condition-list combine="and">
<condition-expr field-name="contentApprovalId" operator="in" env-name="contentApprovalIdList"/>
- <condition-list combine="or">
- <condition-expr field-name="partyId" operator="equals" env-name="partyId"/>
- <condition-expr field-name="roleTypeId" operator="in" env-name="roles"/>
- </condition-list>
</condition-list>
</entity-condition>
<log level="info" message="contentApprovalList: ${contentApprovalList}"/>
Modified: trunk/applications/content/webapp/content/WEB-INF/controller.xml
===================================================================
--- trunk/applications/content/webapp/content/WEB-INF/controller.xml 2006-03-03 07:05:00 UTC (rev 6897)
+++ trunk/applications/content/webapp/content/WEB-INF/controller.xml 2006-03-03 09:58:19 UTC (rev 6898)
@@ -934,6 +934,12 @@
<request-map uri="updateContentApproval">
<security auth="true" https="true"/>
<event invoke="updateContentApproval" path="" type="service"/>
+ <response name="success" type="view" value="EditContentApproval"/>
+ <response name="error" type="view" value="EditContentApproval"/>
+ </request-map>
+ <request-map uri="updateContentApprovalStatus">
+ <security auth="true" https="true"/>
+ <event invoke="updateContentApproval" path="" type="service"/>
<response name="success" type="view" value="ListContentApproval"/>
<response name="error" type="view" value="ListContentApproval"/>
</request-map>
Modified: trunk/applications/content/widget/CommonScreens.xml
===================================================================
--- trunk/applications/content/widget/CommonScreens.xml 2006-03-03 07:05:00 UTC (rev 6897)
+++ trunk/applications/content/widget/CommonScreens.xml 2006-03-03 09:58:19 UTC (rev 6898)
@@ -86,20 +86,6 @@
<section>
<actions>
<set field="headerItem" value="CompDoc"/>
- <!--
- <entity-one entity-name="Content" value-name="content" use-cache="true"/>
- <set from-field="contentTypeId" default-value="${content.contentTypeId}" field="contentTypeId" global="true"/>
- <set from-field="contentId" default-value="${content.contentId}" field="contentId" global="true"/>
- <set from-field="contentId" field="rootContentId"/>
- <entity-condition entity-name="ContentRevision" list-name="contentRevisions" use-cache="true">
- <condition-list combine="and">
- <condition-expr field-name="contentId" env-name="parameters.contentId" operator="equals"/>
- <condition-expr field-name="contentRevisionSeqId" env-name="parameters.contentRevisionSeqId" operator="less-equals" ignore-if-empty="true"/>
- </condition-list>
- <order-by field-name="-contentRevisionSeqId"/>
- </entity-condition>
- <set from-field="parameters.contentRevisionSeqId" default-value="${contentRevisions[0].contentRevisionSeqId}" field="contentRevisionSeqId" global="true"/>
- -->
</actions>
<widgets>
<decorator-screen name="mainContentDecorator" >
Modified: trunk/applications/content/widget/compdoc/CompDocForms.xml
===================================================================
--- trunk/applications/content/widget/compdoc/CompDocForms.xml 2006-03-03 07:05:00 UTC (rev 6897)
+++ trunk/applications/content/widget/compdoc/CompDocForms.xml 2006-03-03 09:58:19 UTC (rev 6898)
@@ -124,7 +124,10 @@
<field name="create" title=" " widget-style="buttontext">
<hyperlink also-hidden="false" description="[Create]" target="EditContentRevision?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootContentId=${rootContentId}&rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
</field>
- <field name="tree" title=" " widget-style="buttontext">
+ <field name="tree" title=" " widget-style="buttontext" use-when="contentTypeId.equals("COMPDOC_INSTANCE")">
+ <hyperlink also-hidden="false" description="[Tree]" target="ViewCompDocInstanceTree?rootContentId=${contentId}&rootContentRevisionSeqId=${contentRevisionSeqId}"/>
+ </field>
+ <field name="tree" title=" " widget-style="buttontext" use-when="contentTypeId.equals("COMPDOC_TEMPLATE")">
<hyperlink also-hidden="false" description="[Tree]" target="ViewCompDocTemplateTree?rootContentId=${contentId}&rootContentRevisionSeqId=${contentRevisionSeqId}"/>
</field>
</form>
@@ -219,10 +222,11 @@
</form>
<form name="ListContentApproval" default-title-style="tableheadtext" default-tooltip-style="tabletext"
- target="updateContentApproval"
+ target="updateContentApprovalStatus"
list-name="contentApprovalList" default-widget-style="tabletext" title="" type="list">
<field name="contentApprovalId" widget-style="tabletext"><display/></field>
<field name="contentId"><hidden/></field>
+ <field name="rootContentId" map-name="empty"><hidden/></field>
<field name="contentRevisionSeqId"><display/></field>
<field name="partyId"><display/></field>
<field name="roleTypeId">
Modified: trunk/applications/content/widget/compdoc/CompDocMenus.xml
===================================================================
--- trunk/applications/content/widget/compdoc/CompDocMenus.xml 2006-03-03 07:05:00 UTC (rev 6897)
+++ trunk/applications/content/widget/compdoc/CompDocMenus.xml 2006-03-03 09:58:19 UTC (rev 6898)
@@ -216,13 +216,13 @@
<condition>
<not><if-empty field-name="assocRevisionItemView"/></not>
</condition>
- <link target="EditCompDoc?contentId=${assocRevisionItemView.contentId}&caContentIdTo=${assocRevisionItemView.contentIdTo}&caContentAssocTypeId=${assocRevisionItemView.contentAssocTypeId}&caFromDate=${assocRevisionItemView.fromDate}&contentRevisionSeqId=${assocRevisionItemView.maxRevisionSeqId}"/>
+ <link target="EditCompDoc?contentId=${assocRevisionItemView.contentId}&caContentIdTo=${assocRevisionItemView.contentIdTo}&caContentAssocTypeId=${assocRevisionItemView.contentAssocTypeId}&caFromDate=${assocRevisionItemView.fromDate}&contentRevisionSeqId=${assocRevisionItemView.maxRevisionSeqId}&rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
</menu-item>
<menu-item name="edit-link" title="Edit" >
<condition>
<not><if-empty field-name="assocRevisionItemView"/></not>
</condition>
- <link target="EditChildCompDoc?contentId=${assocRevisionItemView.contentId}&caContentIdTo=${assocRevisionItemView.contentIdTo}&caContentAssocTypeId=${assocRevisionItemView.contentAssocTypeId}&caFromDate=${assocRevisionItemView.fromDate}&contentRevisionSeqId=${assocRevisionItemView.maxRevisionSeqId}"/>
+ <link target="EditChildCompDoc?contentId=${assocRevisionItemView.contentId}&caContentIdTo=${assocRevisionItemView.contentIdTo}&caContentAssocTypeId=${assocRevisionItemView.contentAssocTypeId}&caFromDate=${assocRevisionItemView.fromDate}&contentRevisionSeqId=${assocRevisionItemView.maxRevisionSeqId}&rootContentRevisionSeqId=${rootContentRevisionSeqId}"/>
</menu-item>
<menu-item name="edit-inplace-add" title="${contentName}[${assocRevisionItemView.itemContentId}]" >
@@ -242,7 +242,7 @@
<condition>
<not><if-empty field-name="assocRevisionItemView"/></not>
</condition>
- <link target="GenContentPdf?contentId=${assocRevisionItemView.contentId}"/>
+ <link target="GenContentPdf?contentId=${assocRevisionItemView.contentId}&caSequenceNum=${sequenceNum}"/>
</menu-item>
</menu>
@@ -255,10 +255,10 @@
selected-menuitem-context-field-name="currentMenuItemName"
title="" type="simple">
<menu-item name="edit-inplace" title="${instanceContent.contentName}[${instanceContent.contentId}]" widget-style="head2">
- <link target="EditRootCompDoc?contentId=${instanceContentId}&contentRevisionSeqId=${instanceContentRevisionSeqId}"/>
+ <link target="EditRootCompDoc?rootContentId=${rootContentId}&contentRevisionSeqId=${rootContentRevisionSeqId}"/>
</menu-item>
<menu-item name="edit" title="[Edit]" >
- <link target="EditRootCompDoc?contentId=${instanceContentId}&contentRevisionSeqId=${instanceContentRevisionSeqId}"/>
+ <link target="EditRootCompDoc?rootContentId=${rootContentId}&contentRevisionSeqId=${rootContentRevisionSeqId}"/>
</menu-item>
<menu-item name="viewtree" title="View Template Tree">
<link target="ViewCompDocTemplateTree?rootContentRevisionSeqId=${templateContentRevisionSeqId}&rootContentId=${templateContentId}"/>
Modified: trunk/applications/content/widget/compdoc/CompDocScreens.xml
===================================================================
--- trunk/applications/content/widget/compdoc/CompDocScreens.xml 2006-03-03 07:05:00 UTC (rev 6897)
+++ trunk/applications/content/widget/compdoc/CompDocScreens.xml 2006-03-03 09:58:19 UTC (rev 6898)
@@ -25,10 +25,10 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
- <set from-field="parameters.rootContentId" field="rootContentId" />
- <set from-field="parameters.rootContentRevisionSeqId" field="rootContentRevisionSeqId" />
- <set from-field="parameters.rootContentId" field="contentId" />
- <set from-field="parameters.rootContentRevisionSeqId" field="contentRevisionSeqId" />
+ <set from-field="parameters.rootContentId" default-value="${parameters.contentId}" field="rootContentId" />
+ <set from-field="parameters.rootContentRevisionSeqId" default-value="${parameters.contentRevisionSeqId}" field="rootContentRevisionSeqId" />
+ <set from-field="parameters.rootContentId" default-value="${parameters.contentId}" field="contentId" />
+ <set from-field="parameters.rootContentRevisionSeqId" default-value="${parameters.contentRevisionSeqId}" field="contentRevisionSeqId" />
<set field="menuName" value="tree"/>
<set field="currentMenuItemName" value="approval"/>
<set field="menuName" value="tree"/>
@@ -63,6 +63,12 @@
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
</condition>
<actions>
+ <set from-field="parameters.rootContentId" default-value="${parameters.contentId}" field="rootContentId" />
+ <set from-field="parameters.rootContentRevisionSeqId" default-value="${parameters.contentRevisionSeqId}" field="rootContentRevisionSeqId" />
+ <set from-field="parameters.rootContentId" default-value="${parameters.contentId}" field="contentId" />
+ <set from-field="parameters.rootContentRevisionSeqId" default-value="${parameters.contentRevisionSeqId}" field="contentRevisionSeqId" />
+ <entity-one entity-name="Content" value-name="content" use-cache="true"/>
+ <set from-field="content.contentTypeId" field="contentTypeId" />
<set field="menuName" value="empty"/>
<set field="currentMenuItemName" value="approval"/>
<set field="title" value="Waiting Content Approvals"/>
@@ -320,7 +326,7 @@
<widgets>
<decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
<decorator-section name="body">
- <container><link target="AddRootCompDocTemplate?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootTemplateContentId=${rootTemplateContentId}&rootTemplateRevSeqId=${rootTemplateRevSeqId}&rootInstanceContentId=${rootInstanceContentId}&rootInstanceRevSeqId=${rootInstanceRevSeqId}" text="Create New Root CompDoc Template" style="buttontext"/></container>
+ <container><link target="AddRootCompDocTemplate?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}" text="Create New Root CompDoc Template" style="buttontext"/></container>
<include-form name="ListCompDocInstances" location="component://content/widget/compdoc/CompDocForms.xml"/>
</decorator-section>
</decorator-screen>
@@ -359,13 +365,13 @@
</condition>
<actions>
<set field="title" value="Edit CompDoc Template [${rootContentId}]"/>
- <set from-field="parameters.contentRevisionSeqId" default-value="${parameters.rootTemplateRevSeqId}" field="rootTemplateRevSeqId"/>
+ <set from-field="parameters.contentRevisionSeqId" default-value="${parameters.rootContentRevisionSeqId}" field="rootContentRevisionSeqId"/>
</actions>
<widgets>
<decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
<decorator-section name="body">
<container>
- <link target="AddRootCompDocInstance?contentId=${rootTemplateContentId}&contentRevisionSeqId=${contentRevisionSeqId}" text="Create Instance of This Template" style="buttontext"/>
+ <link target="AddRootCompDocInstance?contentId=${rootContentId}&contentRevisionSeqId=${rootContentRevisionSeqId}" text="Create Instance of This Template" style="buttontext"/>
<link target="ViewInstances?rootContentId=${rootContentId}&contentRevisionSeqId=${rootContentRevisionSeqId}"/>
</container>
<include-form name="EditRootCompDocTemplate" location="component://content/widget/compdoc/CompDocForms.xml"/>
@@ -378,8 +384,8 @@
<if-compare field-name="content.contentTypeId" operator="equals" value="COMPDOC_INSTANCE"/>
</condition>
<actions>
- <set field="title" value="Edit CompDoc Instance [${parameters.contentId}]"/>
- <set from-field="parameters.contentRevisionSeqId" default-value="${parameters.rootInstanceRevSeqId}" field="rootInstanceRevSeqId"/>
+ <set field="title" value="Edit CompDoc Instance [${rootContentId}]"/>
+ <set from-field="parameters.contentRevisionSeqId" default-value="${parameters.rootContentRevisionSeqId}" field="rootContentRevisionSeqId"/>
</actions>
<widgets>
<decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
@@ -404,6 +410,7 @@
<set from-field="parameters.contentId" field="itemContentId"/>
<set from-field="parameters.caContentIdTo" default-value="${parameters.rootContentId}" field="contentId"/>
<set from-field="parameters.rootContentId" default-value="${parameters.caContentIdTo}" field="rootContentId"/>
+ <set from-field="parameters.rootContentRevisionSeqId" default-value="${parameters.contentRevisionSeqId}" field="rootContentRevisionSeqId"/>
<entity-one entity-name="Content" value-name="itemContent" use-cache="false">
<field-map field-name="contentId" env-name="itemContentId"/>
</entity-one>
@@ -436,7 +443,7 @@
</condition-list>
<order-by field-name="-contentRevisionSeqId"/>
</entity-condition>
- <set from-field="contentRevisions[0].contentRevisionSeqId" default-value="${}" field="rootContentRevisionSeqId" />
+ <set from-field="rootContentRevisionSeqId" default-value="${contentRevisions[0].contentRevisionSeqId}" field="rootContentRevisionSeqId" />
</actions>
<widgets>
@@ -888,7 +895,7 @@
<decorator-section name="body">
<container>
<link target="ViewInstances?rootContentId=${rootContentId}&contentRevisionSeqId=${rootContentRevisionSeqId}" text="View Instances" style="buttontext"/>
- <link target="AddRootCompDocInstance?contentId=${rootTemplateContentId}&contentRevisionSeqId=${contentRevisionSeqId}" text="Create Instance of This Template" style="buttontext"/>
+ <link target="AddRootCompDocInstance?contentId=${rootContentId}&contentRevisionSeqId=${rootContentRevisionSeqId}" text="Create Instance of This Template" style="buttontext"/>
</container>
<include-tree name="CompDocTemplateTree" location="component://content/widget/compdoc/CompDocTemplateTree.xml"/>
</decorator-section>
Modified: trunk/applications/content/widget/compdoc/CompDocTemplateTree.xml
===================================================================
--- trunk/applications/content/widget/compdoc/CompDocTemplateTree.xml 2006-03-03 07:05:00 UTC (rev 6897)
+++ trunk/applications/content/widget/compdoc/CompDocTemplateTree.xml 2006-03-03 09:58:19 UTC (rev 6898)
@@ -66,7 +66,7 @@
<condition-expr field-name="contentIdTo" operator="equals" env-name="contentId" />
<condition-expr field-name="rootRevisionContentId" operator="equals" env-name="rootContentId" />
<condition-expr field-name="contentAssocTypeId" operator="equals" value="COMPDOC_PART" />
- <condition-expr field-name="contentRevisionSeqId" operator="less-equals" env-name="rootContentRevisionSeqId" />
+ <condition-expr field-name="contentRevisionSeqId" operator="less-equals" env-name="rootContentRevisionSeqId" ignore-if-null="true"/>
<condition-expr field-name="fromDate" operator="less-equals" env-name="nowTimestamp"/>
<condition-list combine="or">
<condition-expr field-name="thruDate" operator="equals" value=""/>
@@ -98,11 +98,12 @@
<include-screen name="rootInstanceLine"
location="component://content/widget/compdoc/CompDocScreens.xml" />
<sub-node node-name="node-body">
+
<entity-condition entity-name="AssocRevisionItemView" use-cache="false" >
<condition-list combine="and">
<condition-expr field-name="contentIdTo" operator="equals" env-name="templateContentId" />
<condition-expr field-name="rootRevisionContentId" operator="equals" env-name="templateContentId" />
- <condition-expr field-name="contentRevisionSeqId" operator="less-equals" env-name="templateContentRevisionSeqId" />
+ <condition-expr field-name="contentRevisionSeqId" operator="less-equals" env-name="templateContentRevisionSeqId" ignore-if-null="true"/>
<condition-expr field-name="contentAssocTypeId" operator="equals" value="COMPDOC_PART" />
<condition-expr field-name="fromDate" operator="less-equals" env-name="nowTimestamp"/>
<condition-list combine="or">
More information about the Svn
mailing list