[OFBiz] SVN: r6848 - in trunk/applications/content: entitydef widget/compdoc
byersa@svn.ofbiz.org
byersa at svn.ofbiz.org
Sun Feb 26 02:19:53 CST 2006
Author: byersa
Date: 2006-02-26 02:19:47 -0600 (Sun, 26 Feb 2006)
New Revision: 6848
Modified:
trunk/applications/content/entitydef/entitymodel.xml
trunk/applications/content/widget/compdoc/CompDocForms.xml
trunk/applications/content/widget/compdoc/CompDocMenus.xml
trunk/applications/content/widget/compdoc/CompDocScreens.xml
Log:
Added a bunch of CompDoc UI fixes.
Added a contentId field to Survey.
Modified: trunk/applications/content/entitydef/entitymodel.xml
===================================================================
--- trunk/applications/content/entitydef/entitymodel.xml 2006-02-26 06:28:44 UTC (rev 6847)
+++ trunk/applications/content/entitydef/entitymodel.xml 2006-02-26 08:19:47 UTC (rev 6848)
@@ -1127,6 +1127,7 @@
<field name="isAnonymous" type="indicator"><description>Allow response to the survey without login?</description></field>
<field name="allowMultiple" type="indicator"><description>Allow multiple responses to this survey (if Y), or just a single answer (if N)?</description></field>
<field name="allowUpdate" type="indicator"><description>Allow change to responses?</description></field>
+ <field name="contentId" type="id-ne"><description>Points to PDF with AcroForm</description></field>
<prim-key field="surveyId"/>
</entity>
<entity entity-name="SurveyApplType"
Modified: trunk/applications/content/widget/compdoc/CompDocForms.xml
===================================================================
--- trunk/applications/content/widget/compdoc/CompDocForms.xml 2006-02-26 06:28:44 UTC (rev 6847)
+++ trunk/applications/content/widget/compdoc/CompDocForms.xml 2006-02-26 08:19:47 UTC (rev 6848)
@@ -307,10 +307,16 @@
<field name="thruDate"><date-time/></field>
<field name="sequenceNum"><text/></field>
- <field name="mimeTypeId" map-name="empty" title="Document Type" use-when=""SURVEY".equals(instanceOfDataResourceTypeId)">
+ <field name="mimeTypeId" title="Document Type" use-when=""DOCUMENT".equals(contentTypeId) && "SURVEY".equals(instanceOfDataResourceTypeId)">
<hidden value="application/vnd.ofbiz.survey.response"/>
</field>
- <field name="mimeTypeId" map-name="empty" title="Document Type" use-when="!"SURVEY".equals(instanceOfDataResourceTypeId)">
+ <field name="displayMimeTypeId" map-name="empty" title="Document Type" use-when=""DOCUMENT".equals(contentTypeId) && "SURVEY".equals(instanceOfDataResourceTypeId)">
+ <display description="Survey Response"/>
+ </field>
+ <field name="mimeTypeId" title="Document Type" use-when=""DOCUMENT".equals(contentTypeId) && !"SURVEY".equals(instanceOfDataResourceTypeId)">
+ <display-entity entity-name="MimeType" description="${description}"/>
+ </field>
+ <field name="mimeTypeId" title="Document Type" use-when=""TEMPLATE".equals(contentTypeId)">
<drop-down allow-empty="true">
<option key="application/msword" description="MS Word"/>
<option key="application/pdf" description="PDF File"/>
@@ -343,7 +349,7 @@
<field name="mimeTypeId" map-name="dataResource" title="Document Type" widget-style="tabletext"
use-when="contentTypeId.equals("TEMPLATE")">
- <drop-down allow-empty="false">
+ <drop-down allow-empty="true">
<option key="application/msword" description="MS Word"/>
<option key="application/pdf" description="PDF File"/>
<option key="application/vnd.ofbiz.survey" description="Survey"/>
Modified: trunk/applications/content/widget/compdoc/CompDocMenus.xml
===================================================================
--- trunk/applications/content/widget/compdoc/CompDocMenus.xml 2006-02-26 06:28:44 UTC (rev 6847)
+++ trunk/applications/content/widget/compdoc/CompDocMenus.xml 2006-02-26 08:19:47 UTC (rev 6848)
@@ -209,7 +209,7 @@
default-tooltip-style="tabletext" default-widget-style="tabButton"
selected-menuitem-context-field-name="currentMenuItemName"
title="" type="simple">
- <menu-item name="edit-inplace" title="${contentName}[${rootInstanceContentId}]" widget-style="head2">
+ <menu-item name="edit-inplace" title="${instanceContent.contentName}[${instanceContent.contentId}]" widget-style="head2">
<link target="EditCompDoc?contentId=${rootInstanceContentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootInstanceRevSeqId=${rootInstanceRevSeqId}&rootTemplateRevSeqId=${rootTemplateRevSeqId}&rootTemplateContentId=${rootTemplateContentId}&rootInstanceContentId=${rootInstanceContentId}"/>
</menu-item>
<menu-item name="edit" title="[Edit]" >
Modified: trunk/applications/content/widget/compdoc/CompDocScreens.xml
===================================================================
--- trunk/applications/content/widget/compdoc/CompDocScreens.xml 2006-02-26 06:28:44 UTC (rev 6847)
+++ trunk/applications/content/widget/compdoc/CompDocScreens.xml 2006-02-26 08:19:47 UTC (rev 6848)
@@ -44,7 +44,7 @@
<widgets>
<decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
<decorator-section name="body">
- <link target="ListWaitingContentApproval?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootTemplateContentId=${rootTemplateContentId}&rootTemplateRevSeqId=${rootTemplateRevSeqId}&rootInstanceContentId=${rootInstanceContentId}&rootInstanceRevSeqId=${rootInstanceRevSeqId}" text="View Waiting Approvals" style="buttontext"/>
+ <container><link target="ListWaitingContentApproval?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootTemplateContentId=${rootTemplateContentId}&rootTemplateRevSeqId=${rootTemplateRevSeqId}&rootInstanceContentId=${rootInstanceContentId}&rootInstanceRevSeqId=${rootInstanceRevSeqId}" text="View Waiting Approvals" style="buttontext"/></container>
<include-form name="ListContentApproval" location="component://content/widget/compdoc/CompDocForms.xml"/>
<label text="Add" style="head1"/>
<include-form name="AddContentApproval" location="component://content/widget/compdoc/CompDocForms.xml"/>
@@ -73,7 +73,7 @@
<widgets>
<decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
<decorator-section name="body">
- <link target="EditContentApproval?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootTemplateContentId=${rootTemplateContentId}&rootTemplateRevSeqId=${rootTemplateRevSeqId}&rootInstanceContentId=${rootInstanceContentId}&rootInstanceRevSeqId=${rootInstanceRevSeqId}" text="Create New Content Approval" style="buttontext"/>
+ <container><link target="EditContentApproval?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootTemplateContentId=${rootTemplateContentId}&rootTemplateRevSeqId=${rootTemplateRevSeqId}&rootInstanceContentId=${rootInstanceContentId}&rootInstanceRevSeqId=${rootInstanceRevSeqId}" text="Create New Content Approval" style="buttontext"/></container>
<include-form name="ListContentApproval" location="component://content/widget/compdoc/CompDocForms.xml"/>
</decorator-section>
</decorator-screen>
@@ -221,8 +221,8 @@
<decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
<decorator-section name="body">
<container>
- <link target="AddRootCompDocTemplate" text="Create New Root CompDoc Template" style="buttontext"/>
- <link target="ListWaitingContentApproval?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootTemplateContentId=${rootTemplateContentId}&rootTemplateRevSeqId=${rootTemplateRevSeqId}&rootInstanceContentId=${rootInstanceContentId}&rootInstanceRevSeqId=${rootInstanceRevSeqId}" text="View Waiting Approvals" style="buttontext"/>
+ <container><link target="AddRootCompDocTemplate" text="Create New Root CompDoc Template" style="buttontext"/></container>
+ <container><link target="ListWaitingContentApproval?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootTemplateContentId=${rootTemplateContentId}&rootTemplateRevSeqId=${rootTemplateRevSeqId}&rootInstanceContentId=${rootInstanceContentId}&rootInstanceRevSeqId=${rootInstanceRevSeqId}" text="View Waiting Approvals" style="buttontext"/></container>
</container>
<include-form name="FindCompDoc" location="component://content/widget/compdoc/CompDocForms.xml"/>
<include-form name="ListCompDoc" location="component://content/widget/compdoc/CompDocForms.xml"/>
@@ -282,7 +282,7 @@
<widgets>
<decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
<decorator-section name="body">
- <link target="AddRootCompDocTemplate?contentId=${contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootTemplateContentId=${rootTemplateContentId}&rootTemplateRevSeqId=${rootTemplateRevSeqId}&rootInstanceContentId=${rootInstanceContentId}&rootInstanceRevSeqId=${rootInstanceRevSeqId}" text="Create New Root CompDoc Template" style="buttontext"/>
+ <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>
<include-form name="ListCompDocInstances" location="component://content/widget/compdoc/CompDocForms.xml"/>
</decorator-section>
</decorator-screen>
@@ -328,13 +328,14 @@
<if-compare field-name="content.contentTypeId" operator="equals" value="COMPDOC_TEMPLATE"/>
</condition>
<actions>
+ <set field="title" value="Edit CompDoc Template [${contentId}]"/>
<set from-field="content.contentId" field="rootTemplateContentId"/>
<set from-field="parameters.contentRevisionSeqId" default-value="${parameters.rootTemplateRevSeqId}" field="rootTemplateRevSeqId"/>
</actions>
<widgets>
<decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml">
<decorator-section name="body">
- <link target="AddRootCompDocInstance?contentId=${rootTemplateContentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootTemplateContentId=${rootTemplateContentId}&rootTemplateRevSeqId=${rootTemplateRevSeqId}&rootInstanceContentId=${rootInstanceContentId}&rootInstanceRevSeqId=${rootInstanceRevSeqId}" text="Create Instance of This Template" style="buttontext"/>
+ <container><link target="AddRootCompDocInstance?contentId=${rootTemplateContentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootTemplateContentId=${rootTemplateContentId}&rootTemplateRevSeqId=${rootTemplateRevSeqId}&rootInstanceContentId=${rootInstanceContentId}&rootInstanceRevSeqId=${rootInstanceRevSeqId}" text="Create Instance of This Template" style="buttontext"/></container>
<include-form name="EditRootCompDocTemplate" location="component://content/widget/compdoc/CompDocForms.xml"/>
</decorator-section>
</decorator-screen>
@@ -345,6 +346,7 @@
<if-compare field-name="content.contentTypeId" operator="equals" value="COMPDOC_INSTANCE"/>
</condition>
<actions>
+ <set field="title" value="Edit CompDoc Instance [${contentId}]"/>
<set from-field="content.contentId" field="rootInstanceContentId"/>
<set from-field="parameters.contentRevisionSeqId" default-value="${parameters.rootInstanceRevSeqId}" field="rootInstanceRevSeqId"/>
</actions>
@@ -361,6 +363,7 @@
<if-compare field-name="content.contentTypeId" operator="equals" value="TEMPLATE"/>
</condition>
<actions>
+ <set field="title" value="Edit CompDoc Template Part [${contentId}]"/>
<set value="updateChildCompDocTemplate" field="childCompDocTarget"/>
<set value="TEMPLATE" field="contentTypeId"/>
<set from-field="parameters.contentRevisionSeqId" default-value="${parameters.rootTemplateRevSeqId}" field="rootTemplateRevSeqId"/>
@@ -396,6 +399,7 @@
<if-compare field-name="content.contentTypeId" operator="equals" value="DOCUMENT"/>
</condition>
<actions>
+ <set field="title" value="Edit CompDoc Instance Part [${contentId}]"/>
<set value="updateChildCompDocInstance" field="childCompDocTarget"/>
<set value="DOCUMENT" field="contentTypeId"/>
<set from-field="parameters.caContentIdTo" default-value="${parameters.rootInstanceContentId}" field="rootInstanceContentId"/>
@@ -473,7 +477,7 @@
<actions>
</actions>
<widgets>
- <link target="ViewCompDocContentBinary?contentId=${content.contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootContentId=${dummy.rootContentId}" text="View CompDoc Content" style="buttontext"/>
+ <container><link target="ViewCompDocContentBinary?contentId=${content.contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootContentId=${dummy.rootContentId}" text="View CompDoc Content" style="buttontext"/></container>
</widgets>
</section>
<section>
@@ -486,7 +490,7 @@
<actions>
</actions>
<widgets>
- <link target="ViewCompDocContentHtml?contentId=${content.contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootContentId=${rootContentId}" text="View CompDoc Content" style="buttontext"/>
+ <container><link target="ViewCompDocContentHtml?contentId=${content.contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootContentId=${rootContentId}" text="View CompDoc Content" style="buttontext"/></container>
</widgets>
</section>
<section>
@@ -503,7 +507,7 @@
<actions>
</actions>
<widgets>
- <link target="ViewCompDocContentSurvey?contentId=${content.contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootContentId=${rootContentId}" text="View CompDoc Content" style="buttontext"/>
+ <container><link target="ViewCompDocContentSurvey?contentId=${content.contentId}&contentRevisionSeqId=${contentRevisionSeqId}&rootContentId=${rootContentId}" text="View CompDoc Content" style="buttontext"/></container>
</widgets>
</section>
<section>
@@ -529,7 +533,9 @@
<actions>
</actions>
<widgets>
+ <!--
<label text="View screen not available for mime-type: ${dataResource.mimeTypeId}"/>
+ -->
</widgets>
</section>
</widgets>
@@ -637,7 +643,9 @@
<actions>
</actions>
<widgets>
+ <!--
<label text="Upload screen not available for mime-type: ${dataResource.mimeTypeId}"/>
+ -->
</widgets>
</section>
</widgets>
@@ -661,7 +669,7 @@
</condition>
<actions>
<set field="menuName" value="tree"/>
- <set field="title" value="Composite Document Instance Add Page"/>
+ <set field="title" value="Add Composite Document Instance Page"/>
<set value="COMPDOC_INSTANCE" field="contentTypeId" />
<set value="" field="dummy2.contentId" />
</actions>
@@ -682,7 +690,7 @@
</condition>
<actions>
<set field="menuName" value="tree"/>
- <set field="title" value="Composite Document Template Add Page"/>
+ <set field="title" value="Add Composite Document Template Page"/>
<set value="COMPDOC_TEMPLATE" field="dummy.contentTypeId"/>
<set value="createChildCompDocTemplate" field="createChildCompDoc"/>
</actions>
@@ -703,13 +711,14 @@
</condition>
<actions>
<set field="menuName" value="tree"/>
- <set field="title" value="Composite Document Instance PART Add Page"/>
+ <set field="title" value="Add Composite Document Instance Part Page"/>
<set field="contentIdTo" from-field="parameters.rootInstanceContentId"/>
<set field="instanceOfContentId" from-field="parameters.contentId"/>
<entity-one entity-name="Content" value-name="instanceOfContent"/>
<set from-field="instanceOfContent.contentName" field="contentName"/>
<get-related-one value-name="instanceOfContent" relation-name="DataResource" to-value-name="instanceOfDataResource"/>
<set field="instanceOfDataResourceTypeId" from-field="instanceOfDataResource.dataResourceTypeId"/>
+ <set field="mimeTypeId" from-field="instanceOfDataResource.mimeTypeId"/>
<set value="COMPDOC_PART" field="contentAssocTypeId"/>
<set value="DOCUMENT" field="contentTypeId"/>
<set from-field="parameters.caSequenceNum" field="sequenceNum" default-value="${parameters.sequenceNum}"/>
@@ -732,7 +741,7 @@
</condition>
<actions>
<set field="menuName" value="tree"/>
- <set field="title" value="Composite Document Template Add Page"/>
+ <set field="title" value="Add Composite Document Template Part Page"/>
<set field="contentIdTo" from-field="parameters.caContentIdTo" default-value="${parameters.contentIdTo}"/>
<set field="contentAssocTypeId" value="COMPDOC_PART"/>
<set field="sequenceNum" from-field="parameters.caSequenceNum" default-value="${parameters.sequenceNum}"/>
@@ -824,7 +833,7 @@
<actions>
<set field="menuName" value="tree"/>
<set field="currentMenuItemName" value="viewtree2"/>
- <entity-one entity-name="Content" value-name="content" use-cache="true">
+ <entity-one entity-name="Content" value-name="instanceContent" use-cache="true">
<field-map field-name="contentId" env-name="parameters.rootInstanceContentId"/>
</entity-one>
<entity-condition entity-name="ContentRevision" list-name="contentRevisions" use-cache="true">
@@ -836,7 +845,7 @@
</entity-condition>
<set field="rootInstanceRevSeqId" from-field="parameters.rootInstanceRevSeqId" default-value="${contentRevisions[0].contentRevisionSeqId}"/>
- <set field="rootTemplateContentId" from-field="content.instanceOfContentId"/>
+ <set field="rootTemplateContentId" from-field="instanceContent.instanceOfContentId"/>
<set field="contentRevisionSeqId" from-field="parameters.rootInstanceRevSeqId" default-value="${contentRevisions[0].contentRevisionSeqId}"/>
<set from-field="parameters.rootInstanceContentId" field="contentId" />
<set field="title" value="Composite Document Root Instance View Page for Id: ${parameters.rootInstanceContentId} instance of ${rootTemplateContentId}"/>
More information about the Svn
mailing list