svn commit: r759700 - in /ofbiz/trunk: applications/accounting/widget/ applications/party/webapp/partymgr/communication/ specialpurpose/mypage/widget/ specialpurpose/myportal/widget/ specialpurpose/projectmgr/widget/forms/

Author: jleroux
Date: Sun Mar 29 14:42:55 2009
New Revision: 759700

URL: http://svn.apache.org/viewvc?rev=759700&view=rev
Log:
Fix some bugs introduced by recent work to secure URLs in XML files
(Also some trailing blanks removed by chance)

Should be all clear now, waiting for inevitable typos or worse...

Modified:
    ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
    ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml
    ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
    ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
    ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
    ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml

Modified: ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml?rev=759700&r1=759699&r2=759700&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/FinAccountForms.xml Sun Mar 29 14:42:55 2009
@@ -20,7 +20,7 @@
 
 <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
-    
+
     <form name="FindFinAccounts" type="single" target="FindFinAccount"
         header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-entity entity-name="FinAccount" default-field-type="find"/>
@@ -48,9 +48,11 @@
             </service>
         </actions>
         <auto-fields-entity entity-name="FinAccount" default-field-type="display"/>
-        field name="finAccountId"> <hyperlink  description="${finAccountId}" target="EditFinAccount">
+        <field name="finAccountId">
+            <hyperlink  description="${finAccountId}" target="EditFinAccount">
                 <parameter param-name="finAccountId" from-field="finAccountId"/>
-            </field name="finAccountId"> <hyperlink> </field>
+            </hyperlink>
+        </field>
         <field name="finAccountTypeId"><display-entity entity-name="FinAccountType" description="${description}"/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
             <hyperlink target="deleteFinAccount" description="${uiLabelMap.CommonDelete}" also-hidden="false">
@@ -58,21 +60,21 @@
             </hyperlink>
         </field>
     </form>
-    
+
     <form name="EditFinAccount" type="single" target="updateFinAccount" default-map-name="finAccount"
         header-row-style="header-row" default-table-style="basic-table">
         <actions>
             <entity-one entity-name="StatusItem" value-field="currentStatus" auto-field-map="false">
                 <field-map field-name="statusId" from-field="finAccount.statusId"/>
             </entity-one>
-        </actions>    
+        </actions>
         <alt-target use-when="finAccount==null" target="createFinAccount"/>
         <auto-fields-service service-name="updateFinAccount"/>
-        
+
         <field name="finAccountId" use-when="finAccountId!=null" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field>
         <field name="finAccountId" use-when="finAccount==null&amp;&amp;finAccountId==null"><ignored/></field>
         <field name="finAccountId" use-when="finAccount==null&amp;&amp;finAccountId!=null" tooltip="${uiLabelMap.CommonCannotBeFound}: [${finAccountId}]"><display also-hidden="false"/></field>
-        
+
         <field name="finAccountCode"><text size="20"/></field>
         <field name="finAccountPin"><text size="10"/></field>
         <field name="finAccountTypeId">
@@ -97,7 +99,7 @@
             <drop-down allow-empty="false">
                 <entity-options entity-name="StatusItem" description="${description}">
                     <entity-constraint name="statusTypeId" value="FINACCT_STATUS"/>
-                    
+
                 </entity-options>
             </drop-down>
         </field>
@@ -116,7 +118,7 @@
         <field name="actualBalance"><display/></field>
         <field name="availableBalance"><display/></field>
     </form>
-    
+
     <form name="ListFinAccountRoles" type="list"  list-name="finAccountRoles"  target="updateFinAccountRole" separate-columns="true"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
@@ -128,8 +130,8 @@
         <field name="finAccountId"><hidden/></field>
         <field name="roleTypeId"><display/></field>
         <field name="partyId"> <display/></field>
-        <field name="fromDate"><display/></field>        
-        <field name="thruDate"><date-time/></field>        
+        <field name="fromDate"><display/></field>
+        <field name="thruDate"><date-time/></field>
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
             <hyperlink target="deleteFinAccountRole?finAccountId=${finAccountId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}"
@@ -149,10 +151,10 @@
             </drop-down>
         </field>
         <field name="fromDate"><date-time/></field>
