[OFBiz] SVN: r7686 - in trunk/applications/content: webapp/content/WEB-INF widget/content widget/data
hansbak@svn.ofbiz.org
hansbak at svn.ofbiz.org
Sat May 27 04:28:18 CDT 2006
Author: hansbak
Date: 2006-05-27 04:27:55 -0500 (Sat, 27 May 2006)
New Revision: 7686
Modified:
trunk/applications/content/webapp/content/WEB-INF/controller.xml
trunk/applications/content/widget/content/ContentForms.xml
trunk/applications/content/widget/content/DataResourceForms.xml
trunk/applications/content/widget/data/DataResourceScreens.xml
Log:
fault fixes as result of the first implementation in the OTS
Modified: trunk/applications/content/webapp/content/WEB-INF/controller.xml
===================================================================
--- trunk/applications/content/webapp/content/WEB-INF/controller.xml 2006-05-26 20:15:45 UTC (rev 7685)
+++ trunk/applications/content/webapp/content/WEB-INF/controller.xml 2006-05-27 09:27:55 UTC (rev 7686)
@@ -654,16 +654,6 @@
<request-map uri="ClipBoardDataResource"><security auth="true" https="true"/><response name="success" type="view" value="ClipBoardDataResource"/></request-map>
<request-map uri="ClipBoardContent"><security auth="true" https="true"/><response name="success" type="view" value="ClipBoardContent"/></request-map>
- <request-map uri="gotoDataResource">
- <security auth="true" https="true"/>
- <!--
- <event invoke="org/ofbiz/content/mruaddDataResource.bsh" path="" type="bsf" />
- <event invoke="org/ofbiz/content/clearCurrentDataResource.bsh" path="" type="bsf" />
- <response name="success" type="request" value="gotoDataResourceP2"/>
- -->
- <response name="success" type="view" value="EditDataResource"/>
- </request-map>
-
<!-- ================ Redirect Content Requests ================= -->
<request-map uri="findContent">
<security auth="true" https="true"/>
@@ -675,7 +665,10 @@
<request-map uri="CMSMenu"><security auth="true" https="true"/><response name="success" type="view" value="CMSMenu"/></request-map>
<!-- Content requests -->
- <request-map uri="EditContent"><security auth="true" https="true"/><response name="success" type="view" value="EditContent"/></request-map>
+ <request-map uri="EditContent">
+ <security auth="true" https="true"/>
+ <response name="success" type="view" value="EditContent"/>
+ </request-map>
<request-map uri="updateContent">
<security auth="true" https="true"/>
<event invoke="updateContent" type="service"/>
@@ -688,11 +681,11 @@
<response name="success" type="view" value="EditContent"/>
<response name="error" type="view" value="AddContent"/>
</request-map>
- <request-map uri="AddContent">
+ <!--request-map uri="AddContent">
<security auth="true" https="true"/>
<response name="success" type="view" value="AddContent"/>
- </request-map>
- <request-map uri="gotoContent">
+ </request-map-->
+ <request-map uri="editContent">
<security auth="true" https="true"/>
<!--
<event invoke="org/ofbiz/content/mruadd.bsh" path="" type="bsf" />
@@ -704,7 +697,10 @@
<!-- Content Assoc requests -->
- <request-map uri="EditContentAssoc"><security auth="true" https="true"/><response name="success" type="view" value="EditContentAssoc"/></request-map>
+ <request-map uri="EditContentAssoc">
+ <security auth="true" https="true"/>
+ <response name="success" type="view" value="EditContentAssoc"/>
+ </request-map>
<request-map uri="updateContentAssoc">
<security auth="true" https="true"/>
<event invoke="updateContentAssoc" path="" type="service"/>
Modified: trunk/applications/content/widget/content/ContentForms.xml
===================================================================
--- trunk/applications/content/widget/content/ContentForms.xml 2006-05-26 20:15:45 UTC (rev 7685)
+++ trunk/applications/content/widget/content/ContentForms.xml 2006-05-27 09:27:55 UTC (rev 7686)
@@ -74,7 +74,7 @@
<field name="contentId"><hidden/></field>
<field name="contentName" title="Name [id]" widget-style="tabletext">
<display-entity entity-name="Content" description="${contentName}" key-field-name="contentId">
- <sub-hyperlink target="gotoContent?contentId=${contentId}" description="[${contentId}]" link-style="tabletext"/>
+ <sub-hyperlink target="editContent?contentId=${contentId}" description="[${contentId}]" link-style="buttontext"/>
</display-entity>
</field>
<field name="description"><display/></field>
@@ -82,9 +82,17 @@
<field name="localeString"><display-entity entity-name="CountryCode" key-field-name="countryCode" description="${countryName}[${countryCode}]"></display-entity></field>
<field name="contentTypeId"><display-entity entity-name="ContentType"></display-entity></field>
<field name="mimeTypeId"><display-entity entity-name="MimeType"></display-entity></field>
- <field name="dataResourceId"><display/></field>
- <field name="ownerContentId"><display/></field>
- <field name="createdByUserLogin"><display-entity also-hidden="false" entity-name="PartyNameView" key-field-name="partyId" description="${groupName}${firstName} ${lastName}"/></field>
+ <field name="dataResourceId" use-when="dataResourceId==null"><display/></field>
+ <field name="dataResourceId" use-when="dataResourceId!=null">
+ <display-entity entity-name="DataResource" description="${dataResourceName}">
+ <sub-hyperlink target="editDataResource?dataResourceId=${dataResourceId}" link-style="buttontext" description="[${dataResourceId}]"/>
+ </display-entity>
+ </field>
+ <field name="ownerContentId">
+ <display-entity entity-name="Content" description="${contentName}" key-field-name="contentId">
+ <sub-hyperlink target="editContent?contentId=${contentId}" description="[${contentId}]" link-style="buttontext"/>
+ </display-entity>
+ </field>
</form>
<form name="LookupContent" default-tooltip-style="tabletext" extends="FindContent"
@@ -126,10 +134,10 @@
</field>
<field name="dataResourceId">
<lookup target-form-name="LookupDataResource">
- <sub-hyperlink use-when=""${currentValue.dataResourceId}".length()>0" link-style="buttontext" target-type="intra-app" target="gotoDataResource?dataResourceId=${currentValue.dataResourceId}" description="Go to Data Resource"/>
+ <sub-hyperlink use-when=""${currentValue.dataResourceId}".length()>0" link-style="buttontext" target-type="intra-app" target="editDataResource?dataResourceId=${currentValue.dataResourceId}" description="Go to Data Resource"/>
<!--
- <sub-hyperlink link-style="buttontext" target-type="intra-app" target="gotoDataResource?dataResourceId=${currentValue.dataResourceId}" description="Go to Data Resource"/>
- <sub-hyperlink use-when=""${currentValue.dataResourceId}".length()>0" link-style="buttontext" target-type="intra-app" target="gotoDataResource?dataResourceId=${currentValue.dataResourceId}" description="Go to Data Resource"/>
+ <sub-hyperlink link-style="buttontext" target-type="intra-app" target="editDataResource?dataResourceId=${currentValue.dataResourceId}" description="Go to Data Resource"/>
+ <sub-hyperlink use-when=""${currentValue.dataResourceId}".length()>0" link-style="buttontext" target-type="intra-app" target="editDataResource?dataResourceId=${currentValue.dataResourceId}" description="Go to Data Resource"/>
-->
</lookup>
</field>
@@ -155,10 +163,6 @@
</entity-options>
</drop-down>
</field>
- <field name="createdByUserLogin" position="1"><display/></field>
- <field name="createdDate" position="2"><display/></field>
- <field name="lastModifiedByUserLogin" position="1"><display/></field>
- <field name="lastModifiedDate" position="2"><display/></field>
<field name="createButton" use-when="currentValue==null" widget-style="smallSubmit"><submit button-type="button"/></field>
<field name="updateButton" use-when="currentValue!=null" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
@@ -265,16 +269,17 @@
</actions>
<!--auto-fields-entity entity-name="ContentAssoc" default-field-type="display"/-->
<field name="contentId">
- <hyperlink also-hidden="false" description="${contentId}" target="gotoContent?contentId=${contentId}"/>
+ <hyperlink also-hidden="false" description="${contentId}" target="editContent?contentId=${contentId}"/>
</field>
<field name="contentIdTo">
- <hyperlink also-hidden="false" description="${contentIdTo}" target="gotoContent?contentId=${contentIdTo}"/>
+ <hyperlink also-hidden="false" description="${contentIdTo}" target="editContent?contentId=${contentIdTo}"/>
</field>
<field name="contentAssocTypeId"><display-entity entity-name="ContentAssocType" description="${description}"></display-entity></field>
<field name="fromDate"><display description="${bsh:fromDate.toString().substring(0,10)}"/></field>
<field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink also-hidden="false" description="[Delete]" target="removeContentAssoc?contentId=${contentId}&contentIdTo=${contentIdTo}&contentAssocTypeId=${contentAssocTypeId}&fromDate=${fromDate}"/>
</field>
+ <field name="toDate"><date-time/></field>
<field name="editLink" title=" " widget-style="buttontext">
<hyperlink also-hidden="false" description="[Edit]" target="EditContentAssoc?contentId=${contentId}&contentIdTo=${contentIdTo}&contentAssocTypeId=${contentAssocTypeId}&fromDate=${fromDate}"/>
</field>
Modified: trunk/applications/content/widget/content/DataResourceForms.xml
===================================================================
--- trunk/applications/content/widget/content/DataResourceForms.xml 2006-05-26 20:15:45 UTC (rev 7685)
+++ trunk/applications/content/widget/content/DataResourceForms.xml 2006-05-27 09:27:55 UTC (rev 7686)
@@ -68,7 +68,7 @@
<field name="dataResourceId"><hidden/></field>
<field name="dataResourceName" title="Name [id]" widget-style="tabletext">
<display-entity entity-name="DataResource" description="${dataResourceName}" key-field-name="dataResourceId">
- <sub-hyperlink target="editDataResource?dataResourceId=${dataResourceId}" description="[${dataResourceId}]" link-style="tabletext"/>
+ <sub-hyperlink target="editDataResource?dataResourceId=${dataResourceId}" description="[${dataResourceId}]" link-style="buttontext"/>
</display-entity>
</field>
<field name="dataResourceTypeId"><display-entity entity-name="DataResourceType" description="${description}"></display-entity></field>
Modified: trunk/applications/content/widget/data/DataResourceScreens.xml
===================================================================
--- trunk/applications/content/widget/data/DataResourceScreens.xml 2006-05-26 20:15:45 UTC (rev 7685)
+++ trunk/applications/content/widget/data/DataResourceScreens.xml 2006-05-27 09:27:55 UTC (rev 7686)
@@ -134,7 +134,7 @@
</widgets>
</section>
</screen>
- <screen name="AddDataResource">
+ <!--screen name="AddDataResource">
<section>
<condition>
<if-has-permission permission="CONTENTMGR" action="UPDATE"/>
@@ -153,7 +153,7 @@
</decorator-screen>
</widgets>
</section>
- </screen>
+ </screen-->
<screen name="AddDataResourceText">
<section>
<condition>
More information about the Svn
mailing list