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:06:21 UTC
svn commit: r762010 - in /ofbiz/trunk: applications/accounting/widget/
applications/accounting/widget/ap/ applications/content/webapp/content/cms/
applications/content/widget/compdoc/ applications/order/widget/ordermgr/
applications/party/widget/partym...
Author: jleroux
Date: Sat Apr 4 21:06:20 2009
New Revision: 762010
URL: http://svn.apache.org/viewvc?rev=762010&view=rev
Log:
Securing URLs, link element in screens and menus : 32th set + tabs to 4 spaces
Begin to end with non regular formattings
Modified:
ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml
ofbiz/trunk/applications/accounting/widget/ap/Menus.xml
ofbiz/trunk/applications/content/webapp/content/cms/CMSMenus.xml
ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml
ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml
ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml
ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml
ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
Modified: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml?rev=762010&r1=762009&r2=762010&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml Sat Apr 4 21:06:20 2009
@@ -18,14 +18,14 @@
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="ListGlAccountOrganization" list-name="listIt" target="" title="" type="list" paginate-target="ListGlAccountOrganization"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<set field="entityName" value="GlAccountOrganization"/>
- <set field="noConditionFind" value="Y"/>
+ <set field="noConditionFind" value="Y"/>
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" from-field="entityName"/>
@@ -40,21 +40,21 @@
</form>
<!-- Displays the form for assigning accounts to a party or company -->
- <!-- TODO: Localize field names -->
+ <!-- TODO: Localize field names -->
<form name="AssignGlAccount" type="single" target="createGlAccountOrganization" title="" default-map-name="account"
header-row-style="header-row" default-table-style="basic-table">
<field name="glAccountId">
<drop-down>
- <entity-options entity-name="GlAccount" description="${glAccountId} ${accountName}">
+ <entity-options entity-name="GlAccount" description="${glAccountId} ${accountName}">
<entity-order-by field-name="glAccountId"/>
</entity-options>
</drop-down>
</field>
<!-- <field name="organizationPartyId" title="Party" -->
- <field name="partyId" parameter-name="organizationPartyId">
+ <field name="partyId" parameter-name="organizationPartyId">
<drop-down>
- <entity-options entity-name="PartyRoleAndPartyDetail" description="${partyId}" >
- <!-- entity-options entity-name="PartyRoleAndPartyDetail" description="${organizationPartyId}" -->
+ <entity-options entity-name="PartyRoleAndPartyDetail" description="${partyId}" >
+ <!-- entity-options entity-name="PartyRoleAndPartyDetail" description="${organizationPartyId}" -->
<entity-constraint name="roleTypeId" value="INTERNAL_ORGANIZATIO"/>
<entity-order-by field-name="partyId"/>
</entity-options>
@@ -67,11 +67,11 @@
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<actions>
<set field="entityName" value="GlAccount"/>
- <set field="noConditionFind" value="Y"/>
+ <set field="noConditionFind" value="Y"/>
<service service-name="performFind" result-map="result" result-map-list="listIt">
<field-map field-name="inputFields" from-field="parameters"/>
<field-map field-name="entityName" from-field="entityName"/>
- <field-map field-name="noConditionFind" value="Y"/>
+ <field-map field-name="noConditionFind" value="Y"/>
</service>
<property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" />
</actions>
@@ -95,7 +95,7 @@
header-row-style="header-row" default-table-style="basic-table">
<alt-target use-when="glAccount==null" target="createGlAccount"/>
<auto-fields-service service-name="updateGlAccount" map-name=""/>
-
+
<field use-when="glAccount!=null" name="glAccountId" tooltip="${uiLabelMap.AccountingNotModificationRecrationGlAccount}"><display/></field>
<field use-when="glAccount==null&&glAccountId!=null" name="glAccountId" tooltip="${uiLabelMap.AccountingCouldNotFindGlAccount} [${glAccountId}]"><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 -->
@@ -105,7 +105,7 @@
<drop-down allow-empty="false">
<entity-options entity-name="GlAccountType" description="${description}">
<entity-order-by field-name="description"/>
- </entity-options>
+ </entity-options>
</drop-down>
</field>
<field name="glAccountClassId">
@@ -150,7 +150,7 @@
<parameter param-name="acctgTransId" from-field="acctgTransId"/>
</hyperlink>
</field>
- <field name="acctgTransEntrySeqId"><display/></field>
+ <field name="acctgTransEntrySeqId"><display/></field>
<field name="glAccountId">
<display-entity entity-name="GlAccount" description="${accountName}">
<sub-hyperlink target="ListGlAccountEntries" description="[${glAccountId}]">
@@ -193,8 +193,10 @@
<field name="createdByUserLogin"><display/></field>
<field name="glAccountId">
<display-entity entity-name="GlAccount" description="${accountName}">
- <sub-hyperlink target="ListGlAccountEntries?glAccountId=${glAccountId}&amp;organizationPartyId=${organizationPartyId}"
- description="[${glAccountId}]"/>
+ <sub-hyperlink target="ListGlAccountEntries" description="[${glAccountId}]">
+ <parameter param-name="glAccountId" from-field="glAccountId"/>
+ <parameter param-name="organizationPartyId" from-field="organizationPartyId"/>
+ </sub-hyperlink>
</display-entity>
</field>
<field name="reconciledBalance"><display/></field>
@@ -232,8 +234,8 @@
<field name="rateAmount"><display type="currency" currency="${rateCurrencyUomId}"/></field>
<field name="delete" title="${uiLabelMap.CommonDelete}"><submit/></field>
</form>
-
- <form name="updateRateAmount" type="single" target="updateRateAmount" default-service-name="updateRateAmount"
+
+ <form name="updateRateAmount" type="single" target="updateRateAmount" default-service-name="updateRateAmount"
header-row-style="header-row" default-table-style="basic-table">
<actions>
<property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD" />
@@ -274,4 +276,4 @@
</field>
<field name="submitButton" title="${uiLabelMap.AccountingUpdateRateAmount}"><submit/></field>
</form>
-</forms>
\ No newline at end of file
+</forms>
Modified: ofbiz/trunk/applications/accounting/widget/ap/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/ap/Menus.xml?rev=762010&r1=762009&r2=762010&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/ap/Menus.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/ap/Menus.xml Sat Apr 4 21:06:20 2009
@@ -35,18 +35,38 @@
<menu-item name="listReport" title="${uiLabelMap.CommonShowAll} ${uiLabelMap.AccountingReports}"><link target="listReports"></link></menu-item>
</menu>
<menu name="ApMainPaymentTypeMenu" type="simple" default-selected-style="selected">
- <menu-item name="findPayment" title="${uiLabelMap.AccountingShowPayments} ${paymentType.description}"><link target="findPayments?lookupFlag=Y&paymentTypeId=${paymentType.paymentTypeId}"></link></menu-item>
+ <menu-item name="findPayment" title="${uiLabelMap.AccountingShowPayments} ${paymentType.description}">
+ <link target="findPayments">
+ <parameter param-name="lookupFlag" from-field="Y"/>
+ </link>
+ </menu-item>
</menu>
<menu name="ApMainPaymentMethodTypeMenu" type="simple" default-selected-style="selected">
- <menu-item name="findPayment" title="${uiLabelMap.AccountingShowPayments} ${paymentMethodType.description}"><link target="findPayments?lookupFlag=Y&paymentMethodTypeId=${paymentMethodType.paymentMethodTypeId}"></link></menu-item>
+ <menu-item name="findPayment" title="${uiLabelMap.AccountingShowPayments} ${paymentMethodType.description}">
+ <link target="findPayments">
+ <parameter param-name="lookupFlag" from-field="Y"/>
+ </link>
+ </menu-item>
</menu>
<menu name="ApMainPaymentStatusMenu" type="simple" default-selected-style="selected">
- <menu-item name="findPayment" title="${uiLabelMap.AccountingShowPayments} ${paymentsStatus.description}"><link target="findPayments?lookupFlag=Y&statusId=${paymentsStatus.statusId}"></link></menu-item>
+ <menu-item name="findPayment" title="${uiLabelMap.AccountingShowPayments} ${paymentsStatus.description}">
+ <link target="findPayments">
+ <parameter param-name="lookupFlag" from-field="Y"/>
+ </link>
+ </menu-item>
</menu>
<menu name="ApMainInvoiceTypeMenu" type="simple" default-selected-style="selected">
- <menu-item name="findInvoice" title="${uiLabelMap.AccountingShowInvoices} ${invoiceType.description}"><link target="findInvoices?lookupFlag=Y&invoiceTypeId=${invoiceType.invoiceTypeId}"></link></menu-item>
+ <menu-item name="findInvoice" title="${uiLabelMap.AccountingShowInvoices} ${invoiceType.description}">
+ <link target="findInvoices">
+ <parameter param-name="lookupFlag" from-field="Y"/>
+ </link>
+ </menu-item>
</menu>
<menu name="ApMainInvoiceStatusMenu" type="simple" default-selected-style="selected">
- <menu-item name="findInvoice" title="${uiLabelMap.AccountingShowInvoices} ${invoicesStatus.description}"><link target="findInvoices?lookupFlag=Y&statusId=${invoicesStatus.statusId}"></link></menu-item>
+ <menu-item name="findInvoice" title="${uiLabelMap.AccountingShowInvoices} ${invoicesStatus.description}">
+ <link target="findInvoices">
+ <parameter param-name="lookupFlag" from-field="Y"/>
+ </link>
+ </menu-item>
</menu>
-</menus>
\ No newline at end of file
+</menus>
Modified: ofbiz/trunk/applications/content/webapp/content/cms/CMSMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/cms/CMSMenus.xml?rev=762010&r1=762009&r2=762010&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/cms/CMSMenus.xml (original)
+++ ofbiz/trunk/applications/content/webapp/content/cms/CMSMenus.xml Sat Apr 4 21:06:20 2009
@@ -18,7 +18,7 @@
under the License.
-->
-<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
<menu name="cms" default-menu-item-name="content" default-permission-operation="HAS_AUTHOR_ROLE|CONTENT_ADMIN"
default-permission-entity-action="_ADMIN" default-associated-content-id="${userLogin.userLoginId}"
@@ -53,7 +53,13 @@
<menu-item name="contentfind" title="${uiLabelMap.ContentContent}" >
- <link id="CMSContentFind" target="CMSContentFind?listSize=${content.listSize}&highIndex=${content.highIndex}&lowIndex=${content.lowIndex}&viewSize=${content.viewSize}&viewIndex=${content.viewIndex}&queryString=${content.queryString}" >
+ <link id="CMSContentFind" target="CMSContentFind" >
+ <parameter param-name="listSize" from-field="content.listSize"/>
+ <parameter param-name="highIndex" from-field="content.highIndex"/>
+ <parameter param-name="lowIndex" from-field="content.lowIndex"/>
+ <parameter param-name="viewSize" from-field="content.viewSize"/>
+ <parameter param-name="viewIndex" from-field="content.viewIndex"/>
+ <parameter param-name="queryString" from-field="content.queryString"/>
</link>
</menu-item>
<menu-item name="contentedit" title="${uiLabelMap.CommonEdit}" >
Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml?rev=762010&r1=762009&r2=762010&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocForms.xml Sat Apr 4 21:06:20 2009
@@ -18,7 +18,7 @@
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">
<!-- CompDoc forms -->
@@ -35,7 +35,7 @@
</drop-down>
</field>
<!-- <field name="rootonly" map-name="dummy" title="Root CompDocs Only"><check/></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="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
<form name="ListCompDoc" type="list" list-name="listIt" target="" paginate-target="FindCompDoc"
@@ -55,7 +55,7 @@
<parameter param-name="rootContentId" from-field="caContentIdTo"/>
<parameter param-name="caContentAssocTypeId" from-field="caContentAssocTypeId"/>
<parameter param-name="caFromDate" from-field="caFromDate"/>
- </hyperlink>
+ </hyperlink>
</field>
<field name="edit" use-when=""COMPDOC_INSTANCE".equals(contentTypeId)" widget-style="buttontext">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditRootCompDoc">
@@ -63,7 +63,7 @@
<parameter param-name="rootContentId" from-field="caContentIdTo"/>
<parameter param-name="caContentAssocTypeId" from-field="caContentAssocTypeId"/>
<parameter param-name="caFromDate" from-field="caFromDate"/>
- </hyperlink>
+ </hyperlink>
</field>
<field name="edit" use-when=""TEMPLATE".equals(contentTypeId)" widget-style="buttontext">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditChildCompDoc">
@@ -71,7 +71,7 @@
<parameter param-name="rootContentId" from-field="caContentIdTo"/>
<parameter param-name="caContentAssocTypeId" from-field="caContentAssocTypeId"/>
<parameter param-name="caFromDate" from-field="caFromDate"/>
- </hyperlink>
+ </hyperlink>
</field>
<field name="edit" use-when=""DOCUMENT".equals(contentTypeId)" widget-style="buttontext">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditChildCompDoc">
@@ -79,20 +79,20 @@
<parameter param-name="rootContentId" from-field="caContentIdTo"/>
<parameter param-name="caContentAssocTypeId" from-field="caContentAssocTypeId"/>
<parameter param-name="caFromDate" from-field="caFromDate"/>
- </hyperlink>
+ </hyperlink>
</field>
<field name="tree" use-when=""COMPDOC_TEMPLATE".equals(contentTypeId)" widget-style="buttontext">
<hyperlink also-hidden="false" description="${uiLabelMap.ContentTree}" target="ViewCompDocTemplateTree">
<parameter param-name="rootContentId" from-field="contentId"/>
- </hyperlink>
+ </hyperlink>
</field>
<field name="tree" use-when=""COMPDOC_INSTANCE".equals(contentTypeId)" widget-style="buttontext">
<hyperlink also-hidden="false" description="${uiLabelMap.ContentTree}" target="ViewCompDocInstanceTree">
<parameter param-name="rootContentId" from-field="contentId"/>
- </hyperlink>
+ </hyperlink>
</field>
</form>
-
+
<form name="ListCompDocInstances" target="" type="list" list-name="compDocFindList" paginate-target="ListCompDocInstances"
odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
<field name="contentId"><display/></field>
@@ -104,21 +104,21 @@
<field name="editTemplate" title="${uiLabelMap.CommonEdit}" widget-style="buttontext">
<hyperlink also-hidden="false" description="${uiLabelMap.CommonEdit}" target="EditRootCompDoc">
<parameter param-name="rootContentId" from-field="contentId"/>
- </hyperlink>
+ </hyperlink>
</field>
<field name="templateTree" widget-style="buttontext">
<hyperlink also-hidden="false" description="${uiLabelMap.ContentTree}" target="ViewCompDocInstanceTree">
<parameter param-name="rootContentId" from-field="contentId"/>
- </hyperlink>
+ </hyperlink>
</field>
</form>
-
+
<!-- ContentRevision forms -->
<form name="EditContentRevision" default-map-name="contentRevision" target="updateContentRevision" type="single"
header-row-style="header-row" default-table-style="basic-table">
<alt-target target="createContentRevision" use-when="contentRevision==null"/>
<auto-fields-entity entity-name="ContentRevision"/>
-
+
<field name="rootContentId" map-name="empty" widget-style="buttontext"><hidden/></field>
<field name="rootContentRevisionSeqId" map-name="empty" widget-style="buttontext"><hidden/></field>
<field name="contentId" widget-style="buttontext"><lookup target-form-name="LookupContent"/></field>
@@ -177,13 +177,13 @@
</hyperlink>
</field>
</form>
-
+
<!-- ContentRevisionItem forms -->
<form name="EditContentRevisionItem" default-map-name="contentRevisionItem" target="updateContentRevisionItem" type="single"
header-row-style="header-row" default-table-style="basic-table">
<alt-target target="createContentRevisionItem" use-when="contentRevisionItem==null"/>
<auto-fields-entity entity-name="ContentRevisionItem"/>
-
+
<field name="rootContentId" map-name="empty" widget-style="buttontext"><hidden/></field>
<field name="rootContentRevisionSeqId" map-name="empty" widget-style="buttontext"><hidden/></field>
<field name="contentId" widget-style="buttontext"><lookup target-form-name="LookupContent"/></field>
@@ -296,7 +296,11 @@
<field name="comments" widget-style="inputBox"><textarea cols="30" rows="3"/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit/></field>
<field name="deleteButton" title="${uiLabelMap.CommonDelete}" widget-style="smallSubmit">
- <hyperlink target="removeContentApproval?contentApprovalId=${contentApprovalId}&rootContentId=${rootContentId}&rootContentRevisionSeqId=${rootContentRevisionSeqId}" description="${uiLabelMap.CommonDelete}"></hyperlink>
+ <hyperlink target="removeContentApproval" description="${uiLabelMap.CommonDelete}">
+ <parameter param-name="contentApprovalId" from-field="contentApprovalId"/>
+ <parameter param-name="rootContentId" from-field="rootContentId"/>
+ <parameter param-name="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId"/>
+ </hyperlink>
</field>
</form>
@@ -326,7 +330,7 @@
<field name="comments" widget-style="inputBox"><text size="40"/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit" use-when=""COMPDOC_INSTANCE".equals(contentTypeId)"><submit/></field>
</form>
-
+
<form name="AddRootCompDocInstance" default-map-name="" type="single" target="genCompDocInstance"
header-row-style="header-row" default-table-style="basic-table">
<field name="contentName"><text/></field>
@@ -347,7 +351,7 @@
<field name="contentTypeId"><hidden value="COMPDOC_INSTANCE"/></field>
<field name="submitButton" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit button-type="button"/></field>
</form>
-
+
<form name="AddRootCompDocTemplate" default-map-name="" type="single" target="createRootCompDocTemplate"
header-row-style="header-row" default-table-style="basic-table">
<field name="contentName" title="${uiLabelMap.ContentCompDocTemplateName}"><text/></field>
@@ -379,7 +383,7 @@
<field name="fromDate"><date-time default-value="${nowTimestamp}"/></field>
<field name="thruDate"><date-time/></field>
<field name="sequenceNum"><text/></field>
-
+
<field name="mimeTypeId" title="${uiLabelMap.ContentDocumentType}" use-when=""DOCUMENT".equals(contentTypeId) && "SURVEY".equals(templateDataResourceTypeId)">
<hidden value="application/vnd.ofbiz.survey.response"/>
</field>
@@ -419,7 +423,7 @@
<field name="fromDate" widget-style="tabletext"><display/></field>
<field name="thruDate"><date-time/></field>
<field name="sequenceNum"><text/></field>
-
+
<field name="mimeTypeId" map-name="dataResource" widget-style="tabletext"
use-when=""TEMPLATE".equals(contentTypeId)">
<drop-down allow-empty="false">
@@ -445,22 +449,24 @@
</field>
<!-- <field name="mimeTypeId" map-name="dataResource" title="Document Type" widget-style="tabletext"><display/></field> -->
<!-- <field name="contentTypeId" map-name="content" title="Content Type" widget-style="tabletext"><display/></field> -->
-
+
<field name="relatedDetailId" map-name="dataResource" title="${uiLabelMap.ContentSurvey}"
use-when="dataResource!=null && "SURVEY".equals(dataResource.getString("dataResourceTypeId"))">
<lookup target-form-name="LookupSurvey">
- <sub-hyperlink target="EditSurvey?surveyId=${dataResource.relatedDetailId}" description="${uiLabelMap.PageTitleEditSurvey}" link-style="buttontext"
- use-when="dataResource.get("relatedDetailId")!=null"/>
+ <sub-hyperlink target="EditSurvey" description="${uiLabelMap.PageTitleEditSurvey}" link-style="buttontext" 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="${uiLabelMap.ContentSurveyResponse}"
- use-when="dataResource!=null && "SURVEY_RESPONSE".equals(dataResource.getString("dataResourceTypeId"))">
+ <field name="relatedDetailId" map-name="dataResource" title="${uiLabelMap.ContentSurveyResponse}"
+ use-when="dataResource!=null && "SURVEY_RESPONSE".equals(dataResource.getString("dataResourceTypeId"))">
<lookup target-form-name="LookupSurveyResponse">
- <sub-hyperlink target="EditSurveyResponse?surveyResponseId=${dataResource.relatedDetailId}"
- description="${uiLabelMap.PageTitleEditSurveyResponse}" link-style="buttontext" use-when="dataResource!=null && dataResource.get("relatedDetailId")!=null"/>
+ <sub-hyperlink target="EditSurveyResponse" description="${uiLabelMap.PageTitleEditSurveyResponse}" link-style="buttontext" use-when="dataResource!=null && dataResource.get("relatedDetailId")!=null">
+ <parameter param-name="surveyResponseId" from-field="dataResource.relatedDetailId"/>
+ </sub-hyperlink>
</lookup>
</field>
- <field name="addSurveyResponse" map-name="dummy" widget-style="buttontext"
+ <field name="addSurveyResponse" map-name="dummy" widget-style="buttontext"
use-when=""DOCUMENT".equals(contentTypeId) && dataResource!=null && dataResource.get("relatedDetailId")==null && templateDataResource!=null && templateDataResource.get("relatedDetailId")!=null">
<hyperlink description="${uiLabelMap.CommonCreate} ${uiLabelMap.ContentSurveyResponse} (${uiLabelMap.CommonFor} ${uiLabelMap.ContentSurvey} ${templateDataResource.relatedDetailId})" target="EditSurveyResponse" also-hidden="false" target-window="_blank">
<parameter param-name="surveyId" from-field="templateDataResource.relatedDetailId"/>
@@ -468,7 +474,7 @@
<parameter param-name="rootContentId" from-field="rootContentId"/>
</hyperlink>
</field>
- <field name="updateSurveyResponse" map-name="dummy" widget-style="buttontext"
+ <field name="updateSurveyResponse" map-name="dummy" widget-style="buttontext"
use-when=""DOCUMENT".equals(contentTypeId) && dataResource!=null && dataResource.get("relatedDetailId")!=null && templateDataResource!=null && templateDataResource.get("relatedDetailId")!=null">
<hyperlink description="${uiLabelMap.CommonUpdate} ${uiLabelMap.ContentSurveyResponse} (${uiLabelMap.CommonFor} ${uiLabelMap.ContentSurvey} ${templateDataResource.relatedDetailId}, Response ${dataResource.relatedDetailId})" target="EditSurveyResponse" also-hidden="false" target-window="_blank">
<parameter param-name="surveyId" from-field="templateDataResource.relatedDetailId"/>
@@ -477,7 +483,7 @@
<parameter param-name="rootContentId" from-field="rootContentId"/>
</hyperlink>
</field>
-
+
<field name="objectInfo" map-name="dataResource" widget-style="tabletext"
use-when=""DOCUMENT".equals(contentTypeId) && mimeTypeId!=null && !"application/vnd.ofbiz.survey".equals(mimeTypeId)">
<display also-hidden="false"/>
@@ -497,14 +503,14 @@
<field name="fromDate" title="${uiLabelMap.CommonFromDate}" widget-style="tabletext"><display/></field>
<field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display/></field>
<field name="sequenceNum" title="${uiLabelMap.CommonSequenceNum}"><display/></field>
-
+
<field name="mimeTypeId" map-name="dataResource" title="${uiLabelMap.ContentDocumentType}" widget-style="tabletext">
<display-entity entity-name="MimeType" key-field-name="mimeTypeId" description="${description}"/>
</field>
- <field name="relatedDetailId" map-name="dataResource" title="${uiLabelMap.ContentSurvey}" use-when="dataResource!=null&&"SURVEY".equals(dataResource.getString("dataResourceTypeId"))">
+ <field name="relatedDetailId" map-name="dataResource" title="${uiLabelMap.ContentSurvey}" use-when="dataResource!=null&&"SURVEY".equals(dataResource.getString("dataResourceTypeId"))">
<display/>
</field>
- <field name="relatedDetailId" map-name="dataResource" title="${uiLabelMap.ContentSurveyResponse}" use-when="dataResource!=null&&"SURVEY_RESPONSE".equals(dataResource.getString("dataResourceTypeId"))&&dataResource.get("relatedDetailId")!=null">
+ <field name="relatedDetailId" map-name="dataResource" title="${uiLabelMap.ContentSurveyResponse}" use-when="dataResource!=null&&"SURVEY_RESPONSE".equals(dataResource.getString("dataResourceTypeId"))&&dataResource.get("relatedDetailId")!=null">
<display/>
</field>
</form>
@@ -514,9 +520,9 @@
header-row-style="header-row" default-table-style="basic-table">
<auto-fields-entity entity-name="ContentRevision"/>
<auto-fields-entity entity-name="ContentRevisionItem"/>
-
+
<field name="contentId" widget-style="buttontext"><text/></field>
- <field name="contentRevisionSeqId"><hidden/></field>
+ <field name="contentRevisionSeqId"><hidden/></field>
<field name="committedByPartyId" widget-style="inputBox"></field>
<field name="comments" widget-style="inputBox"></field>
<field name="itemContentId" widget-style="inputBox"></field>
@@ -559,7 +565,7 @@
<field name="caContentIdTo" entry-name="contentIdTo" map-name="contentAssoc"><hidden/></field>
<field name="caContentAssocTypeId"><hidden value="COMPDOC_PART"/></field>
<field name="caFromDate" entry-name="fromDate" map-name="contentAssoc"><hidden/></field>
-
+
<field name="contentId" map-name="contentAssoc"><hidden/></field>
<field name="dataResourceId" map-name="dataResource"><hidden/></field>
<field name="dataResourceTypeId" map-name="dataResource"><hidden/></field>
@@ -569,13 +575,13 @@
<field name="rootContentId"><hidden/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpload}" widget-style="smallSubmit"><submit/></field>
</form>
-
+
<form name="UploadCompDocPdf2Survey" type="upload" target="persistCompDocPdf2Survey"
header-row-style="header-row" default-table-style="basic-table">
<field name="caContentIdTo" entry-name="contentIdTo" map-name="contentAssoc"><hidden/></field>
<field name="caContentAssocTypeId"><hidden value="COMPDOC_PART"/></field>
<field name="caFromDate" entry-name="fromDate" map-name="contentAssoc"><hidden/></field>
-
+
<field name="contentId" map-name="contentAssoc"><hidden/></field>
<field name="dataResourceId" map-name="dataResource"><hidden/></field>
<field name="dataResourceTypeId" map-name="dataResource"><hidden/></field>
@@ -586,14 +592,14 @@
<field name="rootContentId"><hidden/></field>
<field name="submitButton" title="${uiLabelMap.CommonUpload}" widget-style="smallSubmit"><submit/></field>
</form>
-
+
<form name="EditCompDocTextContent" type="single" target="uploadCompDocContent"
header-row-style="header-row" default-table-style="basic-table">
<field name="rootContentId" map-name="dummy"><hidden/></field>
<field name="caContentIdTo" map-name="parameters"><hidden/></field>
<field name="caContentAssocTypeId" map-name="parameters"><hidden/></field>
<field name="caFromDate" map-name="parameters"><hidden/></field>
-
+
<field name="contentId" map-name="content"><hidden/></field>
<field name="dataResourceId" map-name="dataResource"><hidden/></field>
<field name="dataResourceTypeId" map-name="dataResource"><hidden/></field>
@@ -608,7 +614,7 @@
<field name="caContentIdTo" map-name="parameters"><hidden/></field>
<field name="caContentAssocTypeId" map-name="parameters"><hidden/></field>
<field name="caFromDate" map-name="parameters"><hidden/></field>
-
+
<field name="contentId" map-name="content"><hidden/></field>
<field name="dataResourceId" map-name="dataResource"><hidden/></field>
<field name="dataResourceTypeId" map-name="dataResource"><hidden/></field>
@@ -616,4 +622,4 @@
<field name="objectInfo" title="${uiLabelMap.ContentSurveySurveyId}"><lookup target-form-name="LookupSurvey"/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit/></field>
</form>
-</forms>
\ No newline at end of file
+</forms>
Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml?rev=762010&r1=762009&r2=762010&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml (original)
+++ ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml Sat Apr 4 21:06:20 2009
@@ -677,7 +677,11 @@
<widgets>
<container>
<label style="tableheadtext" text="${uiLabelMap.ContentCompDocRevisions} [${rootContentRevisionSeqId}], Latest is [${mostRecentRevisionSeqId}]"/>
- <link style="buttontext" text="${uiLabelMap.ContentLatest}" target="EditChildCompDoc?contentId=${contentId}&rootContentId=${rootContentId}&caFromDate=${fromDate}"></link>
+ <link style="buttontext" text="${uiLabelMap.ContentLatest}" target="EditChildCompDoc">
+ <parameter param-name="contentId" from-field="contentId"/>
+ <parameter param-name="rootContentId" from-field="rootContentId"/>
+ <parameter param-name="caFromDate" from-field="fromDate"/>
+ </link>
<include-screen name="ContentViewLink"/>
</container>
<include-form name="ViewChildCompDoc" location="component://content/widget/compdoc/CompDocForms.xml"/>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml?rev=762010&r1=762009&r2=762010&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/OrderReturnScreens.xml Sat Apr 4 21:06:20 2009
@@ -59,7 +59,7 @@
<section>
<widgets>
<container>
- <link style="buttontext" target="returnMain" text="${uiLabelMap.OrderCreateNewReturn}"></link>
+ <link style="buttontext" target="returnMain" text="${uiLabelMap.OrderCreateNewReturn}"/>
</container>
<include-form name="FindReturns" location="component://order/webapp/ordermgr/return/ReturnForms.xml"/>
<include-form name="ListReturns" location="component://order/webapp/ordermgr/return/ReturnForms.xml"/>
Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml?rev=762010&r1=762009&r2=762010&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml (original)
+++ ofbiz/trunk/applications/party/widget/partymgr/PartyClassificationScreens.xml Sat Apr 4 21:06:20 2009
@@ -106,7 +106,7 @@
<container style="screenlet-body">
<section>
<widgets>
- <container><link target="EditPartyClassificationGroup" style="smallSubmit" text="${uiLabelMap.PartyCreateNewPartyClassificationGroup}"></link></container>
+ <container><link target="EditPartyClassificationGroup" style="smallSubmit" text="${uiLabelMap.PartyCreateNewPartyClassificationGroup}"/></container>
<container style="screenlet-body">
<include-form name="ListPartyClassificationGroups" location="component://party/widget/partymgr/PartyClassificationForms.xml"/>
</container>
Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=762010&r1=762009&r2=762010&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Sat Apr 4 21:06:20 2009
@@ -18,12 +18,12 @@
under the License.
-->
-<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd">
<screen name="main-decorator">
<section>
<actions>
- <!-- base/top/specific map first, then more common map added for shared labels -->
+ <!-- base/top/specific map first, then more common map added for shared labels -->
<property-map resource="MyPortalUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
@@ -51,7 +51,7 @@
</widgets>
</section>
</screen>
-
+
<screen name="CommonPartyDecorator">
<section>
<actions>
@@ -75,7 +75,7 @@
</widgets>
</section>
</screen>
-
+
<screen name="CommonCalendarDecorator">
<section>
<widgets>
@@ -83,7 +83,7 @@
</widgets>
</section>
</screen>
-
+
<screen name="CommonMyTimeDecorator">
<section>
<widgets>
@@ -93,7 +93,7 @@
</widgets>
</section>
</screen>
-
+
<screen name="CommonCommunicationEventDecorator">
<section>
<actions>
@@ -112,7 +112,7 @@
</widgets>
</section>
</screen>
-
+
<screen name="CommonMyCommunicationEventDecorator">
<section>
<actions>
@@ -131,7 +131,7 @@
</widgets>
</section>
</screen>
-
+
<screen name="CommonMyTaskDecorator">
<section>
<widgets>
@@ -157,13 +157,13 @@
</widgets>
</section>
</screen>
-
+
<!--New Register Person-->
<screen name="newRegisterLogin">
<section>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
+ <decorator-section name="body">
<section>
<condition>
<not><if-empty field="parameters.partyId"/></not>
@@ -172,10 +172,10 @@
<set field="partyId" from-field="parameters.partyId"/>
</actions>
<widgets>
- <label style="h2" text="${uiLabelMap.MyPortalRegisterComplete}"/><link target="main" style="h2" text="${uiLabelMap.CommonBeLogged}"></link>
+ <label style="h2" text="${uiLabelMap.MyPortalRegisterComplete}"/><link target="main" style="h2" text="${uiLabelMap.CommonBeLogged}"/>
<screenlet title="${uiLabelMap.PartyPersonalInformation}">
<include-form name="ViewPartyPerson" location="component://myportal/widget/MyPortalForms.xml"/>
- </screenlet>
+ </screenlet>
</widgets>
<fail-widgets>
<container style="screenlet">
@@ -215,7 +215,7 @@
</widgets>
</section>
</screen>
-
+
<screen name="MyCompanyComms">
<section>
<widgets>
@@ -229,7 +229,7 @@
</widgets>
</section>
</screen>
-
+
<screen name="MyTimesheet">
<section>
<widgets>
@@ -242,7 +242,7 @@
</widgets>
</section>
</screen>
-
+
<screen name="MyCommunications">
<section>
<widgets>
@@ -281,4 +281,4 @@
</widgets>
</section>
</screen>
-</screens>
\ No newline at end of file
+</screens>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=762010&r1=762009&r2=762010&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Sat Apr 4 21:06:20 2009
@@ -239,7 +239,9 @@
<if-compare field="hasUpdatePermission" operator="equals" value="true"/>
</and>
</condition>
- <link target="copyProject?projectId=${projectId}"></link>
+ <link target="copyProject">
+ <parameter param-name="projectId" from-field="projectId"/>
+ </link>
</menu-item>
<menu-item name="schedule" title="${uiLabelMap.ProjectMgrSchedule}">
<condition>
@@ -251,7 +253,9 @@
<if-compare field="hasUpdatePermission" operator="equals" value="true"/>
</and>
</condition>
- <link target="scheduleProject?projectId=${projectId}"></link>
+ <link target="scheduleProject">
+ <parameter param-name="projectId" from-field="projectId"/>
+ </link>
</menu-item>
<menu-item name="copyProjectToTemplate" title="${uiLabelMap.ProjectMgrSaveAsTemplate}">
<condition>
@@ -262,7 +266,9 @@
<if-compare field="hasUpdatePermission" operator="equals" value="true"/>
</and>
</condition>
- <link target="copyProjectToTemplate?projectId=${projectId}"></link>
+ <link target="copyProjectToTemplate">
+ <parameter param-name="projectId" from-field="projectId"/>
+ </link>
</menu-item>
<menu-item name="close" title="${uiLabelMap.CommonClose}">
<condition>
@@ -504,16 +510,24 @@
</link>
</menu-item>
<menu-item name="listResourcesProject" title="${uiLabelMap.ProjectMgrProjects}">
- <link target="listResourcesProject?partyId=${partyId}"></link>
+ <link target="listResourcesProject">
+ <parameter param-name="partyId" from-field="partyId"/>
+ </link>
</menu-item>
<menu-item name="listResourcesTask" title="${uiLabelMap.ProjectMgrTasks}">
- <link target="listResourcesTask?partyId=${partyId}"></link>
+ <link target="listResourcesTask">
+ <parameter param-name="partyId" from-field="partyId"/>
+ </link>
</menu-item>
<menu-item name="EditPartyRates" title="${uiLabelMap.ProjectMgrRates}">
- <link target="EditPartyRates?partyId=${partyId}"></link>
+ <link target="EditPartyRates">
+ <parameter param-name="partyId" from-field="partyId"/>
+ </link>
</menu-item>
<menu-item name="ListBillingHours" title="${uiLabelMap.ProjectMgrBilling}">
- <link target="ListResourceBillingHours?partyId=${partyId}"></link>
+ <link target="ListResourceBillingHours">
+ <parameter param-name="partyId" from-field="partyId"/>
+ </link>
</menu-item>
</menu>
<menu name="RequestTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">