-        <field name="thruDate"><date-time/></field>  
+        <field name="thruDate"><date-time/></field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
-    
+
     <form name="ListFinAccountTransactions" type="list"  list-name="finAccountTransactions" separate-columns="true"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
@@ -170,7 +172,7 @@
         <auto-fields-service service-name="createFinAccountTrans"/>
         <field name="finAccountId"><hidden/></field>
         <field name="finAccountTransId"><hidden/></field>
-        <field name="finAccountTransTypeId">
+        <field name="finAccountTransTypeId">
             <drop-down no-current-selected-key="ADJUSTMENT">
                 <entity-options description="${description}" entity-name="FinAccountTransType">
                     <entity-order-by field-name="description"/>
@@ -178,13 +180,13 @@
             </drop-down>
         </field>
         <field name="partyId"><lookup target-form-name="LookupPartyName"/></field>
-        <field name="transactionDate"> <date-time/> </field>  
+        <field name="transactionDate"> <date-time/> </field>
         <field name="entryDate"><date-time/></field>
-        <field name="paymentId"><lookup target-form-name="LookupPayment"/></field>  
-        <field name="orderId"><lookup target-form-name="LookupOrderHeader"/></field>        
+        <field name="paymentId"><lookup target-form-name="LookupPayment"/></field>
+        <field name="orderId"><lookup target-form-name="LookupOrderHeader"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
-    
+
     <form name="ListFinAccountAuths" type="list"  list-name="finAccountauths"  target="expireFinAccountAuth" separate-columns="true"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
         <actions>
@@ -205,11 +207,11 @@
         header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createFinAccountAuth"/>
         <field name="finAccountId"><hidden/></field>
-        <field name="finAccountAuthId"><hidden/></field>
+        <field name="finAccountAuthId"><hidden/></field>
         <field name="amount"><text/></field>
-        <field name="authorizationDate"><date-time/></field>  
+        <field name="authorizationDate"><date-time/></field>
         <field name="fromDate"><date-time/></field>
-        <field name="thruDate"><date-time/></field>  
+        <field name="thruDate"><date-time/></field>
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
-</forms>    
\ No newline at end of file
+</forms>
\ No newline at end of file

Modified: ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml?rev=759700&r1=759699&r2=759700&view=diff
==============================================================================
--- ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml (original)
+++ ofbiz/trunk/applications/accounting/widget/GlobalGlAccountsForms.xml Sun Mar 29 14:42:55 2009
@@ -50,7 +50,7 @@
                 </entity-options>
             </drop-down>
         </field>
-        <!-- field name="organizationPartyId" title="Party" -->
+        <!-- <field name="organizationPartyId" title="Party" -->
         <field name="partyId" parameter-name="organizationPartyId">
             <drop-down>
                 <entity-options entity-name="PartyRoleAndPartyDetail" description="${partyId}" >

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=759700&r1=759699&r2=759700&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Sun Mar 29 14:42:55 2009
@@ -272,7 +272,7 @@
         header-row-style="header-row" default-table-style="basic-table">
         <field name="communicationEventId" position="1"><text-find/></field>
         <field name="parentCommEventId" position="2"><text-find/></field>
-        <!-- field name="origCommEventId"><text-find/></field-->
+        <!-- <field name="origCommEventId"><text-find/></field-->
         <field name="partyIdFrom" position="1" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonFrom}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="partyIdTo" position="2" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonTo}"><lookup target-form-name="LookupPartyName"/></field>
         <field name="partyId" position="2" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.PartyAnyRole}"><lookup target-form-name="LookupPartyName"/></field>
@@ -288,7 +288,7 @@
                 </entity-options>
             </drop-down>
         </field>
-        <!-- field name="contactMechTypeId">
+        <!-- <field name="contactMechTypeId">
             <drop-down allow-empty="true">
                 <entity-options description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/>
             </drop-down>
@@ -303,7 +303,7 @@
                 <entity-options description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/>
             </drop-down>
         </field-->
-        <!-- field name="custRequestId"><lookup size="20" target-form-name="LookupCustRequest"/></field-->
+        <!-- <field name="custRequestId"><lookup size="20" target-form-name="LookupCustRequest"/></field-->
         <!--field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><date-find/></field>
         <field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}"><date-find/></field>
         <field name="reasonEnumId">
