You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2009/03/28 21:32:01 UTC
svn commit: r759579 - in /ofbiz/trunk:
applications/workeffort/widget/WorkEffortForms.xml
framework/common/widget/PortalPageForms.xml
specialpurpose/mypage/widget/MyPageForms.xml
Author: jleroux
Date: Sat Mar 28 20:32:01 2009
New Revision: 759579
URL: http://svn.apache.org/viewvc?rev=759579&view=rev
Log:
16th set of changes explained in https://issues.apache.org/jira/browse/OFBIZ-2243
In hyperlink and sub-hyperlink elements, replacement of target parameters by parameter sub-elements
Modified:
ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
ofbiz/trunk/framework/common/widget/PortalPageForms.xml
ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=759579&r1=759578&r2=759579&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original)
+++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Sat Mar 28 20:32:01 2009
@@ -881,7 +881,11 @@
</hyperlink>
</field>
<field name="internalNote" title="${uiLabelMap.WorkEffortPrivatePublic}" widget-style="buttontext" use-when="internalNote.equals("Y")">
- <hyperlink target="updateWorkEffortNote?workEffortId=${workEffortId}&noteId=${noteId}&internalNote=N" description="${uiLabelMap.OrderNotesPublic}"/>
+ <hyperlink target="updateWorkEffortNote" description="${uiLabelMap.OrderNotesPublic}">
+ <parameter param-name="workEffortId" from-field="workEffortId"/>
+ <parameter param-name="noteId" from-field="noteId"/>
+ <parameter param-name="internalNote" value="N"/>
+ </hyperlink>
</field>
</form>
Modified: ofbiz/trunk/framework/common/widget/PortalPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/widget/PortalPageForms.xml?rev=759579&r1=759578&r2=759579&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/widget/PortalPageForms.xml (original)
+++ ofbiz/trunk/framework/common/widget/PortalPageForms.xml Sat Mar 28 20:32:01 2009
@@ -33,10 +33,34 @@
<field name="bot" title="${uiLabelMap.CommonEmptyHeader}" use-when="(ownerUserLoginId.equals("_NA_"))||(sequenceNum >= ${parameters.sequenceNumMax})"><hyperlink target="" description=""/></field>
<field name="up" title="${uiLabelMap.CommonEmptyHeader}" use-when="(ownerUserLoginId.equals("_NA_"))||(sequenceNum == ${parameters.sequenceNumMin})"><hyperlink target="" description=""/></field>
<field name="dwn" title="${uiLabelMap.CommonEmptyHeader}" use-when="(ownerUserLoginId.equals("_NA_"))||(sequenceNum >= ${parameters.sequenceNumMax})"><hyperlink target="" description=""/></field>
- <field name="top" title="${uiLabelMap.CommonEmptyHeader}" use-when="(!ownerUserLoginId.equals("_NA_"))&&(sequenceNum > ${parameters.sequenceNumMin})"><hyperlink target="updatePortalPageSeq?mode=TOP&portalPageId=${portalPageId}&parentPortalPageId=${parameters.parentPortalPageId}" image-location="/images/arrow-end-up-green.png"/></field>
- <field name="bot" title="${uiLabelMap.CommonEmptyHeader}" use-when="(!ownerUserLoginId.equals("_NA_"))&&(sequenceNum < ${parameters.sequenceNumMax})"><hyperlink target="updatePortalPageSeq?mode=BOT&portalPageId=${portalPageId}&parentPortalPageId=${parameters.parentPortalPageId}" image-location="/images/arrow-end-down-green.png"/></field>
- <field name="up" title="${uiLabelMap.CommonEmptyHeader}" use-when="(!ownerUserLoginId.equals("_NA_"))&&(sequenceNum > ${parameters.sequenceNumMin})"><hyperlink target="updatePortalPageSeq?mode=UP&portalPageId=${portalPageId}&parentPortalPageId=${parameters.parentPortalPageId}" image-location="/images/arrow-single-up-green.png"/></field>
- <field name="dwn" title="${uiLabelMap.CommonEmptyHeader}" use-when="(!ownerUserLoginId.equals("_NA_"))&&(sequenceNum < ${parameters.sequenceNumMax})"><hyperlink target="updatePortalPageSeq?mode=DWN&portalPageId=${portalPageId}&parentPortalPageId=${parameters.parentPortalPageId}" image-location="/images/arrow-single-down-green.png"/></field>
+ <field name="top" title="${uiLabelMap.CommonEmptyHeader}" use-when="(!ownerUserLoginId.equals("_NA_"))&&(sequenceNum > ${parameters.sequenceNumMin})">
+ <hyperlink target="updatePortalPageSeq" image-location="/images/arrow-end-up-green.png">
+ <parameter param-name="mode" value="TOP"/>
+ <parameter param-name="portalPageId" from-field="portalPageId"/>
+ <parameter param-name="parentPortalPageId" from-field="parameters.parentPortalPageId"/>
+ </hyperlink>
+ </field>
+ <field name="bot" title="${uiLabelMap.CommonEmptyHeader}" use-when="(!ownerUserLoginId.equals("_NA_"))&&(sequenceNum < ${parameters.sequenceNumMax})">
+ <hyperlink target="updatePortalPageSeq" image-location="/images/arrow-end-down-green.png">
+ <parameter param-name="mode" value="BOT"/>
+ <parameter param-name="portalPageId" from-field="portalPageId"/>
+ <parameter param-name="parentPortalPageId" from-field="parameters.parentPortalPageId"/>
+ </hyperlink>
+ </field>
+ <field name="up" title="${uiLabelMap.CommonEmptyHeader}" use-when="(!ownerUserLoginId.equals("_NA_"))&&(sequenceNum > ${parameters.sequenceNumMin})">
+ <hyperlink target="updatePortalPageSeq" image-location="/images/arrow-single-up-green.png">
+ <parameter param-name="mode" value="UP"/>
+ <parameter param-name="portalPageId" from-field="portalPageId"/>
+ <parameter param-name="parentPortalPageId" from-field="parameters.parentPortalPageId"/>
+ </hyperlink>
+ </field>
+ <field name="dwn" title="${uiLabelMap.CommonEmptyHeader}" use-when="(!ownerUserLoginId.equals("_NA_"))&&(sequenceNum < ${parameters.sequenceNumMax})">
+ <hyperlink target="updatePortalPageSeq" image-location="/images/arrow-single-down-green.png">
+ <parameter param-name="mode" value="DWN"/>
+ <parameter param-name="portalPageId" from-field="portalPageId"/>
+ <parameter param-name="parentPortalPageId" from-field="parameters.parentPortalPageId"/>
+ </hyperlink>
+ </field>
<field name="portalPageName" use-when="ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonName}" sort-field="true"><display/></field>
<field name="portalPageName" use-when="!ownerUserLoginId.equals("_NA_")" title="${uiLabelMap.CommonName}" id-name="portalPageName" widget-style="tabletext" sort-field="true">
<display>
Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml?rev=759579&r1=759578&r2=759579&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml Sat Mar 28 20:32:01 2009
@@ -252,7 +252,11 @@
</entity-condition>
</actions>
<field name="subject">
- <hyperlink description="${subject}" target="EditCommunicationEvent?communicationEventId=${communicationEventId}&communicationEventTypeId=EMAIL_COMMUNICATION&partyId=${userLogin.partyId}"/>
+ <hyperlink description="${subject}" target="EditCommunicationEvent">
+ <parameter param-name="communicationEventId" from-field="communicationEventId"/>
+ <parameter param-name="communicationEventTypeId" value="EMAIL_COMMUNICATION"/>
+ <parameter param-name="partyId" from-field="userLogin.partyId"/>
+ </hyperlink>
</field>
<field name="removeLink" title="${uiLabelMap.CommonDelete}" widget-style="smallSubmit">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deletePartyCommunicationEvent">