Author: jleroux
Date: Sat Apr 4 21:46:04 2009 New Revision: 762018 URL: http://svn.apache.org/viewvc?rev=762018&view=rev Log: Securing URLs, link element in screens and menus : 33th set + tabs to 4 spaces Continue to end with non regular formattings Modified: ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Modified: ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml?rev=762018&r1=762017&r2=762018&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml Sat Apr 4 21:46:04 2009 @@ -626,8 +626,9 @@ <display-entity entity-name="DataResourceType" key-field-name="dataResourceTypeId" also-hidden="false" description="${description}"/> </field> <field name="editDataResource" widget-style="buttontext"> - <hyperlink target="/content/control/EditDataResource?dataResourceId=${dataResourceId}" target-type="inter-app" - description="${dataResourceId}" also-hidden="false"/> + <hyperlink target="/content/control/EditDataResource" target-type="inter-app" description="${dataResourceId}" also-hidden="false"> + <parameter param-name="dataResourceId" from-field="dataResourceId"/> + </hyperlink> </field> <field name="editContent" widget-style="buttontext"> <hyperlink target="/content/control/EditContent" target-type="inter-app" description="${contentId}" also-hidden="false"> Modified: ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml?rev=762018&r1=762017&r2=762018&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/TimesheetScreens.xml Sat Apr 4 21:46:04 2009 @@ -69,7 +69,9 @@ <widgets> <container> <label style="tableheadtext" text="${uiLabelMap.WorkEffortTimesheet}: ${currentTimesheet.fromDate} ${uiLabelMap.CommonThru} ${currentTimesheet.thruDate} ${currentTimesheet.comments}"/> - <link target="EditTimesheet?timesheetId=${currentTimesheet.timesheetId}" text="${currentTimesheet.timesheetId}" style="buttontext"></link> + <link target="EditTimesheet" text="${currentTimesheet.timesheetId}" style="buttontext"> + <parameter param-name="timesheetId" from-field="currentTimesheet.timesheetId"/> + </link> </container> <iterate-section entry="currentTimeEntry" list="currentTimeEntryList"> <section> @@ -102,8 +104,12 @@ </widgets> <fail-widgets> <container> - <link target="MyTimesheets?showQuickEntry=${currentTimesheet.timesheetId}" text="${uiLabelMap.WorkEffortTimesheetQuickTimeEntry}" style="buttontext"></link> - <link target="EditTimesheetEntries?timesheetId=${currentTimesheet.timesheetId}" text="${uiLabelMap.WorkEffortTimesheetTimeEntries}" style="buttontext"></link> + <link target="MyTimesheets" text="${uiLabelMap.WorkEffortTimesheetQuickTimeEntry}" style="buttontext"> + <parameter param-name="showQuickEntry" from-field="currentTimesheet.timesheetId"/> + </link> + <link target="EditTimesheetEntries" text="${uiLabelMap.WorkEffortTimesheetTimeEntries}" style="buttontext"> + <parameter param-name="timesheetId" from-field="currentTimesheet.timesheetId"/> + </link> </container> </fail-widgets> </section> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml?rev=762018&r1=762017&r2=762018&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortScreens.xml Sat Apr 4 21:46:04 2009 @@ -277,13 +277,29 @@ <link target="EditWorkEffort" text="${workEffort.workEffortId}" style="buttontext"> <parameter param-name="workEffortId" from-field="workEffort.workEffortId"/> </link> - <link target="AddWorkEffortAndAssoc?workEffortIdFrom=${workEffort.workEffortId}" text="${uiLabelMap.WorkEffortAddChild}" style="buttontext"></link> - <link target="AddWorkEffortAssoc?workEffortIdFrom=${workEffort.workEffortId}" text="${uiLabelMap.WorkEffortAddExistingWorkEffortChild}" style="buttontext"></link> + <link target="AddWorkEffortAndAssoc" text="${uiLabelMap.WorkEffortAddChild}" style="buttontext"> + <parameter param-name="workEffortIdFrom" from-field="workEffort.workEffortId"/> + </link> + <link target="AddWorkEffortAssoc" text="${uiLabelMap.WorkEffortAddExistingWorkEffortChild}" style="buttontext"> + <parameter param-name="workEffortIdFrom" from-field="workEffort.workEffortId"/> + </link> <section> <condition><not><if-empty field="workEffortAssoc"/></not></condition> <widgets> - <link target="EditWorkEffortAssoc?workEffortIdFrom=${workEffortAssoc.workEffortIdFrom}&workEffortIdTo=${workEffortAssoc.workEffortIdTo}&workEffortAssocTypeId=${workEffortAssoc.workEffortAssocTypeId}&fromDate=${workEffortAssoc.fromDate}&DONE_PAGE=${donePage}" text="${uiLabelMap.WorkEffortEditAssoc}" style="buttontext"></link> - <link target="EditWorkEffortAndAssoc?workEffortIdFrom=${workEffortAssoc.workEffortIdFrom}&workEffortIdTo=${workEffortAssoc.workEffortIdTo}&workEffortAssocTypeId=${workEffortAssoc.workEffortAssocTypeId}&fromDate=${workEffortAssoc.fromDate}&DONE_PAGE=${donePage}" text="${uiLabelMap.WorkEffortEditAssocDetail}" style="buttontext"></link> + <link target="EditWorkEffortAssoc" text="${uiLabelMap.WorkEffortEditAssoc}" style="buttontext"> + <parameter param-name="workEffortIdFrom" from-field="workEffortAssoc.workEffortIdFrom"/> + <parameter param-name="workEffortIdTo" from-field="workEffortAssoc.workEffortIdTo"/> + <parameter param-name="workEffortAssocTypeId" from-field="workEffortAssoc.workEffortAssocTypeId"/> + <parameter param-name="fromDate" from-field="workEffortAssoc.fromDate"/> + <parameter param-name="DONE_PAGE" from-field="donePage"/> + </link> + <link target="EditWorkEffortAndAssoc" text="${uiLabelMap.WorkEffortEditAssocDetail}" style="buttontext"> + <parameter param-name="workEffortIdFrom" from-field="workEffortAssoc.workEffortIdFrom"/> + <parameter param-name="workEffortIdTo" from-field="workEffortAssoc.workEffortIdTo"/> + <parameter param-name="workEffortAssocTypeId" from-field="workEffortAssoc.workEffortAssocTypeId"/> + <parameter param-name="fromDate" from-field="workEffortAssoc.fromDate"/> + <parameter param-name="DONE_PAGE" from-field="donePage"/> + </link> </widgets> </section> </widgets> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml?rev=762018&r1=762017&r2=762018&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/Menus.xml Sat Apr 4 21:46:04 2009 @@ -228,7 +228,7 @@ <if-compare field="hasUpdatePermission" operator="equals" value="true"/> </and> </condition> - <link target="EditProject"></link> + <link target="EditProject"/> </menu-item> <menu-item name="copyProject" title="${uiLabelMap.ProjectMgrCopyProject}"> <condition> |
Free forum by Nabble | Edit this page |