@@ -557,7 +557,7 @@
         </field>
         <field name="contentTypeId"><display-entity entity-name="ContentType" description="${description}"/></field>
         <field name="fromDate"><display/></field>
-        <!-- field name="drDataResourceName" widget-style="smallSubmit">
+        <!-- <field name="drDataResourceName" widget-style="smallSubmit">
             <hyperlink also-hidden="false" description="${drDataResourceName} [${drDataResourceId}]" target="/content/control/EditDataResource" target-type="inter-app">
                 <parameter param-name="dataResourceId" from-field="drDataResourceId"/>
             </hyperlink>

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml?rev=759700&r1=759699&r2=759700&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml Sun Mar 29 14:42:55 2009
@@ -44,7 +44,7 @@
             </hyperlink>
         </field>
         <!-- better set to complete on the timesheet -->
-        <!-- field name="toComplete" title="${uiLabelMap.MyPageToComplete}">
+        <!-- <field name="toComplete" title="${uiLabelMap.MyPageToComplete}">
             <hyperlink target="updateTaskAssigment" description="${uiLabelMap.MyPageToComplete}">
                 <parameter param-name="workEffortId" from-field="workEffortId"/>
                 <parameter param-name="partyId" from-field="partyId"/>

Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml?rev=759700&r1=759699&r2=759700&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml Sun Mar 29 14:42:55 2009
@@ -44,7 +44,7 @@
             </hyperlink>
         </field>
         <!-- better set to complete on the timesheet -->
-        <!-- field name="toComplete" title="${uiLabelMap.MyPortalToComplete}"><hyperlink target="updateTaskAssigment" description="${uiLabelMap.MyPortalToComplete}">
+        <!-- <field name="toComplete" title="${uiLabelMap.MyPortalToComplete}"><hyperlink target="updateTaskAssigment" description="${uiLabelMap.MyPortalToComplete}">
                 <parameter param-name="workEffortId" from-field="workEffortId"/>
                 <parameter param-name="partyId" from-field="partyId"/>
                 <parameter param-name="roleTypeId" from-field="roleTypeId"/>

Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml?rev=759700&r1=759699&r2=759700&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/forms/TimeSheetForms.xml Sun Mar 29 14:42:55 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
@@ -17,9 +17,9 @@
     specific language governing permissions and limitations
     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="EditWeekTimesheet" type="multi" list-name="timeEntries" use-row-submit="true"
+    <form name="EditWeekTimesheet" type="multi" list-name="timeEntries" use-row-submit="true"
         separate-columns="true" target="update${my}Timesheet" odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <row-actions>
             <service service-name="getProjectIdAndNameFromTask" result-map="result">
@@ -87,7 +87,7 @@
     </form>
     <form name="FindTimeSheet" target="FindTimeSheet" title="" type="single"
         header-row-style="header-row" default-table-style="basic-table">
-        <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="timesheetId"><text-find default-option="contains" ignore-case="true"/></field>
         <field name="comments"><text-find default-option="contains" ignore-case="true"/></field>
         <field name="partyId" title="${uiLabelMap.PartyParty}">
@@ -109,7 +109,7 @@
             </drop-down>
         </field>
         <field name="fromDate"><date-find/></field>
-        <field name="${uiLabelMap.CommonFind}" title="${uiLabelMap.CommonFind}"><submit/></field>    
+        <field name="${uiLabelMap.CommonFind}" title="${uiLabelMap.CommonFind}"><submit/></field>
     </form>
     <form name="ListFindTimeSheet" type="list" list-name="listIt" paginate-target="FindTimeSheet"
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
@@ -137,19 +137,20 @@
         <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date"/></field>
         <!--field name="comments" title="${uiLabelMap.CommonComments}"><display/></field-->
         <field name="completeLink" title="${uiLabelMap.CommonStatustoComplete}" widget-style="buttontext">
-            <hyperlink target="TimeSheetStatusToComplete">
-                <parameter param-name="timesheetId" from-field="timesheetId}&amp;statusId=TIMESHEET_COMPLETED" description="${completeLink"/>
+            <hyperlink target="TimeSheetStatusToComplete" description="${completeLink}">
+                <parameter param-name="timesheetId" from-field="timesheetId" />
+                <parameter param-name="statusId" value="TIMESHEET_COMPLETED" />
             </hyperlink>
         </field>
     </form>
