svn commit: r756034 - in /ofbiz/trunk/applications: content/widget/forum/ForumForms.xml humanres/widget/forms/EmploymentForms.xml

Author: jleroux
Date: Thu Mar 19 14:47:17 2009
New Revision: 756034

URL: http://svn.apache.org/viewvc?rev=756034&view=rev
Log:
2st 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
In previous commit I forgot my own recommendations and lost the part at end of link. I will fix in a next commit...

Modified:
    ofbiz/trunk/applications/content/widget/forum/ForumForms.xml
    ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml

Modified: ofbiz/trunk/applications/content/widget/forum/ForumForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumForms.xml?rev=756034&r1=756033&r2=756034&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/forum/ForumForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/forum/ForumForms.xml Thu Mar 19 14:47:17 2009
@@ -92,7 +92,14 @@
         <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field>
         <field name="fromDate"><display/></field>
         <field name="updateButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="text-link"/></field>
-        <field name="deleteButton" title="${uiLabelMap.CommonDelete}"><hyperlink target="deleteForumGroupRole?forumGroupId=${parameters.forumGroupId}&amp;contentIdTo=${parameters.forumGroupId}&amp;contentId=${contentId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}"/></field>
+        <field name="deleteButton" title="${uiLabelMap.CommonDelete}"><hyperlink target="deleteForumGroupRole">
+ <parameter param-name="forumGroupId"/>
+ <parameter param-name="contentIdTo"/>
+ <parameter param-name="contentId"/>
+ <parameter param-name="partyId"/>
+ <parameter param-name="roleTypeId"/>
+ <parameter param-name="fromDate"/>
+ </hyperlink></field>
     </form>
     <form name="AddForumGroupRole" type="single" target="createForumGroupRole" default-map-name=""
         header-row-style="header-row" default-table-style="basic-table">
@@ -127,7 +134,14 @@
         <field position="2" name="createdBy" entry-name="createdByUserLogin"><display/></field>
         <field position="3" name="fromDate" entry-name="caFromDate"><display description="${bsh:caFromDate!=null?caFromDate.toString().substring(0,10):&quot;&quot;}"/></field>
         <field position="4" name="thruDate" entry-name="caThruDate"><display description="${bsh:caThruDate!=null?caThruDate.toString().substring(0,10):&quot;&quot;}"/></field>
-        <field position="5" name="deleteButton" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"><hyperlink target="updateForumMessage?forumGroupId=${parameters.forumGroupId}&amp;forumId=${parameters.forumId}&amp;contentIdTo=${caContentIdTo}&amp;contentId=${caContentId}&amp;contentAssocTypeId=${caContentAssocTypeId}&amp;fromDate=${caFromDate}&amp;deactivateExisting=yes" description="${uiLabelMap.CommonDelete}"/></field>
+        <field position="5" name="deleteButton" title="${uiLabelMap.CommonDelete}" widget-style="buttontext"><hyperlink target="updateForumMessage">
+ <parameter param-name="forumGroupId"/>
+ <parameter param-name="forumId"/>
+ <parameter param-name="contentIdTo"/>
+ <parameter param-name="contentId"/>
+ <parameter param-name="contentAssocTypeId"/>
+ <parameter param-name="fromDate"/>
+ </hyperlink></field>
         <field position="6" name="messageText" entry-name="contentData.resultData.electronicText.textData" parameter-name="textData"><textarea rows="8"/></field>
         <field position="7" name="updateButton" title="${uiLabelMap.CommonUpdate}" widget-style="buttontext"><submit button-type="text-link"/></field>
         <field position="8" name="responseButton" title="${uiLabelMap.FormFieldTitle_reponse}" widget-style="buttontext"><hyperlink target="addForumMessage?forumGroupId=${parameters.forumGroupId}&amp;forumId=${parameters.forumId}&amp;forumMessageIdTo=${contentId}&amp;contentAssocTypeId=RESPONSE" description="${uiLabelMap.FormFieldTitle_reponse}"/></field>

Modified: ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml?rev=756034&r1=756033&r2=756034&view=diff
==============================================================================
--- ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml (original)
+++ ofbiz/trunk/applications/humanres/widget/forms/EmploymentForms.xml Thu Mar 19 14:47:17 2009
@@ -183,7 +183,14 @@
         <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
-            <hyperlink target="deletePartyBenefit?benefitTypeId=${benefitTypeId}&amp;roleTypeIdFrom=${roleTypeIdFrom}&amp;roleTypeIdTo=${roleTypeIdTo}&amp;partyIdFrom=${partyIdFrom}&amp;partyIdTo=${partyIdTo}&amp;fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}"/>
+            <hyperlink target="deletePartyBenefit" description="${uiLabelMap.CommonDelete}">
+ <parameter param-name="benefitTypeId"/>
+ <parameter param-name="roleTypeIdFrom"/>
+ <parameter param-name="roleTypeIdTo"/>
+ <parameter param-name="partyIdFrom"/>
+ <parameter param-name="partyIdTo"/>
+ <parameter param-name="fromDate"/>
+ </hyperlink>
         </field>
     </form>
     <form name="AddPartyBenefit" type="single" target="createPartyBenefit"
@@ -323,7 +330,14 @@
         <field name="_rowSubmit" title="${uiLabelMap.CommonSelect}"><hidden value="Y"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
-            <hyperlink target="deleteUnemploymentClaim?unemploymentClaimId=${unemploymentClaimId}&amp;roleTypeIdFrom=${roleTypeIdFrom}&amp;roleTypeIdTo=${roleTypeIdTo}&amp;partyIdFrom=${partyIdFrom}&amp;partyIdTo=${partyIdTo}&amp;fromDate=${fromDate}" description="${uiLabelMap.CommonDelete}"/>
+            <hyperlink target="deleteUnemploymentClaim" description="${uiLabelMap.CommonDelete}">
+ <parameter param-name="unemploymentClaimId"/>
+ <parameter param-name="roleTypeIdFrom"/>
+ <parameter param-name="roleTypeIdTo"/>
+ <parameter param-name="partyIdFrom"/>
+ <parameter param-name="partyIdTo"/>
+ <parameter param-name="fromDate"/>
+ </hyperlink>
         </field>
     </form>                                      
     <form name="AddUnemploymentClaim" type="single" target="createUnemploymentClaim" title="" default-map-name="unemploymentClaim"