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/04/04 23:35:09 UTC
svn commit: r762015 - in /ofbiz/trunk:
applications/marketing/webapp/marketing/contact/
applications/party/webapp/partymgr/communication/
applications/party/widget/partymgr/
applications/product/webapp/catalog/feature/
applications/product/webapp/facil...
Author: jleroux
Date: Sat Apr 4 21:35:08 2009
New Revision: 762015
URL: http://svn.apache.org/viewvc?rev=762015&view=rev
Log:
Securing URLs, link element in screens and menus : 32th set + tabs to 4 spaces
Continue to end with non regular formattings
Modified:
ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml
ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml
ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
Modified: ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml?rev=762015&r1=762014&r2=762015&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml Sat Apr 4 21:35:08 2009
@@ -18,12 +18,12 @@
under the License.
-->
-<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
<form name="EditContactList" type="single" target="updateContactList" title="" default-map-name="contactList"
header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="contactList==null" target="createContactList"/>
-
+
<field use-when="contactList!=null" name="contactListId" title="${uiLabelMap.MarketingContactListContactListId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
<field use-when="contactList==null&&contactListId==null" name="contactListId" title="${uiLabelMap.MarketingContactListContactListId}"><ignored/></field>
<field use-when="contactList==null&&contactListId!=null" name="contactListId" title="${uiLabelMap.MarketingContactListContactListId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${contactListId}]"><display/></field>
@@ -46,7 +46,7 @@
<option key="Y" description="${uiLabelMap.CommonY}"/><option key="N" description="${uiLabelMap.CommonN}"/>
</drop-down>
</field>
-
+
<field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}">
<drop-down no-current-selected-key="EMAIL_ADDRESS">
<entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId">
@@ -63,7 +63,7 @@
</field>
<field name="ownerPartyId" title="${uiLabelMap.MarketingContactListOwnerPartyId}"><lookup target-form-name="LookupPartyName"/></field>
-
+
<field name="verifyEmailFrom" title="${uiLabelMap.MarketingContactListVerifyEmailFrom}"><text size="40"/></field>
<field name="verifyEmailScreen" title="${uiLabelMap.MarketingContactListVerifyEmailScreen}"><text size="60"/></field>
<field name="verifyEmailSubject" title="${uiLabelMap.MarketingContactListVerifyEmailSubject}"><text size="60"/></field>
@@ -74,7 +74,7 @@
</entity-options>
</drop-down>
</field>
-
+
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
<!-- <field name="DONE_PAGE"><hidden value="${donePage}"/></field> -->
<!-- <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}" target-type="inter-app"/></field> -->
@@ -127,7 +127,7 @@
<field name="isPublic" title="${uiLabelMap.MarketingContactListIsPublic}"><display/></field>
<field name="singleUse" title="${uiLabelMap.MarketingContactListIsSingleUse}"><display/></field>
<field name="contactListTypeId" title="${uiLabelMap.MarketingContactListContactListTypeId}"><display-entity entity-name="ContactListType"/></field>
-
+
<field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}"><display-entity entity-name="ContactMechType"/></field>
<field name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}"><display-entity entity-name="MarketingCampaign" description="${campaignName}"/></field>
<!-- deleting contact lists is a bit more complicated than this... don't like have a link like this for top level entities
@@ -138,16 +138,16 @@
</field>
-->
</form>
-
+
<form name="EditContactListParty" type="single" target="updateContactListParty" title="" default-map-name="contactListParty"
header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="contactListParty==null" target="createContactListParty"/>
-
+
<field name="contactListId"><hidden/></field>
<field name="partyId" title="${uiLabelMap.MarketingContactListPartyId}"><lookup target-form-name="LookupPartyName"/></field>
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-time/></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-time/></field>
-
+
<field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down no-current-selected-key="CLPT_PENDING">
<entity-options entity-name="StatusItem" description="${description}">
@@ -157,21 +157,21 @@
</drop-down>
</field>
<field name="optInVerifyCode" map-name="parameters" title="${uiLabelMap.MarketingContactListOptInVerifyCode}"><text size="10"/></field>
-
+
<field name="preferredContactMechId" title="${uiLabelMap.MarketingContactListPreferredContactMech}">
<lookup target-form-name="LookupPreferredContactMech" target-parameter="partyId"/>
</field>
-
+
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
</form>
-
+
<form name="FindContactListParties" type="single" target="ListContactListParties" title=""
header-row-style="header-row" default-table-style="basic-table">
<field name="contactListId" title="${uiLabelMap.MarketingContactListContactListId}"><text-find/></field>
<field name="partyId" title="${uiLabelMap.MarketingContactListPartyId}"><lookup target-form-name="LookupPartyName"/></field>
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-find/></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-find/></field>
-
+
<field name="statusId" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="true">
<entity-options entity-name="StatusItem" description="${description}">
@@ -183,7 +183,7 @@
<field name="preferredContactMechId" title="${uiLabelMap.MarketingContactListPreferredContactMech}">
<lookup target-form-name="LookupContactMech" target-parameter="partyId"/>
</field>
-
+
<field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="buttontext"><submit button-type="text-link"/></field>
</form>
<form name="ListContactListParties" type="list" title="" list-name="listIt" paginate-target="ListContactListParties"
@@ -195,7 +195,7 @@
<field-map field-name="entityName" value="ContactListParty"/>
</service>
</actions>
-
+
<field name="contactListId"><hidden/></field>
<field name="partyId" title="${uiLabelMap.MarketingContactListPartyId}"><display-entity entity-name="PartyNameView" description="${firstName} ${lastName} ${groupName} [${partyId}]"/></field>
<field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field>
@@ -224,7 +224,7 @@
</entity-options>
</drop-down>
</field>
-
+
<field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"><lookup target-form-name="LookupPartyName"/></field>
<field name="statusId" use-when="communicationEvent==null" title="${uiLabelMap.CommonStatus}">
<drop-down allow-empty="false" no-current-selected-key="COM_PENDING">
@@ -242,7 +242,7 @@
</entity-options>
</drop-down>
</field>
-
+
<field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}" use-when="commEventContactMechType!=null&&parentCommEventContactMechType==null">
<drop-down>
<entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
@@ -258,7 +258,7 @@
<entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
</drop-down>
</field>
-
+
<field name="roleTypeIdFrom" title="${uiLabelMap.PartyRoleTypeIdFrom}" use-when="commEventRoleTypeIdFrom!=null">
<drop-down allow-empty="true">
<entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId">
@@ -273,12 +273,13 @@
</entity-options>
</drop-down>
</field>
-
- <!--
+
+ <!--
<field name="custRequestId">
<lookup size="20" target-form-name="/ordermgr/control/LookupCustRequest">
- <sub-hyperlink target="/ordermgr/control/EditRequest?custRequestId=${communicationEvent.custRequestId}" target-type="inter-app" link-style="buttontext"
- description="[Edit]" use-when="communicationEvent!=null&&communicationEvent.get("custRequestId")!= null"/>
+ <sub-hyperlink target="/ordermgr/control/EditRequest" target-type="inter-app" link-style="buttontext" description="[Edit]" use-when="communicationEvent!=null&&communicationEvent.get("custRequestId")!= null">
+ <parameter param-name="custRequestId" from-field="communicationEvent.custRequestId"/>
+ </sub-hyperlink>
</lookup>
</field>
-->
@@ -347,7 +348,7 @@
<field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}"><display/></field>
<field map-name="subjectMap" name="subject" title="${uiLabelMap.PartyCommEventSubject}"><display/></field>
</form>
-
+
<form name="LookupContactList" default-map-name="contactList" target="LookupContactList" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
<field name="contactListId" title="${uiLabelMap.MarketingContactListContactListId}"><text-find/></field>
@@ -392,7 +393,7 @@
<field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}"><display-entity entity-name="ContactMechType"/></field>
<field name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}"><display-entity description="${campaignName}" entity-name="MarketingCampaign"/></field>
</form>
-
+
<form name="LookupCommEvent" target="LookupCommEvent" title="" type="single"
header-row-style="header-row" default-table-style="basic-table">
<field name="communicationEventId" title="${uiLabelMap.MarketingContactListCommEventId}"><text-find/></field>
@@ -453,11 +454,11 @@
<field-map field-name="partyId"/>
</entity-and>
</actions>
-
+
<field name="contactMechId" widget-style="buttontext">
<hyperlink description="${contactMechId}" target-type="plain" target="javascript:set_value('${contactMechId}')" also-hidden="false"/>
</field>
<field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}"><display-entity entity-name="ContactMechType"/></field>
<field name="cmDetail"><display description="[${infoString}] [${tnCountryCode}-${tnAreaCode}-${tnContactNumber}] [${paAddress1}, ${paAddress2}, ${paCity}, ${paStateProvinceGeoId}, ${paPostalCode}, ${paPostalCodeExt} ${paCountryGeoId}]" also-hidden="false"/></field>
</form>
-</forms>
\ No newline at end of file
+</forms>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml?rev=762015&r1=762014&r2=762015&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Sat Apr 4 21:35:08 2009
@@ -639,8 +639,9 @@
<field name="relatedDetailId" map-name="dataResource" title="Survey ID"
use-when="dataResource!=null && "SURVEY".equals(dataResource.getString("dataResourceTypeId"))">
<lookup target-form-name="LookupSurvey">
- <sub-hyperlink target="EditSurvey?surveyId=${dataResource.relatedDetailId}" description="Edit Survey" link-style="smallSubmit"
- use-when="dataResource.get("relatedDetailId")!=null"/>
+ <sub-hyperlink target="EditSurvey" description="Edit Survey" link-style="smallSubmit" use-when="dataResource.get("relatedDetailId")!=null">
+ <parameter param-name="surveyId" from-field="dataResource.relatedDetailId"/>
+ </sub-hyperlink>
</lookup>
</field>
<field name="relatedDetailId" map-name="dataResource" title="Survey Response ID"
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml?rev=762015&r1=762014&r2=762015&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyInvitationForms.xml Sat Apr 4 21:35:08 2009
@@ -36,10 +36,10 @@
</drop-down>
</field>
<field name="performSearch"><hidden value="Y"/></field>
- <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
+ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="searchButton" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
-
+
<form name="ListPartyInvitations" type="list" list-name="listIt" default-entity-name="PartyInvitation"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
@@ -61,10 +61,12 @@
<field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
<field name="lastInviteDate"><display/></field>
<field name="remove" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
- <hyperlink target="deletePartyInvitation?partyInvitationId=${partyInvitationId}" description="${uiLabelMap.CommonDelete}"></hyperlink>
+ <hyperlink target="deletePartyInvitation" description="${uiLabelMap.CommonDelete}">
+ <parameter param-name="partyInvitationId" value="partyInvitationId"/>
+ </hyperlink>
</field>
</form>
-
+
<form name="EditPartyInvitation" type="single" target="updatePartyInvitation" default-map-name="partyInvitation"
header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="partyInvitation==null" target="createPartyInvitation"/>
@@ -87,7 +89,7 @@
<field name="submitButton" use-when="partyInvitation==null" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
<field name="submitButton" use-when="partyInvitation!=null" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field>
</form>
-
+
<form name="ListPartyInvitationGroupAssocs" type="list" list-name="partyInvitationGroupAssoc"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
@@ -109,10 +111,13 @@
</display-entity>
</field>
<field name="remove" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
- <hyperlink target="deletePartyInvitationGroupAssoc?partyInvitationId=${partyInvitationId}&partyIdTo=${partyIdTo}" description="${uiLabelMap.CommonDelete}"></hyperlink>
+ <hyperlink target="deletePartyInvitationGroupAssoc" description="${uiLabelMap.CommonDelete}">
+ <parameter param-name="partyInvitationId" from-field="partyInvitationId"/>
+ <parameter param-name="partyIdTo" from-field="partyIdTo"/>
+ </hyperlink>
</field>
</form>
-
+
<form name="AddPartyInvitationGroupAssoc" type="single" target="createPartyInvitationGroupAssoc" default-map-name="partyInvitationGroupAssoc"
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createPartyInvitationGroupAssoc"/>
@@ -127,7 +132,7 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
</form>
-
+
<form name="ListPartyInvitationRoleAssocs" type="list" list-name="partyInvitationRoleAssoc"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
@@ -143,10 +148,13 @@
</field>
<field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}"><display-entity entity-name="RoleType"/></field>
<field name="remove" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
- <hyperlink target="deletePartyInvitationRoleAssoc?partyInvitationId=${partyInvitationId}&roleTypeId=${roleTypeId}" description="${uiLabelMap.CommonDelete}"></hyperlink>
+ <hyperlink target="deletePartyInvitationRoleAssoc" description="${uiLabelMap.CommonDelete}">
+ <parameter param-name="partyInvitationId" from-field="partyInvitationId"/>
+ <parameter param-name="roleTypeId" from-field="roleTypeId"/>
+ </hyperlink>
</field>
</form>
-
+
<form name="AddPartyInvitationRoleAssoc" type="single" target="createPartyInvitationRoleAssoc" title="" default-map-name="partyInvitationGroupAssoc"
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-service service-name="createPartyInvitationRoleAssoc"/>
@@ -160,4 +168,4 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonCreate}"><submit button-type="button"/></field>
</form>
-</forms>
\ No newline at end of file
+</forms>
Modified: ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml?rev=762015&r1=762014&r2=762015&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/feature/FeatureForms.xml Sat Apr 4 21:35:08 2009
@@ -7,9 +7,9 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -18,15 +18,15 @@
under the License.
-->
-<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
<form name="EditProductFeature" type="single" target="updateProductFeature" title="" default-map-name="productFeature"
header-row-style="header-row" default-table-style="basic-table">
-
+
<alt-target use-when="productFeature==null" target="createProductFeature"/>
-
+
<auto-fields-service service-name="updateProductFeature" map-name=""/>
-
+
<field use-when="productFeature!=null" name="productFeatureId" title="${uiLabelMap.ProductFeatureId}" tooltip="${uiLabelMap.ProductChangeWithoutProductCatalog}"><display/></field>
<field use-when="productFeature==null&&productFeatureId!=null" name="productFeatureId" title="${uiLabelMap.ProductFeatureId}" tooltip="${uiLabelMap.ProductCouldNotFindProductConfigItem} [${productFeatureId}]"><text size="20" maxlength="20"/></field>
<!-- this to be taken care of with auto-fields-service as soon as it uses entity field info too -->
@@ -48,8 +48,9 @@
</drop-down>
</field>
<field use-when="productFeature!=null&&productFeature.getString("productFeatureCategoryId")!=null" name="categoryLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
- <hyperlink target="/EditFeatureCategoryFeatures?productFeatureCategoryId=${productFeature.productFeatureCategoryId}" target-type="intra-app"
- description="${uiLabelMap.ProductGoToFeatureCategory} ${productFeature.productFeatureCategoryId}" also-hidden="false"/>
+ <hyperlink target="/EditFeatureCategoryFeatures" target-type="intra-app" description="${uiLabelMap.ProductGoToFeatureCategory} ${productFeature.productFeatureCategoryId}" also-hidden="false">
+ <parameter param-name="productFeatureCategoryId" from-field="productFeature.productFeatureCategoryId"/>
+ </hyperlink>
</field>
<field name="description" title="${uiLabelMap.CommonDescription}"/>
@@ -107,7 +108,7 @@
</hyperlink>
</field>
</form>
- <form name="FindFeatureType" type="single" target="EditFeatureTypes"
+ <form name="FindFeatureType" type="single" target="EditFeatureTypes"
header-row-style="header-row" default-table-style="basic-table">
<field name="productFeatureTypeId"><text-find size="25" default-option="contains"></text-find></field>
<field name="description"><text-find size="25" default-option="contains"></text-find></field>
@@ -122,11 +123,11 @@
<field-map field-name="entityName" value="ProductFeatureType"/>
<field-map field-name="orderBy" value="productFeatureTypeId"/>
</service>
- </actions>
+ </actions>
<field name="productFeatureTypeId" widget-style="buttontext">
<hyperlink target="EditFeatureType" description="${productFeatureTypeId}">
<parameter param-name="productFeatureTypeId" from-field="productFeatureTypeId"/>
- </hyperlink>
+ </hyperlink>
</field>
<field name="description"><display/></field>
<field name="parentTypeId">
@@ -158,12 +159,12 @@
<field name="hasTable"><hidden/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
- <form name="FindFeatureInterAction" type="single" target="EditFeatureInterActions"
+ <form name="FindFeatureInterAction" type="single" target="EditFeatureInterActions"
header-row-style="header-row" default-table-style="basic-table">
<field name="productFeatureId"><text-find size="25" default-option="contains"></text-find></field>
<field name="productFeatureIdTo"><text-find size="25" default-option="contains"></text-find></field>
<field name="searchButton" widget-style="smallSubmit"><submit/></field>
- </form>
+ </form>
<form name="ListFeatureInterActions" list-name="listIt" target="" title="" type="list" paginate-target="EditFeatureInterAction"
odd-row-style="alternate-row" default-table-style="basic-table">
<actions>
@@ -173,31 +174,31 @@
<field-map field-name="entityName" value="ProductFeatureIactn"/>
<field-map field-name="orderBy" value="productFeatureId"/>
</service>
- </actions>
-
+ </actions>
+
<field name="productFeatureId">
<display-entity entity-name="ProductFeature" description="${description}">
<sub-hyperlink target="EditFeature" description="[${productFeatureId}]">
<parameter param-name="productFeatureId" from-field="productFeatureId"/>
- </sub-hyperlink>
+ </sub-hyperlink>
</display-entity>
</field>
<field name="productFeatureIdTo">
<display-entity entity-name="ProductFeature" description="${description}" key-field-name="productFeatureId">
<sub-hyperlink target="EditFeature" description="[${productFeatureIdTo}]">
<parameter param-name="productFeatureId" from-field="productFeatureIdTo"/>
- </sub-hyperlink>
+ </sub-hyperlink>
</display-entity>
</field>
<field name="productFeatureIactnTypeId"><display-entity entity-name="ProductFeatureIactnType"/></field>
-
+
<field name="removeFeatureInterAction" title="${uiLabelMap.CommonDelete}" widget-style="buttontext">
<hyperlink target="removeProductFeatureIactn" description="${uiLabelMap.CommonDelete}">
<parameter param-name="productFeatureId" from-field="productFeatureId"/>
<parameter param-name="productFeatureIdTo" from-field="productFeatureIdTo"/>
</hyperlink>
</field>
- </form>
+ </form>
<form name="EditFeatureInterAction" type="single" target="createProductFeatureIactn" title="" default-map-name="productFeatureIactn"
header-row-style="header-row" default-table-style="basic-table">
<field name="productFeatureId">
@@ -222,9 +223,9 @@
<entity-order-by field-name="description"/>
</entity-options>
</drop-down>
- </field>
+ </field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
- </form>
+ </form>
<form name="ListFeatureGroupAppls" type="multi" use-row-submit="false" list-name="productFeatureGroupAndAppls" target="UpdateProductFeatureGroupAppl?productFeatureGroupId=${productFeatureGroupId}" title=""
odd-row-style="alternate-row" default-table-style="basic-table">
<field name="productFeatureGroupId"><hidden/></field>
@@ -284,15 +285,15 @@
<submit/>
</field>
</form>
-
- <form name="FindProductFeature" type="single" target="EditFeatureCategories"
+
+ <form name="FindProductFeature" type="single" target="EditFeatureCategories"
header-row-style="header-row" default-table-style="basic-table">
<field name="productFeatureCategoryId" title="${uiLabelMap.CommonId}"><text-find size="25" default-option="contains"></text-find></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><text-find size="25" default-option="contains"></text-find></field>
<field name="searchButton" widget-style="smallSubmit"><submit/></field>
</form>
-
- <form name="ListProductFeature" type="list" list-name="listIt" paginate-target="EditFeatureCategories"
+
+ <form name="ListProductFeature" type="list" list-name="listIt" paginate-target="EditFeatureCategories"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar" separate-columns="true">
<actions>
<set field="parameters.noConditionFind" value="Y"/>
@@ -308,9 +309,9 @@
</hyperlink>
</field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
-
+
</form>
-
+
<form name="CreateProductFeature" type="single" target="CreateFeatureCategory">
<field name="description" title="${uiLabelMap.CommonDescription}*"><text size="25"></text></field>
<field name="parentCategory" title="${uiLabelMap.ProductParentCategory}">
@@ -320,7 +321,7 @@
</drop-down>
</field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
-
+
</form>
<form name="ListFeaturePrice" type="list" target="updateFeaturePrice" list-name="productFeaturePrice"
odd-row-style="alternate-row" default-table-style="basic-table">
@@ -371,4 +372,4 @@
</field>
<field name="submitButton" title="${uiLabelMap.CommonCreate}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
-</forms>
\ No newline at end of file
+</forms>
Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml?rev=762015&r1=762014&r2=762015&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/facility/inventory/InventoryForms.xml Sat Apr 4 21:35:08 2009
@@ -95,7 +95,10 @@
<field name="binNumber" title="${uiLabelMap.ProductBinNumber}"/>
<field name="locationSeqId" title="${uiLabelMap.ProductFacilityLocation}">
<lookup target-form-name="LookupFacilityLocation">
- <sub-hyperlink use-when="locationSeqId!=null" target="EditFacilityLocation?facilityId=${facilityId}&locationSeqId=${locationSeqId}"></sub-hyperlink>
+ <sub-hyperlink use-when="locationSeqId!=null" target="EditFacilityLocation">
+ <parameter param-name="facilityId" from-field="facilityId"/>
+ <parameter param-name="locationSeqId" from-field="locationSeqId"/>
+ </sub-hyperlink>
</lookup>
</field>
<field name="partyId">
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=762015&r1=762014&r2=762015&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TaskForms.xml Sat Apr 4 21:35:08 2009
@@ -501,10 +501,18 @@
<field name="noteParty" title="${uiLabelMap.CommonBy}"><display description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, noteParty, true)} at ${bsh: org.ofbiz.base.util.UtilDateTime.timeStampToString(noteDateTime, "dd-MM-yyyy HH:mm", TimeZone.getDefault(), context.get("locale"))}"/></field>
<field name="Private/Public" widget-style="buttontext" title="${uiLabelMap.ProjectMgrPrivateOrPublic}" use-when="internalNote.equals("N")">
- <hyperlink target="updateTaskNote?workEffortId=${workEffortId}&noteId=${noteId}&internalNote=Y" description="${uiLabelMap.OrderNotesPrivate}"></hyperlink>
+ <hyperlink target="updateTaskNote" description="${uiLabelMap.OrderNotesPrivate}">
+ <parameter param-name="workEffortId" from-field="workEffortId"/>
+ <parameter param-name="noteId" from-field="noteId"/>
+ <parameter param-name="internalNote" value="Y"/>
+ </hyperlink>
</field>
<field name="Private/Public" widget-style="buttontext" title="${uiLabelMap.ProjectMgrPrivateOrPublic}" use-when="internalNote.equals("Y")">
- <hyperlink target="updateTaskNote?workEffortId=${workEffortId}&noteId=${noteId}&internalNote=N" description="${uiLabelMap.OrderNotesPublic}"></hyperlink>
+ <hyperlink target="updateTaskNote" 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>
<form name="AddTaskNote" extends="AddWorkEffortNote" extends-resource="component://workeffort/widget/WorkEffortForms.xml" type="single" target="createTaskNote"/>