-    
+
     <form name="AddMyWeeklyTimesheet" type="single" target="createMyWeeklyTimesheet" title=""
         header-row-style="header-row" default-table-style="basic-table">
         <field name="partyId"><hidden value="${userLogin.partyId}"/></field>
         <field entry-name="dummy" name="requiredDate" title="${uiLabelMap.ProjectMgrSelectedDate}"><date-time type="date"/></field>
         <field name="addButton"><submit/></field>
     </form>
-    
+
     <form name="AddWeeklyTimesheet" type="single" target="createWeeklyTimesheet" title=""
         header-row-style="header-row" default-table-style="basic-table">
         <field name="partyId" title="${uiLabelMap.PartyParty}">
@@ -164,14 +165,14 @@
         <field entry-name="dummy" name="requiredDate" title="${uiLabelMap.ProjectMgrSelectedDate}"><date-time type="date"/></field>
         <field name="addButton"><submit/></field>
     </form>
-    
+
     <form name="AddTimesheetEntry" type="single" target="createTimesheetEntry" title=""
         header-row-style="header-row" default-table-style="basic-table">
         <auto-fields-service service-name="createTimeEntry"/>
-        
+
         <field name="timeEntryId"><ignored/><!-- don't pass, will be sequenced --></field>
         <field name="timesheetId"><hidden/></field>
-        
+
         <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field>
         <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
             <drop-down no-current-selected-key="STANDARD">
@@ -191,7 +192,7 @@
         </field>
         <field name="invoiceId"><ignored/><!-- don't pass, will be populated when this is added to an invoice later --></field>
         <field name="invoiceItemSeqId"><ignored/><!-- don't pass, will be populated when this is added to an invoice later --></field>
-        
+
         <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field>
     </form>
     <form name="QuickCreateTimeEntry" target="createQuickTimeEntry" title="" type="single"
@@ -233,10 +234,10 @@
             </entity-condition>
         </actions>
         <auto-fields-service service-name="updateTimeEntry"/>
-        
+
         <field name="timeEntryId"><hidden/></field>
         <field name="timesheetId"><hidden/></field>
-        
+
         <field name="partyId" title="${uiLabelMap.PartyParty}"><lookup size="12" target-form-name="LookupPartyName" default-value="${timesheet.partyId}"/></field>
         <field name="rateTypeId" title="${uiLabelMap.WorkEffortTimesheetRateType}">
             <drop-down>
@@ -245,7 +246,7 @@
                 </entity-options>
             </drop-down>
         </field>
-        
+
         <field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskName}">
             <drop-down allow-empty="false">
                 <entity-options entity-name="ProjectAndPhaseAndTask" key-field-name="workEffortId" description="${projectName}--${phaseName}--${workEffortName}">
@@ -255,14 +256,14 @@
                 </entity-options>
             </drop-down>
         </field>
-        
+
         <field name="invoiceId"><ignored/><!-- don't pass, will be populated when this is added to an invoice later --></field>
         <field name="invoiceItemSeqId"><ignored/><!-- don't pass, will be populated when this is added to an invoice later --></field>
-        
+
         <field name="comments"><text size="60"/></field>
-        
+
         <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field>
-        
+
         <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext">
             <hyperlink target="deleteTimesheetEntry?timesheetId=${timesheetId}&amp;timeEntryId=${timeEntryId}"
                 description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
@@ -272,14 +273,14 @@
         odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
         <field name="timesheetId"><hidden/></field>
         <field name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}">
-            <hyperlink target="taskView">
-                <parameter param-name="workEffortId" from-field="workEffortId} " description="${workEffortName"/>
+            <hyperlink target="taskView" description="${workEffortName}">
+                <parameter param-name="workEffortId" from-field="workEffortId"/>
             </hyperlink>
         </field>
         <field name="phaseName" title="${uiLabelMap.ProjectMgrPhaseName}"><display/></field>
         <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}">
-            <hyperlink target="projectView">
-                <parameter param-name="projectId" from-field="projectId} " description="${projectName"/>
+            <hyperlink target="projectView"  description="${projectName}">
+                <parameter param-name="projectId" from-field="projectId"/>
             </hyperlink>
         </field>
         <field name="checkComplete" title="${uiLabelMap.ProjectMgrCheckComplete}"><display/></field>