Author: jleroux
Date: Thu Apr 2 10:27:18 2009 New Revision: 761238 URL: http://svn.apache.org/viewvc?rev=761238&view=rev Log: Securing URLs, link element in screens and menus : 24th set + tabs to 4 spaces Modified: ofbiz/trunk/applications/content/webapp/content/cms/CMSMenus.xml ofbiz/trunk/applications/content/widget/SurveyMenus.xml ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml ofbiz/trunk/applications/content/widget/content/ContentMenus.xml ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml ofbiz/trunk/applications/content/widget/forum/ForumMenus.xml ofbiz/trunk/applications/humanres/widget/Menus.xml ofbiz/trunk/applications/manufacturing/widget/manufacturing/Menus.xml ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListMenus.xml ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentMenus.xml ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml ofbiz/trunk/applications/order/widget/ordermgr/Menus.xml ofbiz/trunk/applications/order/widget/ordermgr/RequestMenus.xml ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml ofbiz/trunk/applications/product/widget/catalog/Menus.xml ofbiz/trunk/applications/product/widget/catalog/SubscriptionMenus.xml ofbiz/trunk/applications/product/widget/facility/Menus.xml ofbiz/trunk/applications/workeffort/widget/TimesheetMenus.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml ofbiz/trunk/framework/example/widget/example/ExampleMenus.xml ofbiz/trunk/framework/webtools/widget/Menus.xml ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/Menus.xml ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml 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=761238&r1=761237&r2=761238&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/cms/CMSMenus.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/cms/CMSMenus.xml Thu Apr 2 10:27:18 2009 @@ -29,7 +29,9 @@ <link id="contentfind" target="CMSContentFind"/> </menu-item> <menu-item name="subsites" title="${uiLabelMap.ContentSubSites}" > - <link id="dflt" target="CMSSites?forumId=${subsites.forumId}"/> + <link id="dflt" target="CMSSites"> + <parameter param-name="forumId" from-field="subsites.forumId"/> + </link> </menu-item> <menu-item name="index" title="${uiLabelMap.ContentIndex}" > Modified: ofbiz/trunk/applications/content/widget/SurveyMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/SurveyMenus.xml?rev=761238&r1=761237&r2=761238&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/SurveyMenus.xml (original) +++ ofbiz/trunk/applications/content/widget/SurveyMenus.xml Thu Apr 2 10:27:18 2009 @@ -22,19 +22,29 @@ <menu name="SurveyTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" default-menu-item-name="Survey"> <menu-item name="Survey" title="${uiLabelMap.ContentSurveySurveyId}"> - <link target="EditSurvey?surveyId=${surveyId}"/> + <link target="EditSurvey"> + <parameter param-name="surveyId" from-field="surveyId"/> + </link> </menu-item> <menu-item name="SurveyMultiResps" title="${uiLabelMap.ContentSurveyMultiResps}"> - <link target="EditSurveyMultiResps?surveyId=${surveyId}"/> + <link target="EditSurveyMultiResps"> + <parameter param-name="surveyId" from-field="surveyId"/> + </link> </menu-item> <menu-item name="SurveyQuestions" title="${uiLabelMap.ContentSurveyQuestions}"> - <link target="EditSurveyQuestions?surveyId=${surveyId}"/> + <link target="EditSurveyQuestions"> + <parameter param-name="surveyId" from-field="surveyId"/> + </link> </menu-item> <menu-item name="FindSurveyResponse" title="${uiLabelMap.ContentSurveyFindResponse}"> - <link target="FindSurveyResponse?surveyId=${surveyId}"/> + <link target="FindSurveyResponse"> + <parameter param-name="surveyId" from-field="surveyId"/> + </link> </menu-item> <menu-item name="SurveyResponses" title="${uiLabelMap.ContentSurveyResponseSummary}"> - <link target="ViewSurveyResponses?surveyId=${surveyId}"/> + <link target="ViewSurveyResponses"> + <parameter param-name="surveyId" from-field="surveyId"/> + </link> </menu-item> </menu> </menus> Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml?rev=761238&r1=761237&r2=761238&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml (original) +++ ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml Thu Apr 2 10:27:18 2009 @@ -142,7 +142,9 @@ <condition> <if-compare-field field="mostRecentRevisionSeqId" operator="greater" to-field="rootContentRevisionSeqId"/> </condition> - <link target="ViewCompDocTemplateTree?rootContentId=${contentId}"/> <!-- rootContentRevisionSeqId=${rootContentRevisionSeqId}& --> + <link target="ViewCompDocTemplateTree"> + <parameter param-name="rootContentId" from-field="contentId"/> + </link> <!-- rootContentRevisionSeqId=${rootContentRevisionSeqId}& --> </menu-item> <!-- on page <menu-item name="viewinst" title="View Instances"> @@ -266,7 +268,9 @@ <condition> <if-compare-field field="mostRecentRevisionSeqId" operator="greater" to-field="rootContentRevisionSeqId"/> </condition> - <link target="ViewCompDocInstanceTree?rootContentId=${rootContentId}"/> <!-- rootContentRevisionSeqId=${rootContentRevisionSeqId}& --> + <link target="ViewCompDocInstanceTree"> + <parameter param-name="rootContentId" from-field="rootContentId"/> + </link> <!-- rootContentRevisionSeqId=${rootContentRevisionSeqId}& --> </menu-item> </menu> </menus> Modified: ofbiz/trunk/applications/content/widget/content/ContentMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentMenus.xml?rev=761238&r1=761237&r2=761238&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/content/ContentMenus.xml (original) +++ ofbiz/trunk/applications/content/widget/content/ContentMenus.xml Thu Apr 2 10:27:18 2009 @@ -41,21 +41,27 @@ <condition> <not><if-empty field="currentValue.contentId"/></not> </condition> - <link target="EditContent?contentId=${parameters.contentId}"/> + <link target="EditContent"> + <parameter param-name="contentId" from-field="parameters.contentId"/> + </link> </menu-item> <menu-item name="association" title="${uiLabelMap.ContentAssociation}"> <condition> <not><if-empty field="currentValue.contentId"/></not> </condition> - <link target="EditContentAssoc?contentId=${parameters.contentId}"/> + <link target="EditContentAssoc"> + <parameter param-name="contentId" from-field="parameters.contentId"/> + </link> </menu-item> <menu-item name="role" title="${uiLabelMap.FormFieldTitle_roles}" > <condition> <not><if-empty field="currentValue.contentId"/></not> </condition> - <link target="EditContentRole?contentId=${parameters.contentId}"/> + <link target="EditContentRole"> + <parameter param-name="contentId" from-field="parameters.contentId"/> + </link> </menu-item> <menu-item name="purpose" title="${uiLabelMap.FormFieldTitle_purposes}" > @@ -64,35 +70,45 @@ <if-empty field="currentValue.contentId" /> </not> </condition> - <link target="EditContentPurpose?contentId=${parameters.contentId}"/> + <link target="EditContentPurpose"> + <parameter param-name="contentId" from-field="parameters.contentId"/> + </link> </menu-item> <menu-item name="attribute" title="${uiLabelMap.ContentAttribute}" > <condition> <not><if-empty field="currentValue.contentId"/></not> </condition> - <link target="EditContentAttribute?contentId=${parameters.contentId}"/> + <link target="EditContentAttribute"> + <parameter param-name="contentId" from-field="parameters.contentId"/> + </link> </menu-item> <menu-item name="websites" title="${uiLabelMap.ContentWebSites}"> <condition> <not><if-empty field="currentValue.contentId"/></not> </condition> - <link target="ListWebSite?contentId=${parameters.contentId}"/> + <link target="ListWebSite"> + <parameter param-name="contentId" from-field="parameters.contentId"/> + </link> </menu-item> <menu-item name="metaData" title="${uiLabelMap.ContentMetadata}" > <condition> <not><if-empty field="currentValue.contentId"/></not> </condition> - <link target="EditContentMetaData?contentId=${parameters.contentId}"/> + <link target="EditContentMetaData"> + <parameter param-name="contentId" from-field="parameters.contentId"/> + </link> </menu-item> <menu-item name="workEffort" title="${uiLabelMap.WorkEffortWorkEffort}" > <condition> <not><if-empty field="currentValue.contentId"/></not> </condition> - <link target="EditContentWorkEfforts?contentId=${parameters.contentId}"/> + <link target="EditContentWorkEfforts"> + <parameter param-name="contentId" from-field="parameters.contentId"/> + </link> </menu-item> </menu> @@ -110,7 +126,9 @@ <condition> <if-compare field="tabButtonItem" operator="equals" value="association"/> </condition> - <link target="EditContentAssoc?contentId=${parameters.contentId}"/> + <link target="EditContentAssoc"> + <parameter param-name="contentId" from-field="parameters.contentId"/> + </link> </menu-item> </menu> @@ -118,19 +136,29 @@ default-permission-entity-action="_ADMIN" default-associated-content-id="${userLogin.userLoginId}" selected-menuitem-context-field-name="tabButtonItem" title="" type="simple"> <menu-item name="EditWebSite" title="${uiLabelMap.ContentWebSite}"> - <link target="EditWebSite?webSiteId=${parameters.webSiteId}"/> + <link target="EditWebSite"> + <parameter param-name="webSiteId" from-field="parameters.webSiteId"/> + </link> </menu-item> <menu-item name="ListWebSiteContent" title="${uiLabelMap.ContentContent}"> - <link target="ListWebSiteContent?webSiteId=${parameters.webSiteId}"/> + <link target="ListWebSiteContent"> + <parameter param-name="webSiteId" from-field="parameters.webSiteId"/> + </link> </menu-item> <menu-item name="PathAlias" title="${uiLabelMap.ContentPathAlias}"> - <link target="WebSiteAliases?webSiteId=${parameters.webSiteId}"/> + <link target="WebSiteAliases"> + <parameter param-name="webSiteId" from-field="parameters.webSiteId"/> + </link> </menu-item> <menu-item name="EditWebSiteParties" title="${uiLabelMap.PartyParties}"> - <link target="EditWebSiteParties?webSiteId=${parameters.webSiteId}"/> + <link target="EditWebSiteParties"> + <parameter param-name="webSiteId" from-field="parameters.webSiteId"/> + </link> </menu-item> <menu-item name="WebSiteCMS" title="${uiLabelMap.ContentCMS}"> - <link target="WebSiteCms?webSiteId=${parameters.webSiteId}"/> + <link target="WebSiteCms"> + <parameter param-name="webSiteId" from-field="parameters.webSiteId"/> + </link> </menu-item> </menu> <menu name="blog" menu-container-style="button-bar tab-bar" default-selected-style="selected" default-menu-item-name="content" default-permission-operation="CONTENT_ADMIN" @@ -140,13 +168,19 @@ <link target="blogMain"/> </menu-item> <menu-item name="EditBlog" title="${uiLabelMap.CommonEdit}"> - <link target="editBlog?blogContentId=${parameters.blogContentId}"/> + <link target="editBlog"> + <parameter param-name="blogContentId" from-field="parameters.blogContentId"/> + </link> </menu-item> <menu-item name="Articles" title="${uiLabelMap.ContentBlogArticleList}"> - <link target="blogContent?blogContentId=${parameters.blogContentId}"/> + <link target="blogContent"> + <parameter param-name="blogContentId" from-field="parameters.blogContentId"/> + </link> </menu-item> <menu-item name="Owners" title="${uiLabelMap.FormFieldTitle_roles}"> - <link target="EditContentRole?contentId=${parameters.blogContentId}"/> + <link target="EditContentRole"> + <parameter param-name="contentId" from-field="parameters.blogContentId"/> + </link> </menu-item> </menu> @@ -160,7 +194,9 @@ <condition> <if-compare field="tabButtonItem" operator="equals" value="Articles"/> </condition> - <link target="EditBlogArticle?blogContentId=${parameters.blogContentId}"/> + <link target="EditBlogArticle"> + <parameter param-name="blogContentId" from-field="parameters.blogContentId"/> + </link> </menu-item> </menu> @@ -168,7 +204,9 @@ default-permission-entity-action="_ADMIN" default-associated-content-id="${userLogin.userLoginId}" selected-menuitem-context-field-name="tabButtonItem" title="" type="simple"> <menu-item name="ListlogArt" title="${uiLabelMap.CommonList}"> - <link target="blogContent?blogContentId=${parameters.blogContentId}"/> + <link target="blogContent"> + <parameter param-name="blogContentId" from-field="parameters.blogContentId"/> + </link> </menu-item> <menu-item name="ViewBlogArt" title="${uiLabelMap.CommonView}"> <link target="ViewBlogArticle"> @@ -183,14 +221,18 @@ </link> </menu-item> <menu-item name="Owners" title="${uiLabelMap.FormFieldTitle_roles}"> - <link target="EditContentRole?contentId=${parameters.articleContentId}"/> + <link target="EditContentRole"> + <parameter param-name="contentId" from-field="parameters.articleContentId"/> + </link> </menu-item> </menu> <menu name="blogArtSub" menu-container-style="button-bar button-style-2" default-menu-item-name="content" default-permission-operation="HAS_AUTHOR_ROLE|CONTENT_ADMIN" default-permission-entity-action="_ADMIN" default-associated-content-id="${userLogin.userLoginId}" selected-menuitem-context-field-name="currentMenuItemName" title="" type="simple"> <menu-item name="NewBlogArticle" title="${uiLabelMap.ContentCreateNewBlogArticle}"> - <link target="EditBlogArticle?blogContentId=${parameters.blogContentId}"/> + <link target="EditBlogArticle"> + <parameter param-name="blogContentId" from-field="parameters.blogContentId"/> + </link> </menu-item> </menu> <menu name="contentTopMenu" menu-container-style="button-bar tab-bar" default-selected-style="selected" type="simple" selected-menuitem-context-field-name="tabButtonItem"> Modified: ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml?rev=761238&r1=761237&r2=761238&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml (original) +++ ofbiz/trunk/applications/content/widget/content/DataResourceMenus.xml Thu Apr 2 10:27:18 2009 @@ -87,7 +87,9 @@ <condition> <not><if-empty field="currentValue.dataResourceId"/></not> </condition> - <link target="EditDataResource?dataResourceId=${parameters.dataResourceId}"/> + <link target="EditDataResource"> + <parameter param-name="dataResourceId" from-field="parameters.dataResourceId"/> + </link> </menu-item> <menu-item name="editElectronicText" title="${uiLabelMap.ContentDataResourceText}" > <condition> @@ -96,7 +98,9 @@ <if-compare field="currentValue.dataResourceTypeId" operator="equals" value="ELECTRONIC_TEXT"/> </and> </condition> - <link target="EditElectronicText?dataResourceId=${parameters.dataResourceId}"/> + <link target="EditElectronicText"> + <parameter param-name="dataResourceId" from-field="parameters.dataResourceId"/> + </link> </menu-item> <menu-item name="editHtmlText" title="${uiLabelMap.ContentDataResourceHtml}" > <condition> @@ -105,7 +109,9 @@ <if-compare field="currentValue.dataResourceTypeId" operator="equals" value="ELECTRONIC_TEXT"/> </and> </condition> - <link target="EditHtmlText?dataResourceId=${parameters.dataResourceId}"/> + <link target="EditHtmlText"> + <parameter param-name="dataResourceId" from-field="parameters.dataResourceId"/> + </link> </menu-item> <menu-item name="uploadImage" title="${uiLabelMap.ContentDataResourceImage}" > <condition> @@ -120,25 +126,33 @@ </and> </or> </condition> - <link target="UploadImage?dataResourceId=${parameters.dataResourceId}"/> + <link target="UploadImage"> + <parameter param-name="dataResourceId" from-field="parameters.dataResourceId"/> + </link> </menu-item> <menu-item name="EditDataResourceAttribute" title="${uiLabelMap.ContentDataResourceAttribute}" > <condition> <not><if-empty field="currentValue.dataResourceId"/></not> </condition> - <link target="EditDataResourceAttribute?dataResourceId=${parameters.dataResourceId}"/> + <link target="EditDataResourceAttribute"> + <parameter param-name="dataResourceId" from-field="parameters.dataResourceId"/> + </link> </menu-item> <menu-item name="editDataResourceRole" title="${uiLabelMap.ContentDataResourceRole}" > <condition> <not><if-empty field="currentValue.dataResourceId"/></not> </condition> - <link target="EditDataResourceRole?dataResourceId=${parameters.dataResourceId}"/> + <link target="EditDataResourceRole"> + <parameter param-name="dataResourceId" from-field="parameters.dataResourceId"/> + </link> </menu-item> <menu-item name="editDataResourceProductFeatures" title="${uiLabelMap.ContentDataResourceProductFeatures}" > <condition> <not><if-empty field="currentValue.dataResourceId"/></not> </condition> - <link target="EditDataResourceProductFeatures?dataResourceId=${parameters.dataResourceId}"/> + <link target="EditDataResourceProductFeatures"> + <parameter param-name="dataResourceId" from-field="parameters.dataResourceId"/> + </link> </menu-item> </menu> </menus> Modified: ofbiz/trunk/applications/content/widget/forum/ForumMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumMenus.xml?rev=761238&r1=761237&r2=761238&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/forum/ForumMenus.xml (original) +++ ofbiz/trunk/applications/content/widget/forum/ForumMenus.xml Thu Apr 2 10:27:18 2009 @@ -21,16 +21,24 @@ <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd"> <menu name="ForumGroupTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="forumGroups" title="${uiLabelMap.FormFieldTitle_forumGroups}"><link target="findForumGroups"/></menu-item> - <menu-item name="forums" title="${uiLabelMap.FormFieldTitle_forums}"><link target="findForums?forumGroupId=${parameters.forumGroupId}"/></menu-item> - <menu-item name="purposes" title="${uiLabelMap.FormFieldTitle_purposes}"><link target="forumGroupPurposes?forumGroupId=${parameters.forumGroupId}"/></menu-item> - <menu-item name="roles" title="${uiLabelMap.FormFieldTitle_roles}"><link target="forumGroupRoles?forumGroupId=${parameters.forumGroupId}"/></menu-item> + <menu-item name="forums" title="${uiLabelMap.FormFieldTitle_forums}"><link target="findForums"> + <parameter param-name="forumGroupId" from-field="parameters.forumGroupId"/> + </menu-item name="forums" title="${uiLabelMap.FormFieldTitle_forums}"><link></menu-item> + <menu-item name="purposes" title="${uiLabelMap.FormFieldTitle_purposes}"><link target="forumGroupPurposes"> + <parameter param-name="forumGroupId" from-field="parameters.forumGroupId"/> + </menu-item name="purposes" title="${uiLabelMap.FormFieldTitle_purposes}"><link></menu-item> + <menu-item name="roles" title="${uiLabelMap.FormFieldTitle_roles}"><link target="forumGroupRoles"> + <parameter param-name="forumGroupId" from-field="parameters.forumGroupId"/> + </menu-item name="roles" title="${uiLabelMap.FormFieldTitle_roles}"><link></menu-item> </menu> <menu name="ForumTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" default-menu-item-name="Survey"> </menu> <menu name="ForumMessagesTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="forumGroups" title="${uiLabelMap.FormFieldTitle_forumGroups}"><link target="findForumGroups"/></menu-item> - <menu-item name="forums" title="${uiLabelMap.FormFieldTitle_forums}"><link target="findForums?forumGroupId=${parameters.forumGroupId}"/></menu-item> + <menu-item name="forums" title="${uiLabelMap.FormFieldTitle_forums}"><link target="findForums"> + <parameter param-name="forumGroupId" from-field="parameters.forumGroupId"/> + </menu-item name="forums" title="${uiLabelMap.FormFieldTitle_forums}"><link></menu-item> <menu-item name="messageList" title="${uiLabelMap.FormFieldTitle_messageList}"> <link target="findForumMessages"> <parameter param-name="forumGroupId" from-field="parameters.forumGroupId"/> Modified: ofbiz/trunk/applications/humanres/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/Menus.xml?rev=761238&r1=761237&r2=761238&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/Menus.xml (original) +++ ofbiz/trunk/applications/humanres/widget/Menus.xml Thu Apr 2 10:27:18 2009 @@ -94,32 +94,50 @@ </menu> <menu name="EmplPostionBar" default-menu-item-name="EmplPositionView" type="simple" menu-container-style="button-bar tab-bar" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem"> <menu-item name="EmplPositionView" title="${uiLabelMap.CommonSummary}"> - <link target="emplPositionView?emplPositionId=${emplPositionId}"/> + <link target="emplPositionView"> + <parameter param-name="emplPositionId" from-field="emplPositionId"/> + </link> + </menu-item> + <menu-item name="EditEmplPosition" title="${uiLabelMap.HumanResEmployeePosition}"> + <link target="EditEmplPosition"> + <parameter param-name="emplPositionId" from-field="emplPositionId"/> + </link> </menu-item> - <menu-item name="EditEmplPosition" title="${uiLabelMap.HumanResEmployeePosition}"><link target="EditEmplPosition?emplPositionId=${emplPositionId}"/></menu-item> <menu-item name="EditEmplPositionFulfillments" title="${uiLabelMap.HumanResPositionFulfillments}"> - <link target="EditEmplPositionFulfillments?emplPositionId=${emplPositionId}"/> + <link target="EditEmplPositionFulfillments"> + <parameter param-name="emplPositionId" from-field="emplPositionId"/> + </link> </menu-item> <menu-item name="EditEmplPositionResponsibilities" title="${uiLabelMap.HumanResEmplPositionResponsibilities}"> - <link target="EditEmplPositionResponsibilities?emplPositionId=${emplPositionId}"/> + <link target="EditEmplPositionResponsibilities"> + <parameter param-name="emplPositionId" from-field="emplPositionId"/> + </link> </menu-item> <menu-item name="EditEmplPositionReportingStructs" title="${uiLabelMap.HumanResEmplPositionReportingStruct}"> - <link target="EditEmplPositionReportingStructs?emplPositionId=${emplPositionId}"/> + <link target="EditEmplPositionReportingStructs"> + <parameter param-name="emplPositionId" from-field="emplPositionId"/> + </link> </menu-item> </menu> <menu name="PartyBar" default-menu-item-name="EditPerfReviewItems" default-selected-style="selected" type="simple" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="tabButtonItem"> <menu-item name="EditPerfReviewItems" title="${uiLabelMap.HumanResEditPerfReviewItems}"> - <link target="EditPerfReviewItems?perfReviewId=${perfReviewId}"/> + <link target="EditPerfReviewItems"> + <parameter param-name="perfReviewId" from-field="perfReviewId"/> + </link> </menu-item> </menu> <menu name="SalaryBar" default-menu-item-name="EditSalaryStep" default-selected-style="selected" type="simple" menu-container-style="button-bar tab-bar" selected-menuitem-context-field-name="subTabButtonItem"> <menu-item name="EditPayGrade" title="${uiLabelMap.HumanResPayGrade}"> - <link target="EditPayGrade?payGradeId=${payGradeId}"/> + <link target="EditPayGrade"> + <parameter param-name="payGradeId" from-field="payGradeId"/> + </link> </menu-item> <menu-item name="EditSalaryStep" title="${uiLabelMap.HumanResEditSalaryStep}"> - <link target="EditSalarySteps?payGradeId=${payGradeId}"/> + <link target="EditSalarySteps"> + <parameter param-name="payGradeId" from-field="payGradeId"/> + </link> </menu-item> </menu> <menu name="SkillType" type="simple" id="app-navigation" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem"/> @@ -152,45 +170,69 @@ <menu name="EmployeeProfileTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" default-menu-item-name="EditEmployeeSkills"> <menu-item name="EmployeeProfile" title="${uiLabelMap.PartyProfile}"> - <link target="EmployeeProfile?partyId=${partyId}"/> + <link target="EmployeeProfile"> + <parameter param-name="partyId" from-field="partyId"/> + </link> </menu-item> <menu-item name="ListEmployment" title="${uiLabelMap.HumanResEmployment}"> - <link target="ListEmployments?partyId=${parameters.partyId}"/> + <link target="ListEmployments"> + <parameter param-name="partyId" from-field="parameters.partyId"/> + </link> </menu-item> <menu-item name="ListEmplPositions" title="${uiLabelMap.HumanResEmployeePosition}"> - <link target="ListEmplPositions?partyId=${parameters.partyId}"/> + <link target="ListEmplPositions"> + <parameter param-name="partyId" from-field="parameters.partyId"/> + </link> </menu-item> <menu-item name="EditEmployeeSkills" title="${uiLabelMap.HumanResSkills}"> - <link target="EditEmployeeSkills?partyId=${partyId}"/> + <link target="EditEmployeeSkills"> + <parameter param-name="partyId" from-field="partyId"/> + </link> </menu-item> <menu-item name="EditEmployeeQuals" title="${uiLabelMap.HumanResPartyQualification}"> - <link target="EditEmployeeQuals?partyId=${partyId}"/> + <link target="EditEmployeeQuals"> + <parameter param-name="partyId" from-field="partyId"/> + </link> </menu-item> <menu-item name="EditEmployeeTrainings" title="${uiLabelMap.HumanResTraining}"> - <link target="EditEmployeeTrainings?partyId=${partyId}"/> + <link target="EditEmployeeTrainings"> + <parameter param-name="partyId" from-field="partyId"/> + </link> </menu-item> <!-- I think these don't belong here, I'll get to these in short while. <menu-item name="EditEmployeeEmploymentApps" title="${uiLabelMap.HumanResEmploymentApp}"> - <link target="EditEmployeeEmploymentApps?partyId=${partyId}"/> + <link target="EditEmployeeEmploymentApps"> + <parameter param-name="partyId" from-field="partyId"/> + </link> </menu-item> <menu-item name="EditEmployeeResumes" title="${uiLabelMap.HumanResPartyResume}"> - <link target="EditEmployeeResumes?partyId=${partyId}"/> + <link target="EditEmployeeResumes"> + <parameter param-name="partyId" from-field="partyId"/> + </link> </menu-item> <menu-item name="EditEmployeePerformanceNotes" title="${uiLabelMap.HumanResPerfNote}"> - <link target="EditEmployeePerformanceNotes?partyId=${partyId}"/> + <link target="EditEmployeePerformanceNotes"> + <parameter param-name="partyId" from-field="partyId"/> + </link> </menu-item> --> <menu-item name="EditEmployeeLeaves" title="${uiLabelMap.HumanResEmplLeave}"> - <link target="EditEmployeeLeaves?partyId=${partyId}"/> + <link target="EditEmployeeLeaves"> + <parameter param-name="partyId" from-field="partyId"/> + </link> </menu-item> </menu> <menu name="EmplPositionTypeTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" default-menu-item-name="EditEmplPositionType" selected-menuitem-context-field-name="tabButtonItem2"> <menu-item name="EditEmplPositionType" title="${uiLabelMap.HumanResEmplPositionType}"> - <link target="EditEmplPositionTypes?emplPositionTypeId=${emplPositionTypeId}"/> + <link target="EditEmplPositionTypes"> + <parameter param-name="emplPositionTypeId" from-field="emplPositionTypeId"/> + </link> </menu-item> <menu-item name="EditEmplPositionTypeRate" title="${uiLabelMap.HumanResEmplPositionTypeRate}"> - <link target="EditEmplPositionTypeRates?emplPositionTypeId=${emplPositionTypeId}"/> + <link target="EditEmplPositionTypeRates"> + <parameter param-name="emplPositionTypeId" from-field="emplPositionTypeId"/> + </link> </menu-item> </menu> </menus> \ No newline at end of file Modified: ofbiz/trunk/applications/manufacturing/widget/manufacturing/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/widget/manufacturing/Menus.xml?rev=761238&r1=761237&r2=761238&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/widget/manufacturing/Menus.xml (original) +++ ofbiz/trunk/applications/manufacturing/widget/manufacturing/Menus.xml Thu Apr 2 10:27:18 2009 @@ -102,7 +102,9 @@ <if-compare field="productionRun.currentStatusId" operator="equals" value="PRUN_SCHEDULED"/> </or> </condition> - <link target="EditProductionRun?productionRunId=${productionRunId}"/> + <link target="EditProductionRun"> + <parameter param-name="productionRunId" from-field="productionRunId"/> + </link> </menu-item> <menu-item name="tasks" title="${uiLabelMap.ManufacturingListOfProductionRunRoutingTasks}"> <condition> @@ -111,7 +113,9 @@ <if-compare field="productionRun.currentStatusId" operator="equals" value="PRUN_SCHEDULED"/> </or> </condition> - <link target="ProductionRunTasks?productionRunId=${productionRunId}"/> + <link target="ProductionRunTasks"> + <parameter param-name="productionRunId" from-field="productionRunId"/> + </link> </menu-item> <menu-item name="components" title="${uiLabelMap.ManufacturingMaterials}"> <condition> @@ -120,7 +124,9 @@ <if-compare field="productionRun.currentStatusId" operator="equals" value="PRUN_SCHEDULED"/> </or> </condition> - <link target="ProductionRunComponents?productionRunId=${productionRunId}"/> + <link target="ProductionRunComponents"> + <parameter param-name="productionRunId" from-field="productionRunId"/> + </link> </menu-item> <menu-item name="fixedAssets" title="${uiLabelMap.AccountingFixedAssets}"> <condition> @@ -129,7 +135,9 @@ <if-compare field="productionRun.currentStatusId" operator="equals" value="PRUN_SCHEDULED"/> </or> </condition> - <link target="ProductionRunFixedAssets?productionRunId=${productionRunId}"/> + <link target="ProductionRunFixedAssets"> + <parameter param-name="productionRunId" from-field="productionRunId"/> + </link> </menu-item> <menu-item name="declaration" title="${uiLabelMap.ManufacturingProductionRunDeclaration}"> <condition> @@ -140,7 +148,9 @@ </or> </not> </condition> - <link target="ProductionRunDeclaration?productionRunId=${productionRunId}"/> + <link target="ProductionRunDeclaration"> + <parameter param-name="productionRunId" from-field="productionRunId"/> + </link> </menu-item> <menu-item name="actualComponents" title="${uiLabelMap.ManufacturingActualMaterials}"> <condition> @@ -151,13 +161,19 @@ </or> </not> </condition> - <link target="ProductionRunActualComponents?productionRunId=${productionRunId}"/> + <link target="ProductionRunActualComponents"> + <parameter param-name="productionRunId" from-field="productionRunId"/> + </link> </menu-item> <menu-item name="assocs" title="${uiLabelMap.ManufacturingProductionRunAssocs}"> - <link target="ProductionRunAssocs?productionRunId=${productionRunId}"/> + <link target="ProductionRunAssocs"> + <parameter param-name="productionRunId" from-field="productionRunId"/> + </link> </menu-item> <menu-item name="costs" title="${uiLabelMap.ManufacturingActualCosts}"> - <link target="ProductionRunCosts?productionRunId=${productionRunId}"/> + <link target="ProductionRunCosts"> + <parameter param-name="productionRunId" from-field="productionRunId"/> + </link> </menu-item> </menu> @@ -182,46 +198,66 @@ <condition> <not><if-empty field="techDataCalendar"/></not> </condition> - <link target="EditCalendar?calendarId=${techDataCalendar.calendarId}"/> + <link target="EditCalendar"> + <parameter param-name="calendarId" from-field="techDataCalendar.calendarId"/> + </link> </menu-item> <menu-item name="calendarExceptionDay" title="${uiLabelMap.ManufacturingCalendarExceptionDate}"> <condition> <not><if-empty field="techDataCalendar"/></not> </condition> - <link target="EditCalendarExceptionDay?calendarId=${techDataCalendar.calendarId}"/> + <link target="EditCalendarExceptionDay"> + <parameter param-name="calendarId" from-field="techDataCalendar.calendarId"/> + </link> </menu-item> <menu-item name="calendarExceptionWeek" title="${uiLabelMap.ManufacturingCalendarExceptionWeek}"> <condition> <not><if-empty field="techDataCalendar"/></not> </condition> - <link target="EditCalendarExceptionWeek?calendarId=${techDataCalendar.calendarId}"/> + <link target="EditCalendarExceptionWeek"> + <parameter param-name="calendarId" from-field="techDataCalendar.calendarId"/> + </link> </menu-item> </menu> <menu name="RoutingTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="editRouting" title="${uiLabelMap.ManufacturingEditRouting}"> - <link target="EditRouting?workEffortId=${routing.workEffortId}"/> + <link target="EditRouting"> + <parameter param-name="workEffortId" from-field="routing.workEffortId"/> + </link> </menu-item> <menu-item name="routingTaskAssoc" title="${uiLabelMap.ManufacturingEditRoutingTaskAssoc}"> - <link target="EditRoutingTaskAssoc?workEffortId=${routing.workEffortId}"/> + <link target="EditRoutingTaskAssoc"> + <parameter param-name="workEffortId" from-field="routing.workEffortId"/> + </link> </menu-item> <menu-item name="routingProductLink" title="${uiLabelMap.ManufacturingEditRoutingProductLink}"> - <link target="EditRoutingProductLink?workEffortId=${routing.workEffortId}"/> + <link target="EditRoutingProductLink"> + <parameter param-name="workEffortId" from-field="routing.workEffortId"/> + </link> </menu-item> </menu> <menu name="RoutingTaskTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="editRoutingTask" title="${uiLabelMap.ManufacturingEditRoutingTask}"> - <link target="EditRoutingTask?workEffortId=${routingTask.workEffortId}"/> + <link target="EditRoutingTask"> + <parameter param-name="workEffortId" from-field="routingTask.workEffortId"/> + </link> </menu-item> <menu-item name="editRoutingTaskCosts" title="${uiLabelMap.ManufacturingListRoutings}"> - <link target="EditRoutingTaskCosts?workEffortId=${routingTask.workEffortId}"/> + <link target="EditRoutingTaskCosts"> + <parameter param-name="workEffortId" from-field="routingTask.workEffortId"/> + </link> </menu-item> <menu-item name="listRoutingTaskProducts" title="${uiLabelMap.ManufacturingListProducts}"> - <link target="ListRoutingTaskProducts?workEffortId=${routingTask.workEffortId}"/> + <link target="ListRoutingTaskProducts"> + <parameter param-name="workEffortId" from-field="routingTask.workEffortId"/> + </link> </menu-item> <menu-item name="editRoutingTaskFixedAssets" title="${uiLabelMap.ManufacturingRoutingTaskFixedAssets}"> - <link target="EditRoutingTaskFixedAssets?workEffortId=${routingTask.workEffortId}"/> + <link target="EditRoutingTaskFixedAssets"> + <parameter param-name="workEffortId" from-field="routingTask.workEffortId"/> + </link> </menu-item> </menu> Modified: ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml?rev=761238&r1=761237&r2=761238&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml Thu Apr 2 10:27:18 2009 @@ -22,10 +22,14 @@ <menu name="MarketingCampaignTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" default-menu-item-name="MarketingCampaign" selected-menuitem-context-field-name="campaignTabButtonItem"> <menu-item name="MarketingCampaign" title="${uiLabelMap.MarketingCampaign}"> - <link target="/EditMarketingCampaign?marketingCampaignId=${marketingCampaignId}"/> + <link target="/EditMarketingCampaign"> + <parameter param-name="marketingCampaignId" from-field="marketingCampaignId"/> + </link> </menu-item> <menu-item name="MarketingCampaignRole" title="${uiLabelMap.PartyRoles}"> - <link target="/ListMarketingCampaignRoles?marketingCampaignId=${marketingCampaignId}"/> + <link target="/ListMarketingCampaignRoles"> + <parameter param-name="marketingCampaignId" from-field="marketingCampaignId"/> + </link> </menu-item> </menu> </menus> Modified: ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListMenus.xml?rev=761238&r1=761237&r2=761238&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListMenus.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListMenus.xml Thu Apr 2 10:27:18 2009 @@ -22,13 +22,19 @@ <menu name="ContactListTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" default-menu-item-name="ContactList" selected-menuitem-context-field-name="contactListTabButtonItem"> <menu-item name="ContactList" title="${uiLabelMap.MarketingContactList}"> - <link target="/EditContactList?contactListId=${contactListId}"/> + <link target="/EditContactList"> + <parameter param-name="contactListId" from-field="contactListId"/> + </link> </menu-item> <menu-item name="ContactListParty" title="${uiLabelMap.PartyParties}"> - <link target="/FindContactListParties?contactListId=${contactListId}"/> + <link target="/FindContactListParties"> + <parameter param-name="contactListId" from-field="contactListId"/> + </link> </menu-item> <menu-item name="ContactListCommEvent" title="${uiLabelMap.PartyCommEvents}"> - <link target="/FindContactListCommEvents?contactListId=${contactListId}"/> + <link target="/FindContactListCommEvents"> + <parameter param-name="contactListId" from-field="contactListId"/> + </link> </menu-item> </menu> </menus> Modified: ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentMenus.xml?rev=761238&r1=761237&r2=761238&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentMenus.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentMenus.xml Thu Apr 2 10:27:18 2009 @@ -22,16 +22,24 @@ <menu name="SegmentGroupTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" default-menu-item-name="Segment" selected-menuitem-context-field-name="segmentTabButtonItem"> <menu-item name="SegmentGroup" title="${uiLabelMap.MarketingSegmentGroupSegmentGroup}"> - <link target="viewSegmentGroup?segmentGroupId=${segmentGroupId}"/> + <link target="viewSegmentGroup"> + <parameter param-name="segmentGroupId" from-field="segmentGroupId"/> + </link> </menu-item> <menu-item name="SegmentGroupClassification" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupClassification}"> - <link target="listSegmentGroupClass?segmentGroupId=${segmentGroupId}"/> + <link target="listSegmentGroupClass"> + <parameter param-name="segmentGroupId" from-field="segmentGroupId"/> + </link> </menu-item> <menu-item name="SegmentGroupGeo" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupGeo}"> - <link target="listSegmentGroupGeo?segmentGroupId=${segmentGroupId}"/> + <link target="listSegmentGroupGeo"> + <parameter param-name="segmentGroupId" from-field="segmentGroupId"/> + </link> </menu-item> <menu-item name="SegmentGroupRole" title="${uiLabelMap.MarketingSegmentGroupSegmentGroupRole}"> - <link target="listSegmentGroupRole?segmentGroupId=${segmentGroupId}"/> + <link target="listSegmentGroupRole"> + <parameter param-name="segmentGroupId" from-field="segmentGroupId"/> + </link> </menu-item> </menu> </menus> \ No newline at end of file Modified: ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml?rev=761238&r1=761237&r2=761238&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml Thu Apr 2 10:27:18 2009 @@ -30,7 +30,9 @@ <if-empty field="trackingCodeId"/> </not> </condition> - <link target="/FindTrackingCodeOrders?trackingCodeId=${trackingCodeId}"/> + <link target="/FindTrackingCodeOrders"> + <parameter param-name="trackingCodeId" from-field="trackingCodeId"/> + </link> </menu-item> <menu-item name="TrackingCodeVisit" title="${uiLabelMap.MarketingTrackingCodeVisit}"> <condition> @@ -38,7 +40,9 @@ <if-empty field="trackingCodeId"/> </not> </condition> - <link target="/FindTrackingCodeVisits?trackingCodeId=${trackingCodeId}"/> + <link target="/FindTrackingCodeVisits"> + <parameter param-name="trackingCodeId" from-field="trackingCodeId"/> + </link> </menu-item> <menu-item name="TrackingCodeType" title="${uiLabelMap.MarketingTrackingCodeType}"> <link target="/FindTrackingCodeType"/> Modified: ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml?rev=761238&r1=761237&r2=761238&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml Thu Apr 2 10:27:18 2009 @@ -31,16 +31,22 @@ <menu name="OpportunityTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="ViewOpportunity" title="${uiLabelMap.SfaOpportunitySummary}"> - <link target="ViewOpportunity?salesOpportunityId=${parameters.salesOpportunityId}"/> + <link target="ViewOpportunity"> + <parameter param-name="salesOpportunityId" from-field="parameters.salesOpportunityId"/> + </link> </menu-item> <menu-item name="EditOpportunity" title="${uiLabelMap.SfaEditOpportunity}"> - <link target="EditOpportunity?salesOpportunityId=${parameters.salesOpportunityId}"/> + <link target="EditOpportunity"> + <parameter param-name="salesOpportunityId" from-field="parameters.salesOpportunityId"/> + </link> </menu-item> </menu> <menu name="AccountTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="profile" title="${uiLabelMap.PartyProfile}"> - <link target="viewprofile?partyId=${parameters.partyId}"/> + <link target="viewprofile"> + <parameter param-name="partyId" from-field="parameters.partyId"/> + </link> </menu-item> </menu> <menu name="AccountSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" @@ -89,7 +95,9 @@ <menu name="ContactTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="profile" title="${uiLabelMap.PartyProfile}"> - <link target="viewprofile?partyId=${parameters.partyId}"/> + <link target="viewprofile"> + <parameter param-name="partyId" from-field="parameters.partyId"/> + </link> </menu-item> <menu-item name="MergeContacts" title="${uiLabelMap.SfaMergeContacts}"> <link target="MergeContacts"/> @@ -106,10 +114,14 @@ </menu> <menu name="SalesForecastTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="EditSalesForecast" title="${uiLabelMap.SfaSalesForecast}"> - <link target="EditSalesForecast?salesForecastId=${parameters.salesForecastId}"/> + <link target="EditSalesForecast"> + <parameter param-name="salesForecastId" from-field="parameters.salesForecastId"/> + </link> </menu-item> <menu-item name="EditSalesForecastDetail" title="${uiLabelMap.ProductPickingDetail}"> - <link target="EditSalesForecastDetail?salesForecastId=${parameters.salesForecastId}"/> + <link target="EditSalesForecastDetail"> + <parameter param-name="salesForecastId" from-field="parameters.salesForecastId"/> + </link> </menu-item> </menu> </menus> Modified: ofbiz/trunk/applications/order/widget/ordermgr/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/Menus.xml?rev=761238&r1=761237&r2=761238&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/Menus.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/Menus.xml Thu Apr 2 10:27:18 2009 @@ -106,70 +106,98 @@ <menu name="RequirementTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="EditRequirement" title="${uiLabelMap.OrderRequirement}"> - <link target="EditRequirement?requirementId=${requirement.requirementId}"/> + <link target="EditRequirement"> + <parameter param-name="requirementId" from-field="requirement.requirementId"/> + </link> </menu-item> <menu-item name="ListRequirementCustRequests" title="${uiLabelMap.OrderRequests}"> - <link target="ListRequirementCustRequests?requirementId=${requirement.requirementId}"/> + <link target="ListRequirementCustRequests"> + <parameter param-name="requirementId" from-field="requirement.requirementId"/> + </link> </menu-item> <menu-item name="ListRequirementOrdersTab" title="${uiLabelMap.OrderOrders}"> - <link target="ListRequirementOrders?requirementId=${requirement.requirementId}"/> + <link target="ListRequirementOrders"> + <parameter param-name="requirementId" from-field="requirement.requirementId"/> + </link> </menu-item> <menu-item name="ListRequirementRolesTab" title="${uiLabelMap.PartyRoles}"> - <link target="ListRequirementRoles?requirementId=${requirement.requirementId}"/> + <link target="ListRequirementRoles"> + <parameter param-name="requirementId" from-field="requirement.requirementId"/> + </link> </menu-item> </menu> <menu name="QuoteTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="ViewQuote" title="${uiLabelMap.OrderViewQuote}"> - <link target="ViewQuote?quoteId=${quote.quoteId}"/> + <link target="ViewQuote"> + <parameter param-name="quoteId" from-field="quote.quoteId"/> + </link> </menu-item> <menu-item name="EditQuote" title="${uiLabelMap.OrderOrderQuote}"> - <link target="EditQuote?quoteId=${quote.quoteId}"/> + <link target="EditQuote"> + <parameter param-name="quoteId" from-field="quote.quoteId"/> + </link> </menu-item> <menu-item name="ListQuoteRoles" title="${uiLabelMap.OrderOrderQuoteRoles}"> - <link target="ListQuoteRoles?quoteId=${quote.quoteId}"/> + <link target="ListQuoteRoles"> + <parameter param-name="quoteId" from-field="quote.quoteId"/> + </link> </menu-item> <menu-item name="ListQuoteItems" title="${uiLabelMap.OrderOrderQuoteItems}"> - <link target="ListQuoteItems?quoteId=${quote.quoteId}"/> + <link target="ListQuoteItems"> + <parameter param-name="quoteId" from-field="quote.quoteId"/> + </link> </menu-item> <menu-item name="ListQuoteAttributes" title="${uiLabelMap.OrderOrderQuoteAttributes}"> - <link target="ListQuoteAttributes?quoteId=${quote.quoteId}"/> + <link target="ListQuoteAttributes"> + <parameter param-name="quoteId" from-field="quote.quoteId"/> + </link> </menu-item> <menu-item name="ListQuoteCoefficients" title="${uiLabelMap.OrderOrderQuoteCoefficients}"> <condition> <if-has-permission permission="ORDERMGR" action="_QUOTE_PRICE"/> </condition> - <link target="ListQuoteCoefficients?quoteId=${quote.quoteId}"/> + <link target="ListQuoteCoefficients"> + <parameter param-name="quoteId" from-field="quote.quoteId"/> + </link> </menu-item> <menu-item name="ManageQuotePrices" title="${uiLabelMap.OrderOrderQuotePrices}"> <condition> <if-has-permission permission="ORDERMGR" action="_QUOTE_PRICE"/> </condition> - <link target="ManageQuotePrices?quoteId=${quote.quoteId}"/> + <link target="ManageQuotePrices"> + <parameter param-name="quoteId" from-field="quote.quoteId"/> + </link> </menu-item> <menu-item name="ListQuoteAdjustments" title="${uiLabelMap.OrderOrderQuoteAdjustments}"> <condition> <if-has-permission permission="ORDERMGR" action="_QUOTE_PRICE"/> </condition> - <link target="ListQuoteAdjustments?quoteId=${quote.quoteId}"/> + <link target="ListQuoteAdjustments"> + <parameter param-name="quoteId" from-field="quote.quoteId"/> + </link> </menu-item> <menu-item name="ViewQuoteProfit" title="${uiLabelMap.OrderViewQuoteProfit}"> <condition> <if-has-permission permission="ORDERMGR" action="_QUOTE_PRICE"/> </condition> - <link target="ViewQuoteProfit?quoteId=${quote.quoteId}"/> + <link target="ViewQuoteProfit"> + <parameter param-name="quoteId" from-field="quote.quoteId"/> + </link> </menu-item> <menu-item name="QuoteWorkEfforts" title="${uiLabelMap.OrderOrderQuoteWorkEfforts}"> - <link target="ListQuoteWorkEfforts?quoteId=${quote.quoteId}"/> + <link target="ListQuoteWorkEfforts"> + <parameter param-name="quoteId" from-field="quote.quoteId"/> + </link> </menu-item> </menu> Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequestMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequestMenus.xml?rev=761238&r1=761237&r2=761238&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/RequestMenus.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/RequestMenus.xml Thu Apr 2 10:27:18 2009 @@ -23,16 +23,24 @@ <menu name="RequestTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="ViewRequest" title="${uiLabelMap.OrderRequestOverview}"> - <link target="ViewRequest?custRequestId=${custRequest.custRequestId}"/> + <link target="ViewRequest"> + <parameter param-name="custRequestId" from-field="custRequest.custRequestId"/> + </link> </menu-item> <menu-item name="request" title="${uiLabelMap.OrderRequest}"> - <link target="request?custRequestId=${custRequest.custRequestId}"/> + <link target="request"> + <parameter param-name="custRequestId" from-field="custRequest.custRequestId"/> + </link> </menu-item> <menu-item name="requestroles" title="${uiLabelMap.OrderRequestRoles}"> - <link target="requestroles?custRequestId=${custRequest.custRequestId}"/> + <link target="requestroles"> + <parameter param-name="custRequestId" from-field="custRequest.custRequestId"/> + </link> </menu-item> <menu-item name="requestitems" title="${uiLabelMap.OrderRequestItems}"> - <link target="/requestitems?custRequestId=${custRequest.custRequestId}"/> + <link target="/requestitems"> + <parameter param-name="custRequestId" from-field="custRequest.custRequestId"/> + </link> </menu-item> <menu-item name="custRequestContent" title="${uiLabelMap.OrderRequestContent}"> <condition> @@ -42,7 +50,9 @@ <if-compare field="custRequest.statusId" operator="not-equals" value="CRQ_COMPLETED"/> </and> </condition> - <link target="EditCustRequestContent?custRequestId=${custRequest.custRequestId}"/> + <link target="EditCustRequestContent"> + <parameter param-name="custRequestId" from-field="custRequest.custRequestId"/> + </link> </menu-item> </menu> @@ -55,7 +65,9 @@ <condition> <not><if-empty field="custRequest"/></not> </condition> - <link target="createQuoteFromCustRequest?custRequestId=${custRequest.custRequestId}"/> + <link target="createQuoteFromCustRequest"> + <parameter param-name="custRequestId" from-field="custRequest.custRequestId"/> + </link> </menu-item> </menu> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=761238&r1=761237&r2=761238&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Thu Apr 2 10:27:18 2009 @@ -39,68 +39,108 @@ <menu name="SecurityGroupTabBar" default-menu-item-name="EditSecurityGroup" default-selected-style="selected" menu-container-style="button-bar tab-bar" type="simple" selected-menuitem-context-field-name="tabButtonItem"> <menu-item name="EditSecurityGroup" title="${uiLabelMap.PartySecurityGroups}"> - <link target="EditSecurityGroup?groupId=${groupId}"/> + <link target="EditSecurityGroup"> + <parameter param-name="groupId" from-field="groupId"/> + </link> </menu-item> <menu-item name="EditSecurityGroupPermissions" title="${uiLabelMap.PartyPermissions}"> - <link target="EditSecurityGroupPermissions?groupId=${groupId}"/> + <link target="EditSecurityGroupPermissions"> + <parameter param-name="groupId" from-field="groupId"/> + </link> </menu-item> <menu-item name="EditSecurityGroupUserLogins" title="${uiLabelMap.PartyUserLogins}"> - <link target="EditSecurityGroupUserLogins?groupId=${groupId}"/> + <link target="EditSecurityGroupUserLogins"> + <parameter param-name="groupId" from-field="groupId"/> + </link> </menu-item> <menu-item name="EditSecurityGroupProtectedViews" title="${uiLabelMap.PartyProtectedViews}"> - <link target="EditSecurityGroupProtectedViews?groupId=${groupId}"/> + <link target="EditSecurityGroupProtectedViews"> + <parameter param-name="groupId" from-field="groupId"/> + </link> </menu-item> </menu> <menu name="ProfileTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" default-menu-item-name="viewprofile"> <menu-item name="viewprofile" title="${uiLabelMap.PartyProfile}"> - <link target="viewprofile?partyId=${partyId}"/> + <link target="viewprofile"> + <parameter param-name="partyId" from-field="partyId"/> + </link> </menu-item> <menu-item name="preferences" title="${uiLabelMap.CommonPreferences}"> - <link target="Preferences?partyId=${partyId}"/> + <link target="Preferences"> + <parameter param-name="partyId" from-field="partyId"/> + </link> </menu-item> <menu-item name="viewroles" title="${uiLabelMap.PartyRoles}"> - <link target="viewroles?partyId=${partyId}"/> + <link target="viewroles"> + <parameter param-name="partyId" from-field="partyId"/> + </link> </menu-item> <menu-item name="linkparty" title="${uiLabelMap.PartyLink}"> - <link target="linkparty?partyId=${partyId}"/> + <link target="linkparty"> + <parameter param-name="partyId" from-field="partyId"/> + </link> </menu-item> <menu-item name="EditPartyRelationships" title="${uiLabelMap.PartyRelationships}"> - <link target="EditPartyRelationships?partyId=${partyId}"/> + <link target="EditPartyRelationships"> + <parameter param-name="partyId" from-field="partyId"/> + </link> </menu-item> <menu-item name="viewvendor" title="${uiLabelMap.PartyVendor}"> - <link target="viewvendor?partyId=${partyId}"/> + <link target="viewvendor"> + <parameter param-name="partyId" from-field="partyId"/> + </link> </menu-item> <menu-item name="EditPartyTaxAuthInfos" title="${uiLabelMap.PartyTaxAuthInfos}"> - <link target="EditPartyTaxAuthInfos?partyId=${partyId}"/> + <link target="EditPartyTaxAuthInfos"> + <parameter param-name="partyId" from-field="partyId"/> + </link> </menu-item> <menu-item name="EditPartyRates" title="${uiLabelMap.CommonRates}"> - <link target="EditPartyRates?partyId=${partyId}"/> + <link target="EditPartyRates"> + <parameter param-name="partyId" from-field="partyId"/> + </link> </menu-item> <menu-item name="editShoppingList" title="${uiLabelMap.PartyShoppingLists}"> - <link target="editShoppingList?partyId=${partyId}"/> + <link target="editShoppingList"> + <parameter param-name="partyId" from-field="partyId"/> + </link> </menu-item> <menu-item name="ViewSegmentRoles" title="${uiLabelMap.PartySegments}"> - <link target="ViewSegmentRoles?partyId=${partyId}"/> + <link target="ViewSegmentRoles"> + <parameter param-name="partyId" from-field="partyId"/> + </link> </menu-item> <menu-item name="EditPartyClassifications" title="${uiLabelMap.PartyClassifications}"> - <link target="EditPartyClassifications?partyId=${partyId}"/> + <link target="EditPartyClassifications"> + <parameter param-name="partyId" from-field="partyId"/> + </link> </menu-item> <menu-item name="ContactList" title="${uiLabelMap.PartyContactLists}"> - <link target="ListPartyContactLists?partyId=${partyId}"/> + <link target="ListPartyContactLists"> + <parameter param-name="partyId" from-field="partyId"/> + </link> </menu-item> <menu-item name="PartyContents" title="${uiLabelMap.PartyContent}"> - <link target="EditPartyContents?partyId=${partyId}"/> + <link target="EditPartyContents"> + <parameter param-name="partyId" from-field="partyId"/> + </link> </menu-item> <menu-item name="EditPartySkills" title="${uiLabelMap.CommonPartySkills}"> - <link target="EditPartySkills?partyId=${partyId}"/> + <link target="EditPartySkills"> + <parameter param-name="partyId" from-field="partyId"/> + </link> </menu-item> <menu-item name="EditPersonTrainings" title="${uiLabelMap.HumanResTraining}"> - <link target="EditPersonTrainings?partyId=${partyId}"/> + <link target="EditPersonTrainings"> + <parameter param-name="partyId" from-field="partyId"/> + </link> </menu-item> <menu-item name="EditPartyResumes" title="${uiLabelMap.HumanResPartyResume}"> - <link target="EditPartyResumes?partyId=${partyId}"/> + <link target="EditPartyResumes"> + <parameter param-name="partyId" from-field="partyId"/> + </link> </menu-item> <menu-item name="EditEmploymentApps" title="${uiLabelMap.HumanResEmploymentApp}"> <link target="EditEmploymentApps"> @@ -112,10 +152,14 @@ <condition> <if-has-permission permission="ACCOUNTING" action="_VIEW"/> </condition> - <link target="PartyFinancialHistory?partyId=${partyId}"/> + <link target="PartyFinancialHistory"> + <parameter param-name="partyId" from-field="partyId"/> + </link> </menu-item> <menu-item name="PartyGeoLocation" title="${uiLabelMap.CommonGeoLocation}"> - <link target="PartyGeoLocation?partyId=${partyId}"/> + <link target="PartyGeoLocation"> + <parameter param-name="partyId" from-field="partyId"/> + </link> </menu-item> </menu> <menu name="ProfileSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" @@ -137,7 +181,9 @@ </link> </menu-item> <menu-item name="PartyCommEvents" title="${uiLabelMap.PartyCommunications}" > - <link target="ListPartyCommEvents?partyId=${partyId}"/> + <link target="ListPartyCommEvents"> + <parameter param-name="partyId" from-field="partyId"/> + </link> </menu-item> <menu-item name="findRequest" title="${uiLabelMap.PartyPartyRequests}" > <condition> @@ -209,25 +255,35 @@ <menu name="PartyInvitationTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="EditPartyInvitation" title="${uiLabelMap.PartyInvitation}"> - <link target="editPartyInvitation?partyInvitationId=${partyInvitationId}"/> + <link target="editPartyInvitation"> + <parameter param-name="partyInvitationId" from-field="partyInvitationId"/> + </link> </menu-item> <menu-item name="PartyInvitationGroupAssocs" title="${uiLabelMap.PartyInvitationGroupAssoc}"> - <link target="PartyInvitationGroupAssocs?partyInvitationId=${partyInvitationId}"/> + <link target="PartyInvitationGroupAssocs"> + <parameter param-name="partyInvitationId" from-field="partyInvitationId"/> + </link> </menu-item> <menu-item name="PartyInvitationRoleAssocs" title="${uiLabelMap.PartyInvitationRoleAssoc}"> - <link target="PartyInvitationRoleAssocs?partyInvitationId=${partyInvitationId}"/> + <link target="PartyInvitationRoleAssocs"> + <parameter param-name="partyInvitationId" from-field="partyInvitationId"/> + </link> </menu-item> </menu> <menu name="personUpdate"> <menu-item name="update" title="${uiLabelMap.CommonUpdate}"> - <link target="editperson?partyId=${parameters.partyId}"/> + <link target="editperson"> + <parameter param-name="partyId" from-field="parameters.partyId"/> + </link> </menu-item> </menu> <menu name="groupUpdate"> <menu-item name="update" title="${uiLabelMap.CommonUpdate}"> - <link target="editpartygroup?partyId=${party.partyId}"/> + <link target="editpartygroup"> + <parameter param-name="partyId" from-field="party.partyId"/> + </link> </menu-item> </menu> @@ -236,7 +292,9 @@ <condition> <if-has-permission permission="PARTYMGR" action="_CREATE"/> </condition> - <link target="editCarrierAccount?partyId=${party.partyId}"/> + <link target="editCarrierAccount"> + <parameter param-name="partyId" from-field="party.partyId"/> + </link> </menu-item> </menu> <menu name="communicationsMenu"> @@ -393,27 +451,39 @@ </menu-item> <menu-item name="OverView" title="${uiLabelMap.CommonOverview}"> <condition><not><if-empty field="communicationEvent"/></not></condition> - <link target="ViewCommunicationEvent?communicationEventId=${parameters.communicationEventId}"/> + <link target="ViewCommunicationEvent"> + <parameter param-name="communicationEventId" from-field="parameters.communicationEventId"/> + </link> </menu-item> <menu-item name="CommunicationEvent" title="${uiLabelMap.PartyCommEvent}"> <condition><not><if-empty field="communicationEvent"/></not></condition> - <link target="EditCommunicationEvent?communicationEventId=${parameters.communicationEventId}"/> + <link target="EditCommunicationEvent"> + <parameter param-name="communicationEventId" from-field="parameters.communicationEventId"/> + </link> </menu-item> <menu-item name="UpdateCommPurposes" title="${uiLabelMap.PartyEventPurpose}"> <condition><not><if-empty field="communicationEvent"/></not></condition> - <link target="UpdateCommPurposes?communicationEventId=${parameters.communicationEventId}"/> + <link target="UpdateCommPurposes"> + <parameter param-name="communicationEventId" from-field="parameters.communicationEventId"/> + </link> </menu-item> <menu-item name="UpdateCommRoles" title="${uiLabelMap.PartyRoles}"> <condition><not><if-empty field="communicationEvent"/></not></condition> - <link target="UpdateCommRoles?communicationEventId=${parameters.communicationEventId}"/> + <link target="UpdateCommRoles"> + <parameter param-name="communicationEventId" from-field="parameters.communicationEventId"/> + </link> </menu-item> <menu-item name="UpdateCommWorkEfforts" title="${uiLabelMap.PartyCommWorkEfforts}"> <condition><not><if-empty field="communicationEvent"/></not></condition> - <link target="ListCommWorkEfforts?communicationEventId=${parameters.communicationEventId}"/> + <link target="ListCommWorkEfforts"> + <parameter param-name="communicationEventId" from-field="parameters.communicationEventId"/> + </link> </menu-item> <menu-item name="CommContent" title="${uiLabelMap.CommonContent}"> <condition><not><if-empty field="communicationEvent"/></not></condition> - <link target="ListCommContent?communicationEventId=${parameters.communicationEventId}"/> + <link target="ListCommContent"> + <parameter param-name="communicationEventId" from-field="parameters.communicationEventId"/> + </link> </menu-item> <!-- TODO! <menu-item name="ListCommCustRequests" title="CustRequests"> @@ -468,7 +538,9 @@ <if-compare field="communicationEvent.partyIdFrom" operator="not-equals" value="${userLogin.partyId}"/> </and> </condition> - <link target="EditCommunicationEvent?parentCommEventId=${parameters.communicationEventId}"/> + <link target="EditCommunicationEvent"> + <parameter param-name="parentCommEventId" from-field="parameters.communicationEventId"/> + </link> </menu-item> <menu-item name="forward" title="${uiLabelMap.PartyForward}"> <condition> @@ -478,7 +550,9 @@ <if-compare field="communicationEvent.partyIdFrom" operator="not-equals" value="${userLogin.partyId}"/> </and> </condition> - <link target="EditCommunicationEvent?originalCommEventId=${parameters.communicationEventId}"/> + <link target="EditCommunicationEvent"> + <parameter param-name="originalCommEventId" from-field="parameters.communicationEventId"/> + </link> </menu-item> <menu-item name="createRequestFromCommEvent" title="${uiLabelMap.PartyCreateRequestFromCommEvent}"> <condition> @@ -488,7 +562,9 @@ <if-has-permission permission="ORDERMGR_CRQ_CREATE"/> </and> </condition> - <link target="editRequestFromCommEvent?communicationEventId=${parameters.communicationEventId}"/> + <link target="editRequestFromCommEvent"> + <parameter param-name="communicationEventId" from-field="parameters.communicationEventId"/> + </link> </menu-item> <menu-item name="delete" title="${uiLabelMap.CommonDelete}"> <condition> |
Free forum by Nabble | Edit this page |