svn commit: r1805892 - in /ofbiz/ofbiz-framework/trunk: applications/accounting/webapp
Locked
svn commit: r1805892 - in /ofbiz/ofbiz-framework/trunk: applications/accounting/webapp
 
|
Author: nmalin
Date: Wed Aug 23 12:18:09 2017 New Revision: 1805892 URL: http://svn.apache.org/viewvc?rev=1805892&view=rev Log: Fixed: Consistency and Readability improvements for view-map tag (OFBIZ-9110) Consistency on the attribute order for view-map element as : name, type, page Thanks to Ankush Upadhyay and Devanshu Vyas for the issue and the corrective patch Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml ofbiz/ofbiz-framework/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/controller.xml ofbiz/ofbiz-framework/trunk/applications/content/webapp/content/WEB-INF/controller.xml ofbiz/ofbiz-framework/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml ofbiz/ofbiz-framework/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml ofbiz/ofbiz-framework/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml ofbiz/ofbiz-framework/trunk/applications/product/webapp/facility/WEB-INF/controller.xml ofbiz/ofbiz-framework/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml ofbiz/ofbiz-framework/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml?rev=1805892&r1=1805891&r2=1805892&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/webapp/accounting/WEB-INF/controller.xml Wed Aug 23 12:18:09 2017 @@ -2766,16 +2766,16 @@ under the License. <view-map name="ExportInvoicesCsv" type="screencsv" page="component://accounting/widget/GlSetupScreens.xml#ExportInvoiceCsv" content-type="text/csv" encoding="none"/> <!-- Manual Credit Card Transaction --> - <view-map name="FindGatewayResponses" page="component://accounting/widget/TransactionScreens.xml#FindGatewayResponses" type="screen"/> - <view-map name="ViewGatewayResponse" page="component://accounting/widget/TransactionScreens.xml#ViewGatewayResponse" type="screen"/> - <view-map name="AuthorizeTransaction" page="component://accounting/widget/TransactionScreens.xml#AuthorizeTransaction" type="screen"/> - <view-map name="CaptureTransaction" page="component://accounting/widget/TransactionScreens.xml#CaptureTransaction" type="screen"/> + <view-map name="FindGatewayResponses" type="screen" page="component://accounting/widget/TransactionScreens.xml#FindGatewayResponses"/> + <view-map name="ViewGatewayResponse" type="screen" page="component://accounting/widget/TransactionScreens.xml#ViewGatewayResponse"/> + <view-map name="AuthorizeTransaction" type="screen" page="component://accounting/widget/TransactionScreens.xml#AuthorizeTransaction"/> + <view-map name="CaptureTransaction" type="screen" page="component://accounting/widget/TransactionScreens.xml#CaptureTransaction"/> <!-- Payment Gateway Config --> - <view-map name="FindPaymentGatewayConfig" page="component://accounting/widget/PaymentGatewayConfigScreens.xml#FindPaymentGatewayConfig" type="screen"/> - <view-map name="EditPaymentGatewayConfig" page="component://accounting/widget/PaymentGatewayConfigScreens.xml#EditPaymentGatewayConfig" type="screen"/> - <view-map name="FindPaymentGatewayConfigTypes" page="component://accounting/widget/PaymentGatewayConfigScreens.xml#FindPaymentGatewayConfigTypes" type="screen"/> - <view-map name="EditPaymentGatewayConfigType" page="component://accounting/widget/PaymentGatewayConfigScreens.xml#EditPaymentGatewayConfigType" type="screen"/> + <view-map name="FindPaymentGatewayConfig" type="screen" page="component://accounting/widget/PaymentGatewayConfigScreens.xml#FindPaymentGatewayConfig"/> + <view-map name="EditPaymentGatewayConfig" type="screen" page="component://accounting/widget/PaymentGatewayConfigScreens.xml#EditPaymentGatewayConfig"/> + <view-map name="FindPaymentGatewayConfigTypes" type="screen" page="component://accounting/widget/PaymentGatewayConfigScreens.xml#FindPaymentGatewayConfigTypes"/> + <view-map name="EditPaymentGatewayConfigType" type="screen" page="component://accounting/widget/PaymentGatewayConfigScreens.xml#EditPaymentGatewayConfigType"/> <!-- Lookup mappings --> <view-map name="viewprofile" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#viewprofile"/> @@ -2792,9 +2792,9 @@ under the License. <view-map name="LookupFixedAsset" type="screen" page="component://accounting/widget/LookupScreens.xml#LookupFixedAsset"/> <view-map name="LookupGlAccount" type="screen" page="component://accounting/widget/LookupScreens.xml#LookupGlAccount"/> - <view-map name="LookupBillingAccount" page="component://accounting/widget/LookupScreens.xml#LookupBillingAccount" type="screen"/> - <view-map name="LookupPayment" page="component://accounting/widget/LookupScreens.xml#LookupPayment" type="screen"/> - <view-map name="LookupInvoice" page="component://accounting/widget/LookupScreens.xml#LookupInvoice" type="screen"/> + <view-map name="LookupBillingAccount" type="screen" page="component://accounting/widget/LookupScreens.xml#LookupBillingAccount"/> + <view-map name="LookupPayment" type="screen" page="component://accounting/widget/LookupScreens.xml#LookupPayment"/> + <view-map name="LookupInvoice" type="screen" page="component://accounting/widget/LookupScreens.xml#LookupInvoice"/> <view-map name="LookupCustomTimePeriod" type="screen" page="component://accounting/widget/LookupScreens.xml#LookupCustomTimePeriod"/> <view-map name="LookupWorkEffort" type="screen" page="component://workeffort/widget/LookupScreens.xml#LookupWorkEffort"/> Modified: ofbiz/ofbiz-framework/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/controller.xml?rev=1805892&r1=1805891&r2=1805892&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/controller.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/controller.xml Wed Aug 23 12:18:09 2017 @@ -207,8 +207,8 @@ <view-map name="EntityExportAll" type="screen" page="component://commonext/widget/ofbizsetup/CommonScreens.xml#EntityExportAll"/> - <view-map name="FindWebSite" page="component://commonext/widget/ofbizsetup/SetupScreens.xml#FindWebSite" type="screen"/> - <view-map name="EditWebSite" page="component://commonext/widget/ofbizsetup/SetupScreens.xml#EditWebSite" type="screen"/> + <view-map name="FindWebSite" type="screen" page="component://commonext/widget/ofbizsetup/SetupScreens.xml#FindWebSite"/> + <view-map name="EditWebSite" type="screen" page="component://commonext/widget/ofbizsetup/SetupScreens.xml#EditWebSite"/> <view-map name="firstcustomer" type="screen" page="component://commonext/widget/ofbizsetup/ProfileScreens.xml#FirstCustomer"/> <view-map name="firstproduct" type="screen" page="component://commonext/widget/ofbizsetup/SetupScreens.xml#EditProdCatalog"/> Modified: ofbiz/ofbiz-framework/trunk/applications/content/webapp/content/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/webapp/content/WEB-INF/controller.xml?rev=1805892&r1=1805891&r2=1805892&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/webapp/content/WEB-INF/controller.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/webapp/content/WEB-INF/controller.xml Wed Aug 23 12:18:09 2017 @@ -1964,164 +1964,164 @@ under the License. <view-map name="main" type="screen" page="component://content/widget/CommonScreens.xml#main"/> <view-map name="fonts.fo" type="screenfop" page="component://content/widget/CommonScreens.xml#fonts.fo" content-type="application/pdf" encoding="none"/> - <view-map name="blogMain" page="component://content/widget/forum/BlogScreens.xml#BlogMain" type="screen"/> - <view-map name="blogContent" page="component://content/widget/forum/BlogScreens.xml#BlogContent" type="screen"/> - <view-map name="ViewBlogArticle" page="component://content/widget/forum/BlogScreens.xml#ViewArticle" type="screen"/> + <view-map name="blogMain" type="screen" page="component://content/widget/forum/BlogScreens.xml#BlogMain"/> + <view-map name="blogContent" type="screen" page="component://content/widget/forum/BlogScreens.xml#BlogContent"/> + <view-map name="ViewBlogArticle" type="screen" page="component://content/widget/forum/BlogScreens.xml#ViewArticle"/> <view-map name="EditBlog" type="screen" page="component://content/widget/forum/BlogScreens.xml#EditBlog"/> - <view-map name="EditBlogArticle" page="component://content/widget/forum/BlogScreens.xml#EditArticle" type="screen"/> - <view-map name="ViewResponse" page="component://content/widget/forum/BlogScreens.xml#BlogMain" type="screen"/> + <view-map name="EditBlogArticle" type="screen" page="component://content/widget/forum/BlogScreens.xml#EditArticle"/> + <view-map name="ViewResponse" type="screen" page="component://content/widget/forum/BlogScreens.xml#BlogMain"/> <view-map name="RespondBlog" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#AddBlogResponse"/> <view-map name="EditBlogText" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#EditBlogResponse"/> <view-map name="EditBlogImage" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#EditBlogResponse"/> <view-map name="EditBlogResponse" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#EditBlogResponse"/> <view-map name="LatestResponses" type="screen" page="component://ecommerce/widget/blog/BlogScreens.xml#LatestResponses"/> - <view-map name="FindForumGroups" page="component://content/widget/forum/ForumScreens.xml#FindForumGroups" type="screen"/> - <view-map name="ForumGroupRoles" page="component://content/widget/forum/ForumScreens.xml#ForumGroupRoles" type="screen"/> - <view-map name="ForumGroupPurposes" page="component://content/widget/forum/ForumScreens.xml#ForumGroupPurposes" type="screen"/> - <view-map name="FindForums" page="component://content/widget/forum/ForumScreens.xml#FindForums" type="screen"/> - <view-map name="FindForumMessages" page="component://content/widget/forum/ForumScreens.xml#FindForumMessages" type="screen"/> - <view-map name="FindForumThreads" page="component://content/widget/forum/ForumScreens.xml#FindForumThreads" type="screen"/> - <view-map name="AddForumMessage" page="component://content/widget/forum/ForumScreens.xml#AddForumMessage" type="screen"/> - <view-map name="AddForumThreadMessage" page="component://content/widget/forum/ForumScreens.xml#AddForumThreadMessage" type="screen"/> - <view-map name="EditForumMessage" page="component://content/widget/forum/ForumScreens.xml#EditForumMessage" type="screen"/> - - <view-map name="FindWebSite" page="component://content/widget/WebSiteScreens.xml#FindWebSite" type="screen"/> - <view-map name="EditWebSite" page="component://content/widget/WebSiteScreens.xml#EditWebSite" type="screen"/> - <view-map name="WebSiteAliases" page="component://content/widget/WebSiteScreens.xml#WebSiteAliases" type="screen"/> - <view-map name="WebSiteAliasesSearchResults" page="component://content/widget/WebSiteScreens.xml#WebSiteAliasesSearchResults" type="screen"/> + <view-map name="FindForumGroups" type="screen" page="component://content/widget/forum/ForumScreens.xml#FindForumGroups"/> + <view-map name="ForumGroupRoles" type="screen" page="component://content/widget/forum/ForumScreens.xml#ForumGroupRoles"/> + <view-map name="ForumGroupPurposes" type="screen" page="component://content/widget/forum/ForumScreens.xml#ForumGroupPurposes"/> + <view-map name="FindForums" type="screen" page="component://content/widget/forum/ForumScreens.xml#FindForums"/> + <view-map name="FindForumMessages" type="screen" page="component://content/widget/forum/ForumScreens.xml#FindForumMessages"/> + <view-map name="FindForumThreads" type="screen" page="component://content/widget/forum/ForumScreens.xml#FindForumThreads"/> + <view-map name="AddForumMessage" type="screen" page="component://content/widget/forum/ForumScreens.xml#AddForumMessage"/> + <view-map name="AddForumThreadMessage" type="screen" page="component://content/widget/forum/ForumScreens.xml#AddForumThreadMessage"/> + <view-map name="EditForumMessage" type="screen" page="component://content/widget/forum/ForumScreens.xml#EditForumMessage"/> + + <view-map name="FindWebSite" type="screen" page="component://content/widget/WebSiteScreens.xml#FindWebSite"/> + <view-map name="EditWebSite" type="screen" page="component://content/widget/WebSiteScreens.xml#EditWebSite"/> + <view-map name="WebSiteAliases" type="screen" page="component://content/widget/WebSiteScreens.xml#WebSiteAliases"/> + <view-map name="WebSiteAliasesSearchResults" type="screen" page="component://content/widget/WebSiteScreens.xml#WebSiteAliasesSearchResults"/> <view-map name="EditWebSitePathAlias" type="screen" page="component://content/widget/WebSiteScreens.xml#EditWebSitePathAlias"/> - <view-map name="WebSiteContent" page="component://content/widget/WebSiteScreens.xml#WebSiteContent" type="screen"/> - <view-map name="WebSiteCMS" page="component://content/widget/WebSiteScreens.xml#WebSiteCMS" type="screen"/> - <view-map name="WebSiteCMSContent" page="component://content/widget/WebSiteScreens.xml#WebSiteCMSContent" type="screen"/> - <view-map name="WebSiteCMSEditor" page="component://content/widget/WebSiteScreens.xml#WebSiteCMSEditor" type="screen"/> - <view-map name="WebSiteCMSMetaInfo" page="component://content/widget/WebSiteScreens.xml#WebSiteCMSMetaInfo" type="screen"/> - <view-map name="WebSiteCMSPathAlias" page="component://content/widget/WebSiteScreens.xml#WebSiteCMSPathAlias" type="screen"/> - <view-map name="WebSiteCMSNav" page="component://content/widget/WebSiteScreens.xml#WebSiteCMSNav" type="screen"/> - <view-map name="EditWebSiteParties" page="component://content/widget/WebSiteScreens.xml#EditWebSiteParties" type="screen"/> - <view-map name="WebSiteSEO" page="component://content/widget/WebSiteScreens.xml#WebSiteSEO" type="screen"/> - <view-map name="WebSiteContactList" page="component://content/widget/WebSiteScreens.xml#WebSiteContactList" type="screen"/> - - <view-map name="EditContentPurpose" page="component://content/widget/content/ContentScreens.xml#EditContentPurpose" type="screen"/> - <view-map name="EditContentRole" page="component://content/widget/content/ContentScreens.xml#EditContentRole" type="screen"/> - <view-map name="FindContent" page="component://content/widget/content/ContentScreens.xml#FindContent" type="screen"/> + <view-map name="WebSiteContent" type="screen" page="component://content/widget/WebSiteScreens.xml#WebSiteContent"/> + <view-map name="WebSiteCMS" type="screen" page="component://content/widget/WebSiteScreens.xml#WebSiteCMS"/> + <view-map name="WebSiteCMSContent" type="screen" page="component://content/widget/WebSiteScreens.xml#WebSiteCMSContent"/> + <view-map name="WebSiteCMSEditor" type="screen" page="component://content/widget/WebSiteScreens.xml#WebSiteCMSEditor"/> + <view-map name="WebSiteCMSMetaInfo" type="screen" page="component://content/widget/WebSiteScreens.xml#WebSiteCMSMetaInfo"/> + <view-map name="WebSiteCMSPathAlias" type="screen" page="component://content/widget/WebSiteScreens.xml#WebSiteCMSPathAlias"/> + <view-map name="WebSiteCMSNav" type="screen" page="component://content/widget/WebSiteScreens.xml#WebSiteCMSNav"/> + <view-map name="EditWebSiteParties" type="screen" page="component://content/widget/WebSiteScreens.xml#EditWebSiteParties"/> + <view-map name="WebSiteSEO" type="screen" page="component://content/widget/WebSiteScreens.xml#WebSiteSEO"/> + <view-map name="WebSiteContactList" type="screen" page="component://content/widget/WebSiteScreens.xml#WebSiteContactList"/> + + <view-map name="EditContentPurpose" type="screen" page="component://content/widget/content/ContentScreens.xml#EditContentPurpose"/> + <view-map name="EditContentRole" type="screen" page="component://content/widget/content/ContentScreens.xml#EditContentRole"/> + <view-map name="FindContent" type="screen" page="component://content/widget/content/ContentScreens.xml#FindContent"/> <view-map name="findContentSearchResults" type="screen" page="component://content/widget/content/ContentScreens.xml#findContentSearchResults"/> - <view-map name="EditContent" page="component://content/widget/content/ContentScreens.xml#EditContent" type="screen"/> - <view-map name="EditContentAssoc" page="component://content/widget/content/ContentScreens.xml#EditContentAssoc" type="screen"/> - <view-map name="ListWebSite" page="component://content/widget/content/ContentScreens.xml#ListWebSite" type="screen"/> - - <view-map name="EditContentAttribute" page="component://content/widget/content/ContentScreens.xml#EditContentAttribute" type="screen"/> - <view-map name="EditContentMetaData" page="component://content/widget/content/ContentScreens.xml#EditContentMetaData" type="screen"/> - <view-map name="EditContentType" page="component://content/widget/contentsetup/ContentSetupScreens.xml#EditContentType" type="screen"/> - <view-map name="EditContentAssocType" page="component://content/widget/contentsetup/ContentSetupScreens.xml#EditContentAssocType" type="screen"/> - <view-map name="EditContentPurposeType" page="component://content/widget/contentsetup/ContentSetupScreens.xml#EditContentPurposeType" type="screen"/> - <view-map name="EditContentTypeAttr" page="component://content/widget/contentsetup/ContentSetupScreens.xml#EditContentTypeAttr" type="screen"/> - <view-map name="EditContentAssocPredicate" page="component://content/widget/contentsetup/ContentSetupScreens.xml#EditContentAssocPredicate" type="screen"/> - <view-map name="EditContentOperation" page="component://content/widget/contentsetup/ContentSetupScreens.xml#EditContentOperation" type="screen"/> - <view-map name="EditContentPurposeOperation" page="component://content/widget/contentsetup/ContentSetupScreens.xml#EditContentPurposeOperation" type="screen"/> - <view-map name="EditContentWorkEfforts" page="component://content/widget/content/ContentScreens.xml#EditContentWorkEfforts" type="screen"/> + <view-map name="EditContent" type="screen" page="component://content/widget/content/ContentScreens.xml#EditContent"/> + <view-map name="EditContentAssoc" type="screen" page="component://content/widget/content/ContentScreens.xml#EditContentAssoc"/> + <view-map name="ListWebSite" type="screen" page="component://content/widget/content/ContentScreens.xml#ListWebSite"/> + + <view-map name="EditContentAttribute" type="screen" page="component://content/widget/content/ContentScreens.xml#EditContentAttribute"/> + <view-map name="EditContentMetaData" type="screen" page="component://content/widget/content/ContentScreens.xml#EditContentMetaData"/> + <view-map name="EditContentType" type="screen" page="component://content/widget/contentsetup/ContentSetupScreens.xml#EditContentType"/> + <view-map name="EditContentAssocType" type="screen" page="component://content/widget/contentsetup/ContentSetupScreens.xml#EditContentAssocType"/> + <view-map name="EditContentPurposeType" type="screen" page="component://content/widget/contentsetup/ContentSetupScreens.xml#EditContentPurposeType"/> + <view-map name="EditContentTypeAttr" type="screen" page="component://content/widget/contentsetup/ContentSetupScreens.xml#EditContentTypeAttr"/> + <view-map name="EditContentAssocPredicate" type="screen" page="component://content/widget/contentsetup/ContentSetupScreens.xml#EditContentAssocPredicate"/> + <view-map name="EditContentOperation" type="screen" page="component://content/widget/contentsetup/ContentSetupScreens.xml#EditContentOperation"/> + <view-map name="EditContentPurposeOperation" type="screen" page="component://content/widget/contentsetup/ContentSetupScreens.xml#EditContentPurposeOperation"/> + <view-map name="EditContentWorkEfforts" type="screen" page="component://content/widget/content/ContentScreens.xml#EditContentWorkEfforts"/> <view-map name="EditContentKeywords" type="screen" page="component://content/widget/content/ContentScreens.xml#EditContentKeywords"/> - <view-map name="FindDataResource" page="component://content/widget/content/DataResourceScreens.xml#FindDataResource" type="screen"/> - <view-map name="findDataResourceSearchResults" page="component://content/widget/content/DataResourceScreens.xml#findDataResourceSearchResults" type="screen"/> + <view-map name="FindDataResource" type="screen" page="component://content/widget/content/DataResourceScreens.xml#FindDataResource"/> + <view-map name="findDataResourceSearchResults" type="screen" page="component://content/widget/content/DataResourceScreens.xml#findDataResourceSearchResults"/> <view-map name="navigateDataResource" type="screen" page="component://content/widget/content/DataResourceScreens.xml#navigateDataResource"/> <view-map name="listDataResources" type="screen" page="component://content/widget/content/DataResourceScreens.xml#listDataResources"/> - <view-map name="UploadImage" page="component://content/widget/content/DataResourceScreens.xml#UploadImage" type="screen"/> - <view-map name="EditDataResource" page="component://content/widget/content/DataResourceScreens.xml#EditDataResource" type="screen"/> - <view-map name="AddDataResource" page="component://content/widget/content/DataResourceScreens.xml#AddDataResource" type="screen"/> - <view-map name="AddDataResourceText" page="component://content/widget/content/DataResourceScreens.xml#AddDataResourceText" type="screen"/> - <view-map name="AddDataResourceUrl" page="component://content/widget/content/DataResourceScreens.xml#AddDataResourceUrl" type="screen"/> - <view-map name="AddDataResourceUpload" page="component://content/widget/content/DataResourceScreens.xml#AddDataResourceUpload" type="screen"/> - <view-map name="AddDataResourceFromContent" page="component://content/widget/content/DataResourceScreens.xml#AddDataResourceFromContent" type="screen"/> - <view-map name="EditDataResourceText" page="component://content/widget/content/DataResourceScreens.xml#EditDataResourceText" type="screen"/> - <view-map name="EditDataResourceUrl" page="component://content/widget/content/DataResourceScreens.xml#EditDataResourceUrl" type="screen"/> - <view-map name="EditDataResourceUpload" page="component://content/widget/content/DataResourceScreens.xml#EditDataResourceUpload" type="screen"/> - <view-map name="EditElectronicText" page="component://content/widget/content/DataResourceScreens.xml#EditElectronicText" type="screen"/> - <view-map name="EditDataResourceAttribute" page="component://content/widget/content/DataResourceScreens.xml#EditDataResourceAttribute" type="screen"/> - <view-map name="EditDataResourceRole" page="component://content/widget/content/DataResourceScreens.xml#EditDataResourceRole" type="screen"/> - <view-map name="EditDataResourceProductFeatures" page="component://content/widget/content/DataResourceScreens.xml#EditDataResourceProductFeatures" type="screen"/> - <view-map name="EditHtmlText" page="component://content/widget/content/DataResourceScreens.xml#EditHtmlText" type="screen"/> - - <view-map name="EditDataResourceType" page="component://content/widget/datasetup/DataResourceSetupScreens.xml#EditDataResourceType" type="screen"/> - <view-map name="EditDataResourceTypeAttr" page="component://content/widget/datasetup/DataResourceSetupScreens.xml#EditDataResourceTypeAttr" type="screen"/> - <view-map name="EditDataCategory" page="component://content/widget/datasetup/DataResourceSetupScreens.xml#EditDataCategory" type="screen"/> - <view-map name="EditMetaDataPredicate" page="component://content/widget/datasetup/DataResourceSetupScreens.xml#EditMetaDataPredicate" type="screen"/> - <view-map name="EditCharacterSet" page="component://content/widget/datasetup/DataResourceSetupScreens.xml#EditCharacterSet" type="screen"/> - <view-map name="EditFileExtension" page="component://content/widget/datasetup/DataResourceSetupScreens.xml#EditFileExtension" type="screen"/> - <view-map name="EditMimeType" page="component://content/widget/datasetup/DataResourceSetupScreens.xml#EditMimeType" type="screen"/> - <view-map name="EditMimeTypeHtmlTemplate" page="component://content/widget/datasetup/DataResourceSetupScreens.xml#EditMimeTypeHtmlTemplate" type="screen"/> - - <view-map name="ListLayout" page="component://content/widget/layout/LayoutScreens.xml#ListLayout" type="screen"/> - <view-map name="FindLayout" page="component://content/widget/layout/LayoutScreens.xml#FindLayout" type="screen"/> - <view-map name="EditLayout" page="component://content/widget/layout/LayoutScreens.xml#EditLayout" type="screen"/> - <view-map name="AddLayout" page="component://content/widget/layout/LayoutScreens.xml#AddLayout" type="screen"/> - <view-map name="EditLayoutSubContent" page="component://content/widget/layout/LayoutScreens.xml#EditLayoutSubContent" type="screen"/> - <view-map name="EditLayoutText" page="component://content/widget/layout/LayoutScreens.xml#EditLayoutText" type="screen"/> - <view-map name="EditLayoutHtml" page="component://content/widget/layout/LayoutScreens.xml#EditLayoutHtml" type="screen"/> - <view-map name="EditLayoutImage" page="component://content/widget/layout/LayoutScreens.xml#EditLayoutImage" type="screen"/> - <view-map name="EditLayoutUrl" page="component://content/widget/layout/LayoutScreens.xml#EditLayoutUrl" type="screen"/> + <view-map name="UploadImage" type="screen" page="component://content/widget/content/DataResourceScreens.xml#UploadImage"/> + <view-map name="EditDataResource" type="screen" page="component://content/widget/content/DataResourceScreens.xml#EditDataResource"/> + <view-map name="AddDataResource" type="screen" page="component://content/widget/content/DataResourceScreens.xml#AddDataResource"/> + <view-map name="AddDataResourceText" type="screen" page="component://content/widget/content/DataResourceScreens.xml#AddDataResourceText"/> + <view-map name="AddDataResourceUrl" type="screen" page="component://content/widget/content/DataResourceScreens.xml#AddDataResourceUrl"/> + <view-map name="AddDataResourceUpload" type="screen" page="component://content/widget/content/DataResourceScreens.xml#AddDataResourceUpload"/> + <view-map name="AddDataResourceFromContent" type="screen" page="component://content/widget/content/DataResourceScreens.xml#AddDataResourceFromContent"/> + <view-map name="EditDataResourceText" type="screen" page="component://content/widget/content/DataResourceScreens.xml#EditDataResourceText"/> + <view-map name="EditDataResourceUrl" type="screen" page="component://content/widget/content/DataResourceScreens.xml#EditDataResourceUrl"/> + <view-map name="EditDataResourceUpload" type="screen" page="component://content/widget/content/DataResourceScreens.xml#EditDataResourceUpload"/> + <view-map name="EditElectronicText" type="screen" page="component://content/widget/content/DataResourceScreens.xml#EditElectronicText"/> + <view-map name="EditDataResourceAttribute" type="screen" page="component://content/widget/content/DataResourceScreens.xml#EditDataResourceAttribute"/> + <view-map name="EditDataResourceRole" type="screen" page="component://content/widget/content/DataResourceScreens.xml#EditDataResourceRole"/> + <view-map name="EditDataResourceProductFeatures" type="screen" page="component://content/widget/content/DataResourceScreens.xml#EditDataResourceProductFeatures"/> + <view-map name="EditHtmlText" type="screen" page="component://content/widget/content/DataResourceScreens.xml#EditHtmlText"/> + + <view-map name="EditDataResourceType" type="screen" page="component://content/widget/datasetup/DataResourceSetupScreens.xml#EditDataResourceType"/> + <view-map name="EditDataResourceTypeAttr" type="screen" page="component://content/widget/datasetup/DataResourceSetupScreens.xml#EditDataResourceTypeAttr"/> + <view-map name="EditDataCategory" type="screen" page="component://content/widget/datasetup/DataResourceSetupScreens.xml#EditDataCategory"/> + <view-map name="EditMetaDataPredicate" type="screen" page="component://content/widget/datasetup/DataResourceSetupScreens.xml#EditMetaDataPredicate"/> + <view-map name="EditCharacterSet" type="screen" page="component://content/widget/datasetup/DataResourceSetupScreens.xml#EditCharacterSet"/> + <view-map name="EditFileExtension" type="screen" page="component://content/widget/datasetup/DataResourceSetupScreens.xml#EditFileExtension"/> + <view-map name="EditMimeType" type="screen" page="component://content/widget/datasetup/DataResourceSetupScreens.xml#EditMimeType"/> + <view-map name="EditMimeTypeHtmlTemplate" type="screen" page="component://content/widget/datasetup/DataResourceSetupScreens.xml#EditMimeTypeHtmlTemplate"/> + + <view-map name="ListLayout" type="screen" page="component://content/widget/layout/LayoutScreens.xml#ListLayout"/> + <view-map name="FindLayout" type="screen" page="component://content/widget/layout/LayoutScreens.xml#FindLayout"/> + <view-map name="EditLayout" type="screen" page="component://content/widget/layout/LayoutScreens.xml#EditLayout"/> + <view-map name="AddLayout" type="screen" page="component://content/widget/layout/LayoutScreens.xml#AddLayout"/> + <view-map name="EditLayoutSubContent" type="screen" page="component://content/widget/layout/LayoutScreens.xml#EditLayoutSubContent"/> + <view-map name="EditLayoutText" type="screen" page="component://content/widget/layout/LayoutScreens.xml#EditLayoutText"/> + <view-map name="EditLayoutHtml" type="screen" page="component://content/widget/layout/LayoutScreens.xml#EditLayoutHtml"/> + <view-map name="EditLayoutImage" type="screen" page="component://content/widget/layout/LayoutScreens.xml#EditLayoutImage"/> + <view-map name="EditLayoutUrl" type="screen" page="component://content/widget/layout/LayoutScreens.xml#EditLayoutUrl"/> - <view-map name="FindSurvey" page="component://content/widget/SurveyScreens.xml#FindSurvey" type="screen"/> + <view-map name="FindSurvey" type="screen" page="component://content/widget/SurveyScreens.xml#FindSurvey"/> <view-map name="ListFindSurveySearchResults" type="screen" page="component://content/widget/SurveyScreens.xml#ListFindSurveySearchResults"/> - <view-map name="EditSurvey" page="component://content/widget/SurveyScreens.xml#EditSurvey" type="screen"/> - <view-map name="EditSurveyMultiResps" page="component://content/widget/SurveyScreens.xml#EditSurveyMultiResps" type="screen"/> - <view-map name="EditSurveyQuestions" page="component://content/widget/SurveyScreens.xml#EditSurveyQuestions" type="screen"/> - <view-map name="FindSurveyResponse" page="component://content/widget/SurveyScreens.xml#FindSurveyResponse" type="screen"/> - <view-map name="ViewSurveyResponses" page="component://content/widget/SurveyScreens.xml#ViewSurveyResponses" type="screen"/> - <view-map name="EditSurveyResponse" page="component://content/widget/SurveyScreens.xml#EditSurveyResponse" type="screen"/> - - <view-map name="CMSContentFind" page="component://content/widget/cms/CMSScreens.xml#CMSContentFind" type="screen"/> - <view-map name="CMSContentEdit" page="component://content/widget/cms/CMSScreens.xml#CMSContentEdit" type="screen"/> - <view-map name="UserPermissions" page="component://content/widget/contentsetup/ContentSetupScreens.xml#UserPermissions" type="screen"/> - <view-map name="CMSSites" page="component://content/widget/cms/CMSScreens.xml#CMSSites" type="screen"/> - <view-map name="addSubSite" page="component://content/widget/cms/CMSScreens.xml#addSubSite" type="screen"/> - <view-map name="EditAddContent" page="component://content/widget/cms/CMSScreens.xml#EditAddContent" type="screen"/> - <view-map name="EditAddSubContent" page="component://content/widget/cms/CMSScreens.xml#EditAddSubContent" type="screen"/> - - <view-map name="ListContentRevisions" page="component://content/widget/compdoc/CompDocScreens.xml#ListContentRevisions" type="screen"/> - <view-map name="EditContentRevision" page="component://content/widget/compdoc/CompDocScreens.xml#EditContentRevision" type="screen"/> - <view-map name="ListContentRevisionItem" page="component://content/widget/compdoc/CompDocScreens.xml#ListContentRevisionItem" type="screen"/> - <view-map name="EditContentRevisionItem" page="component://content/widget/compdoc/CompDocScreens.xml#EditContentRevisionItem" type="screen"/> - <view-map name="ListContentApproval" page="component://content/widget/compdoc/CompDocScreens.xml#ListContentApproval" type="screen"/> - <view-map name="ListWaitingContentApproval" page="component://content/widget/compdoc/CompDocScreens.xml#ListWaitingContentApproval" type="screen"/> - <view-map name="EditContentApproval" page="component://content/widget/compdoc/CompDocScreens.xml#EditContentApproval" type="screen"/> - - <view-map name="FindCompDoc" page="component://content/widget/compdoc/CompDocScreens.xml#FindCompDoc" type="screen"/> - <!-- combined with FindCompDoc: <view-map name="ListCompDoc" page="component://content/widget/compdoc/CompDocScreens.xml#ListCompDoc" type="screen"/> --> - <view-map name="EditRootCompDoc" page="component://content/widget/compdoc/CompDocScreens.xml#EditRootCompDoc" type="screen"/> - <view-map name="EditChildCompDoc" page="component://content/widget/compdoc/CompDocScreens.xml#EditChildCompDoc" type="screen"/> - - <view-map name="AddChildCompDocInstance" page="component://content/widget/compdoc/CompDocScreens.xml#AddChildCompDocInstance" type="screen"/> - <view-map name="AddChildCompDocTemplate" page="component://content/widget/compdoc/CompDocScreens.xml#AddChildCompDocTemplate" type="screen"/> - - <view-map name="AddRootCompDocInstance" page="component://content/widget/compdoc/CompDocScreens.xml#AddRootCompDocInstance" type="screen"/> - <view-map name="AddRootCompDocTemplate" page="component://content/widget/compdoc/CompDocScreens.xml#AddRootCompDocTemplate" type="screen"/> - - <view-map name="ViewCompDocTemplateTree" page="component://content/widget/compdoc/CompDocScreens.xml#ViewCompDocTemplateTree" type="screen"/> - <view-map name="ViewCompDocInstanceTree" page="component://content/widget/compdoc/CompDocScreens.xml#ViewCompDocInstanceTree" type="screen"/> - <view-map name="EditCompDocContentRole" page="component://content/widget/compdoc/CompDocScreens.xml#EditCompDocContentRole" type="screen"/> - <view-map name="ViewInstances" page="component://content/widget/compdoc/CompDocScreens.xml#ViewInstances" type="screen"/> + <view-map name="EditSurvey" type="screen" page="component://content/widget/SurveyScreens.xml#EditSurvey"/> + <view-map name="EditSurveyMultiResps" type="screen" page="component://content/widget/SurveyScreens.xml#EditSurveyMultiResps"/> + <view-map name="EditSurveyQuestions" type="screen" page="component://content/widget/SurveyScreens.xml#EditSurveyQuestions"/> + <view-map name="FindSurveyResponse" type="screen" page="component://content/widget/SurveyScreens.xml#FindSurveyResponse"/> + <view-map name="ViewSurveyResponses" type="screen" page="component://content/widget/SurveyScreens.xml#ViewSurveyResponses"/> + <view-map name="EditSurveyResponse" type="screen" page="component://content/widget/SurveyScreens.xml#EditSurveyResponse"/> + + <view-map name="CMSContentFind" type="screen" page="component://content/widget/cms/CMSScreens.xml#CMSContentFind"/> + <view-map name="CMSContentEdit" type="screen" page="component://content/widget/cms/CMSScreens.xml#CMSContentEdit"/> + <view-map name="UserPermissions" type="screen" page="component://content/widget/contentsetup/ContentSetupScreens.xml#UserPermissions"/> + <view-map name="CMSSites" type="screen" page="component://content/widget/cms/CMSScreens.xml#CMSSites"/> + <view-map name="addSubSite" type="screen" page="component://content/widget/cms/CMSScreens.xml#addSubSite"/> + <view-map name="EditAddContent" type="screen" page="component://content/widget/cms/CMSScreens.xml#EditAddContent"/> + <view-map name="EditAddSubContent" type="screen" page="component://content/widget/cms/CMSScreens.xml#EditAddSubContent"/> + + <view-map name="ListContentRevisions" type="screen" page="component://content/widget/compdoc/CompDocScreens.xml#ListContentRevisions"/> + <view-map name="EditContentRevision" type="screen" page="component://content/widget/compdoc/CompDocScreens.xml#EditContentRevision"/> + <view-map name="ListContentRevisionItem" type="screen" page="component://content/widget/compdoc/CompDocScreens.xml#ListContentRevisionItem"/> + <view-map name="EditContentRevisionItem" type="screen" page="component://content/widget/compdoc/CompDocScreens.xml#EditContentRevisionItem"/> + <view-map name="ListContentApproval" type="screen" page="component://content/widget/compdoc/CompDocScreens.xml#ListContentApproval"/> + <view-map name="ListWaitingContentApproval" type="screen" page="component://content/widget/compdoc/CompDocScreens.xml#ListWaitingContentApproval"/> + <view-map name="EditContentApproval" type="screen" page="component://content/widget/compdoc/CompDocScreens.xml#EditContentApproval"/> + + <view-map name="FindCompDoc" type="screen" page="component://content/widget/compdoc/CompDocScreens.xml#FindCompDoc"/> + <!-- combined with FindCompDoc: <view-map name="ListCompDoc" type="screen" page="component://content/widget/compdoc/CompDocScreens.xml#ListCompDoc"/> --> + <view-map name="EditRootCompDoc" type="screen" page="component://content/widget/compdoc/CompDocScreens.xml#EditRootCompDoc"/> + <view-map name="EditChildCompDoc" type="screen" page="component://content/widget/compdoc/CompDocScreens.xml#EditChildCompDoc"/> + + <view-map name="AddChildCompDocInstance" type="screen" page="component://content/widget/compdoc/CompDocScreens.xml#AddChildCompDocInstance"/> + <view-map name="AddChildCompDocTemplate" type="screen" page="component://content/widget/compdoc/CompDocScreens.xml#AddChildCompDocTemplate"/> + + <view-map name="AddRootCompDocInstance" type="screen" page="component://content/widget/compdoc/CompDocScreens.xml#AddRootCompDocInstance"/> + <view-map name="AddRootCompDocTemplate" type="screen" page="component://content/widget/compdoc/CompDocScreens.xml#AddRootCompDocTemplate"/> + + <view-map name="ViewCompDocTemplateTree" type="screen" page="component://content/widget/compdoc/CompDocScreens.xml#ViewCompDocTemplateTree"/> + <view-map name="ViewCompDocInstanceTree" type="screen" page="component://content/widget/compdoc/CompDocScreens.xml#ViewCompDocInstanceTree"/> + <view-map name="EditCompDocContentRole" type="screen" page="component://content/widget/compdoc/CompDocScreens.xml#EditCompDocContentRole"/> + <view-map name="ViewInstances" type="screen" page="component://content/widget/compdoc/CompDocScreens.xml#ViewInstances"/> <view-map name="ViewCompDocContentBinary" page="" type="simplecontent"/> <view-map name="ViewBinaryDataResource" page="" type="simplecontent"/> - <view-map name="ViewCompDocContent" page="component://content/widget/compdoc/CompDocScreens.xml#ViewCompDocContent" type="screen"/> + <view-map name="ViewCompDocContent" type="screen" page="component://content/widget/compdoc/CompDocScreens.xml#ViewCompDocContent"/> <view-map name="ViewSimpleContent" page="" type="simplecontent"/> <!-- lookup content component --> - <view-map name="LookupContent" page="component://content/widget/content/ContentScreens.xml#LookupContent" type="screen"/> - <view-map name="LookupTreeContent" page="component://content/widget/content/ContentScreens.xml#LookupContentTree" type="screen"/> - <view-map name="LookupDetailContentTree" page="component://content/widget/content/ContentScreens.xml#LookupDetailContentTree" type="screen"/> - <view-map name="LookupDataResource" page="component://content/widget/content/DataResourceScreens.xml#LookupDataResource" type="screen"/> - <view-map name="LookupSurvey" page="component://content/widget/SurveyScreens.xml#LookupSurvey" type="screen"/> - <view-map name="LookupSurveyResponse" page="component://content/widget/SurveyScreens.xml#LookupSurveyResponse" type="screen"/> - <view-map name="LookupListLayout" page="component://content/widget/LookupScreens.xml#LookupListLayout" type="screen"/> - <view-map name="LookupSubContent" page="component://content/widget/LookupScreens.xml#LookupSubContent" type="screen"/> + <view-map name="LookupContent" type="screen" page="component://content/widget/content/ContentScreens.xml#LookupContent"/> + <view-map name="LookupTreeContent" type="screen" page="component://content/widget/content/ContentScreens.xml#LookupContentTree"/> + <view-map name="LookupDetailContentTree" type="screen" page="component://content/widget/content/ContentScreens.xml#LookupDetailContentTree"/> + <view-map name="LookupDataResource" type="screen" page="component://content/widget/content/DataResourceScreens.xml#LookupDataResource"/> + <view-map name="LookupSurvey" type="screen" page="component://content/widget/SurveyScreens.xml#LookupSurvey"/> + <view-map name="LookupSurveyResponse" type="screen" page="component://content/widget/SurveyScreens.xml#LookupSurveyResponse"/> + <view-map name="LookupListLayout" type="screen" page="component://content/widget/LookupScreens.xml#LookupListLayout"/> + <view-map name="LookupSubContent" type="screen" page="component://content/widget/LookupScreens.xml#LookupSubContent"/> <!-- lookup other components --> <view-map name="LookupUserLoginAndPartyDetails" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupUserLoginAndPartyDetails"/> - <view-map name="LookupPerson" page="component://party/widget/partymgr/LookupScreens.xml#LookupPerson" type="screen"/> - <view-map name="LookupPartyAndUserLoginAndPerson" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyAndUserLoginAndPerson" type="screen"/> - <view-map name="LookupProductFeature" page="component://product/widget/catalog/LookupScreens.xml#LookupProductFeature" type="screen"/> + <view-map name="LookupPerson" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPerson"/> + <view-map name="LookupPartyAndUserLoginAndPerson" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyAndUserLoginAndPerson"/> + <view-map name="LookupProductFeature" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductFeature"/> <view-map name="LookupPartyName" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyName"/> <view-map name="LookupWorkEffort" type="screen" page="component://workeffort/widget/LookupScreens.xml#LookupWorkEffort"/> Modified: ofbiz/ofbiz-framework/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml?rev=1805892&r1=1805891&r2=1805892&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/controller.xml Wed Aug 23 12:18:09 2017 @@ -825,71 +825,71 @@ under the License. <!-- end of request mappings --> <!-- View Mappings --> - <view-map name="main" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#FindProductionRun" type="screen"/> + <view-map name="main" type="screen" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#FindProductionRun"/> <!-- Routing view mappings --> - <view-map name="FindCalendar" page="component://manufacturing/widget/manufacturing/CalendarScreens.xml#FindCalendar" type="screen"/> - <view-map name="EditCalendar" page="component://manufacturing/widget/manufacturing/CalendarScreens.xml#EditCalendar" type="screen"/> - <view-map name="EditCalendarWeek" page="component://manufacturing/widget/manufacturing/CalendarScreens.xml#EditCalendarWeek" type="screen"/> - <view-map name="ListCalendarWeek" page="component://manufacturing/widget/manufacturing/CalendarScreens.xml#ListCalendarWeek" type="screen"/> - <view-map name="EditCalendarExceptionDay" page="component://manufacturing/widget/manufacturing/CalendarScreens.xml#EditCalendarExceptionDay" type="screen"/> - <view-map name="EditCalendarExceptionWeek" page="component://manufacturing/widget/manufacturing/CalendarScreens.xml#EditCalendarExceptionWeek" type="screen"/> - - <view-map name="FindRoutingTask" page="component://manufacturing/widget/manufacturing/RoutingScreens.xml#FindRoutingTask" type="screen"/> - <view-map name="EditRoutingTask" page="component://manufacturing/widget/manufacturing/RoutingScreens.xml#EditRoutingTask" type="screen"/> - <view-map name="EditRoutingTaskCosts" page="component://manufacturing/widget/manufacturing/RoutingScreens.xml#EditRoutingTaskCosts" type="screen"/> - <view-map name="ListRoutingTaskRoutings" page="component://manufacturing/widget/manufacturing/RoutingScreens.xml#ListRoutingTaskRoutings" type="screen"/> - <view-map name="ListRoutingTaskProducts" page="component://manufacturing/widget/manufacturing/RoutingScreens.xml#ListRoutingTaskProducts" type="screen"/> - <view-map name="EditRoutingTaskProduct" page="component://manufacturing/widget/manufacturing/RoutingScreens.xml#EditRoutingTaskProduct" type="screen"/> - <view-map name="FindRouting" page="component://manufacturing/widget/manufacturing/RoutingScreens.xml#FindRouting" type="screen"/> - <view-map name="EditRouting" page="component://manufacturing/widget/manufacturing/RoutingScreens.xml#EditRouting" type="screen"/> - <view-map name="EditRoutingTaskAssoc" page="component://manufacturing/widget/manufacturing/RoutingScreens.xml#EditRoutingTaskAssoc" type="screen"/> - <view-map name="EditRoutingProductLink" page="component://manufacturing/widget/manufacturing/RoutingScreens.xml#EditRoutingProductLink" type="screen"/> - <view-map name="EditRoutingTaskFixedAssets" page="component://manufacturing/widget/manufacturing/RoutingScreens.xml#EditRoutingTaskFixedAssets" type="screen"/> - <view-map name="EditRoutingTaskParties" page="component://manufacturing/widget/manufacturing/RoutingScreens.xml#EditRoutingTaskParties" type="screen"/> - <view-map name="EditRoutingTaskSkills" page="component://manufacturing/widget/manufacturing/RoutingScreens.xml#EditRoutingTaskSkills" type="screen"/> + <view-map name="FindCalendar" type="screen" page="component://manufacturing/widget/manufacturing/CalendarScreens.xml#FindCalendar"/> + <view-map name="EditCalendar" type="screen" page="component://manufacturing/widget/manufacturing/CalendarScreens.xml#EditCalendar"/> + <view-map name="EditCalendarWeek" type="screen" page="component://manufacturing/widget/manufacturing/CalendarScreens.xml#EditCalendarWeek"/> + <view-map name="ListCalendarWeek" type="screen" page="component://manufacturing/widget/manufacturing/CalendarScreens.xml#ListCalendarWeek"/> + <view-map name="EditCalendarExceptionDay" type="screen" page="component://manufacturing/widget/manufacturing/CalendarScreens.xml#EditCalendarExceptionDay"/> + <view-map name="EditCalendarExceptionWeek" type="screen" page="component://manufacturing/widget/manufacturing/CalendarScreens.xml#EditCalendarExceptionWeek"/> + + <view-map name="FindRoutingTask" type="screen" page="component://manufacturing/widget/manufacturing/RoutingScreens.xml#FindRoutingTask"/> + <view-map name="EditRoutingTask" type="screen" page="component://manufacturing/widget/manufacturing/RoutingScreens.xml#EditRoutingTask"/> + <view-map name="EditRoutingTaskCosts" type="screen" page="component://manufacturing/widget/manufacturing/RoutingScreens.xml#EditRoutingTaskCosts"/> + <view-map name="ListRoutingTaskRoutings" type="screen" page="component://manufacturing/widget/manufacturing/RoutingScreens.xml#ListRoutingTaskRoutings"/> + <view-map name="ListRoutingTaskProducts" type="screen" page="component://manufacturing/widget/manufacturing/RoutingScreens.xml#ListRoutingTaskProducts"/> + <view-map name="EditRoutingTaskProduct" type="screen" page="component://manufacturing/widget/manufacturing/RoutingScreens.xml#EditRoutingTaskProduct"/> + <view-map name="FindRouting" type="screen" page="component://manufacturing/widget/manufacturing/RoutingScreens.xml#FindRouting"/> + <view-map name="EditRouting" type="screen" page="component://manufacturing/widget/manufacturing/RoutingScreens.xml#EditRouting"/> + <view-map name="EditRoutingTaskAssoc" type="screen" page="component://manufacturing/widget/manufacturing/RoutingScreens.xml#EditRoutingTaskAssoc"/> + <view-map name="EditRoutingProductLink" type="screen" page="component://manufacturing/widget/manufacturing/RoutingScreens.xml#EditRoutingProductLink"/> + <view-map name="EditRoutingTaskFixedAssets" type="screen" page="component://manufacturing/widget/manufacturing/RoutingScreens.xml#EditRoutingTaskFixedAssets"/> + <view-map name="EditRoutingTaskParties" type="screen" page="component://manufacturing/widget/manufacturing/RoutingScreens.xml#EditRoutingTaskParties"/> + <view-map name="EditRoutingTaskSkills" type="screen" page="component://manufacturing/widget/manufacturing/RoutingScreens.xml#EditRoutingTaskSkills"/> <!-- Lookup view mappings --> <view-map name="LookupPartyName" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyName"/> <view-map name="LookupCustomerName" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupCustomerName"/> - <view-map name="LookupProduct" page="component://product/widget/catalog/LookupScreens.xml#LookupProduct" type="screen"/> - <view-map name="LookupVariantProduct" page="component://product/widget/catalog/LookupScreens.xml#LookupVariantProduct" type="screen"/> - <view-map name="LookupVirtualProduct" page="component://product/widget/catalog/LookupScreens.xml#LookupVirtualProduct" type="screen"/> - <view-map name="LookupRouting" page="component://manufacturing/widget/manufacturing/LookupScreens.xml#LookupRouting" type="screen"/> - <view-map name="LookupRoutingTask" page="component://manufacturing/widget/manufacturing/LookupScreens.xml#LookupRoutingTask" type="screen"/> - <view-map name="LookupProductFeature" page="component://product/widget/catalog/LookupScreens.xml#LookupProductFeature" type="screen"/> + <view-map name="LookupProduct" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProduct"/> + <view-map name="LookupVariantProduct" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupVariantProduct"/> + <view-map name="LookupVirtualProduct" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupVirtualProduct"/> + <view-map name="LookupRouting" type="screen" page="component://manufacturing/widget/manufacturing/LookupScreens.xml#LookupRouting"/> + <view-map name="LookupRoutingTask" type="screen" page="component://manufacturing/widget/manufacturing/LookupScreens.xml#LookupRoutingTask"/> + <view-map name="LookupProductFeature" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductFeature"/> <view-map name="LookupFacilityLocation" type="screen" page="component://product/widget/facility/LookupScreens.xml#LookupFacilityLocation"/> <!-- BOM view mappings --> - <view-map name="EditProductBom" page="component://manufacturing/widget/manufacturing/BomScreens.xml#EditProductBom" type="screen"/> - <view-map name="EditProductManufacturingRules" page="component://manufacturing/widget/manufacturing/BomScreens.xml#EditProductManufacturingRules" type="screen"/> - <view-map name="BomSimulation" page="component://manufacturing/widget/manufacturing/BomScreens.xml#BomSimulation" type="screen"/> - <view-map name="FindBom" page="component://manufacturing/widget/manufacturing/BomScreens.xml#FindBom" type="screen"/> + <view-map name="EditProductBom" type="screen" page="component://manufacturing/widget/manufacturing/BomScreens.xml#EditProductBom"/> + <view-map name="EditProductManufacturingRules" type="screen" page="component://manufacturing/widget/manufacturing/BomScreens.xml#EditProductManufacturingRules"/> + <view-map name="BomSimulation" type="screen" page="component://manufacturing/widget/manufacturing/BomScreens.xml#BomSimulation"/> + <view-map name="FindBom" type="screen" page="component://manufacturing/widget/manufacturing/BomScreens.xml#FindBom"/> <!-- Costs view mappings --> - <view-map name="EditCostCalcs" page="component://manufacturing/widget/manufacturing/CostScreens.xml#EditCostCalcs" type="screen"/> + <view-map name="EditCostCalcs" type="screen" page="component://manufacturing/widget/manufacturing/CostScreens.xml#EditCostCalcs"/> <!-- MRP view mappings --> - <view-map name="FindMrpPlannedEvents" page="component://manufacturing/widget/manufacturing/MrpScreens.xml#FindMrpPlannedEvents" type="screen"/> - <view-map name="MrpExecution" page="component://manufacturing/widget/manufacturing/MrpScreens.xml#MrpExecution" type="screen"/> - <view-map name="ManufacturingReports" page="component://manufacturing/widget/manufacturing/ReportScreens.xml#ManufacturingReports" type="screen"/> + <view-map name="FindMrpPlannedEvents" type="screen" page="component://manufacturing/widget/manufacturing/MrpScreens.xml#FindMrpPlannedEvents"/> + <view-map name="MrpExecution" type="screen" page="component://manufacturing/widget/manufacturing/MrpScreens.xml#MrpExecution"/> + <view-map name="ManufacturingReports" type="screen" page="component://manufacturing/widget/manufacturing/ReportScreens.xml#ManufacturingReports"/> <!-- JobShop Management view mappings --> - <view-map name="CreateProductionRun" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#CreateProductionRun" type="screen"/> - <view-map name="FindProductionRun" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#FindProductionRun" type="screen"/> - <view-map name="EditProductionRun" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#EditProductionRun" type="screen"/> - <view-map name="assocProdRunParty" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#AssocProdRunParty" type="screen"/> - <view-map name="ProductionRunParties" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#ProductionRunParties" type="screen"/> - <view-map name="LinkProductionRun" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#LinkProductionRun" type="screen"/> + <view-map name="CreateProductionRun" type="screen" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#CreateProductionRun"/> + <view-map name="FindProductionRun" type="screen" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#FindProductionRun"/> + <view-map name="EditProductionRun" type="screen" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#EditProductionRun"/> + <view-map name="assocProdRunParty" type="screen" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#AssocProdRunParty"/> + <view-map name="ProductionRunParties" type="screen" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#ProductionRunParties"/> + <view-map name="LinkProductionRun" type="screen" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#LinkProductionRun"/> <view-map name="PrintProductionRun" type="screenfop" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#ProductionRunPdf" content-type="application/pdf" encoding="none"/> - <view-map name="ProductionRunDeclaration" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#ProductionRunDeclaration" type="screen"/> - <view-map name="ProductionRunCosts" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#ProductionRunCosts" type="screen"/> - <view-map name="ProductionRunTasks" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#ProductionRunTasks" type="screen"/> - <view-map name="ProductionRunComponents" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#ProductionRunComponents" type="screen"/> - <view-map name="ProductionRunActualComponents" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#ProductionRunActualComponents" type="screen"/> - <view-map name="ProductionRunFixedAssets" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#ProductionRunFixedAssets" type="screen"/> - <view-map name="ProductionRunContent" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#ProductionRunContent" type="screen"/> - <view-map name="ProductionRunAssocs" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#ProductionRunAssocs" type="screen"/> - <view-map name="WorkWithShipmentPlans" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#WorkWithShipmentPlans" type="screen"/> + <view-map name="ProductionRunDeclaration" type="screen" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#ProductionRunDeclaration"/> + <view-map name="ProductionRunCosts" type="screen" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#ProductionRunCosts"/> + <view-map name="ProductionRunTasks" type="screen" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#ProductionRunTasks"/> + <view-map name="ProductionRunComponents" type="screen" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#ProductionRunComponents"/> + <view-map name="ProductionRunActualComponents" type="screen" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#ProductionRunActualComponents"/> + <view-map name="ProductionRunFixedAssets" type="screen" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#ProductionRunFixedAssets"/> + <view-map name="ProductionRunContent" type="screen" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#ProductionRunContent"/> + <view-map name="ProductionRunAssocs" type="screen" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#ProductionRunAssocs"/> + <view-map name="WorkWithShipmentPlans" type="screen" page="component://manufacturing/widget/manufacturing/JobshopScreens.xml#WorkWithShipmentPlans"/> <!-- Report view mappings --> <view-map name="ShipmentPlanStockReport" type="screenfop" page="component://manufacturing/widget/manufacturing/ReportScreens.xml#ShipmentPlanStockReport" content-type="application/pdf" encoding="none"/> Modified: ofbiz/ofbiz-framework/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml?rev=1805892&r1=1805891&r2=1805892&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/webapp/ordermgr/WEB-INF/controller.xml Wed Aug 23 12:18:09 2017 @@ -1995,10 +1995,10 @@ under the License. <view-map name="ListRequirementOrders" type="screen" page="component://order/widget/ordermgr/RequirementScreens.xml#ListRequirementOrders"/> <view-map name="ListRequirementRoles" type="screen" page="component://order/widget/ordermgr/RequirementScreens.xml#ListRequirementRoles"/> <view-map name="EditRequirementRole" type="screen" page="component://order/widget/ordermgr/RequirementScreens.xml#EditRequirementRole"/> - <view-map name="ApproveRequirements" page="component://order/widget/ordermgr/RequirementScreens.xml#ApproveRequirements" type="screen"/> - <view-map name="ApprovedProductRequirements" page="component://order/widget/ordermgr/RequirementScreens.xml#ApprovedProductRequirements" type="screen"/> + <view-map name="ApproveRequirements" type="screen" page="component://order/widget/ordermgr/RequirementScreens.xml#ApproveRequirements"/> + <view-map name="ApprovedProductRequirements" type="screen" page="component://order/widget/ordermgr/RequirementScreens.xml#ApprovedProductRequirements"/> <view-map name="ApprovedProductRequirementsReport" type="screenfop" page="component://order/widget/ordermgr/RequirementScreens.xml#ApprovedProductRequirementsReport" content-type="application/pdf" encoding="none"/> - <view-map name="ApprovedProductRequirementsByVendor" page="component://order/widget/ordermgr/RequirementScreens.xml#ApprovedProductRequirementsByVendor" type="screen"/> + <view-map name="ApprovedProductRequirementsByVendor" type="screen" page="component://order/widget/ordermgr/RequirementScreens.xml#ApprovedProductRequirementsByVendor"/> <view-map name="ApprovedProductRequirementsByVendorReport" type="screenfop" page="component://order/widget/ordermgr/RequirementScreens.xml#ApprovedProductRequirementsByVendorReport" content-type="application/pdf" encoding="none"/> <view-map name="RequirementsForSupplier" type="screen" page="component://order/widget/ordermgr/OrderEntryScreens.xml#RequirementsForSupplier"/> <view-map name="FindQuoteForCart" type="screen" page="component://order/widget/ordermgr/OrderEntryScreens.xml#FindQuoteForCart"/> @@ -2072,9 +2072,9 @@ under the License. <view-map name="LookupWorkEffort" type="screen" page="component://workeffort/widget/LookupScreens.xml#LookupWorkEffort"/> <view-map name="LookupBulkAddProducts" type="screen" page="component://order/widget/ordermgr/OrderEntryCartScreens.xml#LookupBulkAddProducts"/> <view-map name="LookupBulkAddSupplierProducts" type="screen" page="component://order/widget/ordermgr/OrderEntryCartScreens.xml#LookupBulkAddSupplierProducts"/> - <view-map name="LookupContent" page="component://content/widget/content/ContentScreens.xml#LookupContent" type="screen"/> + <view-map name="LookupContent" type="screen" page="component://content/widget/content/ContentScreens.xml#LookupContent"/> <view-map name="LookupAssociatedProducts" type="screen" page="component://order/widget/ordermgr/OrderEntryCartScreens.xml#LookupAssociatedProducts"/> - <view-map name="LookupBillingAccount" page="component://accounting/widget/LookupScreens.xml#LookupBillingAccount" type="screen"/> + <view-map name="LookupBillingAccount" type="screen" page="component://accounting/widget/LookupScreens.xml#LookupBillingAccount"/> <!-- PDFs --> <view-map name="OrderPDF" type="screenfop" page="component://order/widget/ordermgr/OrderPrintScreens.xml#OrderPDF" content-type="application/pdf" encoding="none"/> <view-map name="ReturnPDF" type="screenfop" page="component://order/widget/ordermgr/OrderPrintScreens.xml#ReturnPDF" content-type="application/pdf" encoding="none"/> Modified: ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=1805892&r1=1805891&r2=1805892&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Wed Aug 23 12:18:09 2017 @@ -1379,8 +1379,8 @@ under the License. <view-map name="LookupCustRequest" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupCustRequest"/> <view-map name="LookupPreferredContactMech" type="screen" page="component://marketing/widget/ContactListScreens.xml#LookupPreferredContactMech"/> <view-map name="LookupContactList" type="screen" page="component://party/widget/partymgr/PartyContactListScreens.xml#ListLookupContactList"/> - <view-map name="LookupContent" page="component://content/widget/content/ContentScreens.xml#LookupContent" type="screen"/> - <view-map name="LookupDataResource" page="component://content/widget/content/DataResourceScreens.xml#LookupDataResource" type="screen"/> + <view-map name="LookupContent" type="screen" page="component://content/widget/content/ContentScreens.xml#LookupContent"/> + <view-map name="LookupDataResource" type="screen" page="component://content/widget/content/DataResourceScreens.xml#LookupDataResource"/> <view-map name="LookupEmploymentApp" type="screen" page="component://humanres/widget/LookupScreens.xml#LookupEmploymentApp"/> <view-map name="LookupEmplPosition" type="screen" page="component://humanres/widget/LookupScreens.xml#LookupEmplPosition"/> Modified: ofbiz/ofbiz-framework/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1805892&r1=1805891&r2=1805892&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/webapp/catalog/WEB-INF/controller.xml Wed Aug 23 12:18:09 2017 @@ -3181,9 +3181,9 @@ under the License. <view-map name="EditProductStoreFinAccountSettings" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreFinAccountSettings"/> <view-map name="EditProductStoreVendorPayments" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreVendorPayments"/> <view-map name="EditProductStoreVendorShipments" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreVendorShipments"/> - <view-map name="ProductStoreFacilities" page="component://product/widget/catalog/CommonScreens.xml#ProductStoreFacilities" type="screen"/> - <view-map name="ListProductStoreFacility" page="component://product/widget/catalog/StoreScreens.xml#ListProductStoreFacility" type="screen"/> - <view-map name="EditProductStoreFacility" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreFacility" type="screen"/> + <view-map name="ProductStoreFacilities" type="screen" page="component://product/widget/catalog/CommonScreens.xml#ProductStoreFacilities"/> + <view-map name="ListProductStoreFacility" type="screen" page="component://product/widget/catalog/StoreScreens.xml#ListProductStoreFacility"/> + <view-map name="EditProductStoreFacility" type="screen" page="component://product/widget/catalog/StoreScreens.xml#EditProductStoreFacility"/> <view-map name="EditVendorProduct" type="screen" page="component://product/widget/catalog/ProductScreens.xml#EditVendorProduct"/> <view-map name="EditKeywordThesaurus" type="screen" page="component://product/widget/catalog/ThesaurusScreens.xml#EditKeywordThesaurus"/> <view-map name="ListParentProductStoreGroup" type="screen" page="component://product/widget/catalog/StoreScreens.xml#ListParentProductStoreGroup"/> @@ -3216,7 +3216,7 @@ under the License. <!-- Lookup request mappings --> <view-map name="LookupUserLoginAndPartyDetails" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupUserLoginAndPartyDetails"/> - <view-map name="LookupContent" page="component://content/widget/content/ContentScreens.xml#LookupContent" type="screen"/> + <view-map name="LookupContent" type="screen" page="component://content/widget/content/ContentScreens.xml#LookupContent"/> <view-map name="LookupFixedAsset" type="screen" page="component://accounting/widget/LookupScreens.xml#LookupFixedAsset"/> <view-map name="LookupPartyName" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyName"/> <view-map name="LookupOrderHeader" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupOrderHeader"/> @@ -3228,28 +3228,28 @@ under the License. <view-map name="LookupProductCategory" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductCategory"/> <view-map name="LookupProductFeature" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductFeature"/> <view-map name="LookupProductStore" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductStore"/> - <view-map name="LookupFacilityLocation" page="component://product/widget/facility/LookupScreens.xml#LookupFacilityLocation" type="screen"/> + <view-map name="LookupFacilityLocation" type="screen" page="component://product/widget/facility/LookupScreens.xml#LookupFacilityLocation"/> <view-map name="LookupWorkEffort" type="screen" page="component://workeffort/widget/LookupScreens.xml#LookupWorkEffort"/> <view-map name="LookupCostComponentCalc" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupCostComponentCalc"/> - <view-map name="LookupDataResource" page="component://content/widget/content/DataResourceScreens.xml#LookupDataResource" type="screen"/> - <view-map name="LookupPerson" page="component://party/widget/partymgr/LookupScreens.xml#LookupPerson" type="screen"/> + <view-map name="LookupDataResource" type="screen" page="component://content/widget/content/DataResourceScreens.xml#LookupDataResource"/> + <view-map name="LookupPerson" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPerson"/> <view-map name="LookupPreferredContactMech" type="screen" page="component://marketing/widget/ContactListScreens.xml#LookupPreferredContactMech"/> <view-map name="LookupContactList" type="screen" page="component://marketing/widget/ContactListScreens.xml#LookupContactList"/> <!-- Image Management request mappings --> <view-map name="Imagemanagement" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#Imagemanagement"/> - <view-map name="ImageGallery" page="component://product/widget/catalog/ImageManagementScreens.xml#ImageGallery" type="screen"/> - <view-map name="ImageUpload" page="component://product/widget/catalog/ImageManagementScreens.xml#ImageUpload" type="screen"/> - <view-map name="ImageApprove" page="component://product/widget/catalog/ImageManagementScreens.xml#ImageApprove" type="screen"/> - <view-map name="ImageRejected" page="component://product/widget/catalog/ImageManagementScreens.xml#ImageRejected" type="screen"/> - <view-map name="ImageFrames" page="component://product/widget/catalog/ImageManagementScreens.xml#ImageFrames" type="screen"/> - <view-map name="ImageCropping" page="component://product/widget/catalog/ImageManagementScreens.xml#ImageCropping" type="screen"/> - <view-map name="ImageRotating" page="component://product/widget/catalog/ImageManagementScreens.xml#ImageRotating" type="screen"/> - <view-map name="ImageShare" page="component://product/widget/catalog/ImageManagementScreens.xml#ImageShare" type="screen"/> - <view-map name="ImageReplace" page="component://product/widget/catalog/ImageManagementScreens.xml#ImageReplace" type="screen"/> - <view-map name="viewImage" page="component://product/widget/catalog/ImageManagementScreens.xml#ViewImage" type="screen"/> - <view-map name="viewPreviewImage" page="component://product/widget/catalog/ImageManagementScreens.xml#ViewPreviewImage" type="screen"/> - <view-map name="LookupImage" page="component://product/widget/catalog/ImageManagementScreens.xml#LookupImage" type="screen"/> + <view-map name="ImageGallery" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ImageGallery"/> + <view-map name="ImageUpload" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ImageUpload"/> + <view-map name="ImageApprove" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ImageApprove"/> + <view-map name="ImageRejected" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ImageRejected"/> + <view-map name="ImageFrames" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ImageFrames"/> + <view-map name="ImageCropping" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ImageCropping"/> + <view-map name="ImageRotating" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ImageRotating"/> + <view-map name="ImageShare" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ImageShare"/> + <view-map name="ImageReplace" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ImageReplace"/> + <view-map name="viewImage" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ViewImage"/> + <view-map name="viewPreviewImage" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ViewPreviewImage"/> + <view-map name="LookupImage" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#LookupImage"/> <view-map name="LookupProduct" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProduct"/> <view-map name="ListImageGallery" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ListImageGallery"/> <view-map name="ImageManage" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ImageManage"/> Modified: ofbiz/ofbiz-framework/trunk/applications/product/webapp/facility/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/webapp/facility/WEB-INF/controller.xml?rev=1805892&r1=1805891&r2=1805892&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/webapp/facility/WEB-INF/controller.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/webapp/facility/WEB-INF/controller.xml Wed Aug 23 12:18:09 2017 @@ -1443,12 +1443,12 @@ under the License. <view-map name="LookupOrderHeaderAndShipInfo" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupOrderHeaderAndShipInfo"/> <view-map name="LookupPurchaseOrderHeaderAndShipInfo" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupPurchaseOrderHeaderAndShipInfo"/> <view-map name="LookupOrderHeader" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupOrderHeader"/> - <view-map name="LookupProduct" page="component://product/widget/catalog/LookupScreens.xml#LookupProduct" type="screen"/> - <view-map name="LookupVariantProduct" page="component://product/widget/catalog/LookupScreens.xml#LookupVariantProduct" type="screen"/> + <view-map name="LookupProduct" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProduct"/> + <view-map name="LookupVariantProduct" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupVariantProduct"/> <view-map name="LookupProductCategory" type="screen" page="component://product/widget/catalog/LookupScreens.xml#LookupProductCategory"/> <view-map name="LookupFacility" type="screen" page="component://product/widget/facility/LookupScreens.xml#LookupFacility"/> - <view-map name="LookupFacilityLocation" page="component://product/widget/facility/LookupScreens.xml#LookupFacilityLocation" type="screen"/> - <view-map name="LookupProductInventoryLocation" page="component://product/widget/facility/LookupScreens.xml#LookupProductInventoryLocation" type="screen"/> + <view-map name="LookupFacilityLocation" type="screen" page="component://product/widget/facility/LookupScreens.xml#LookupFacilityLocation"/> + <view-map name="LookupProductInventoryLocation" type="screen" page="component://product/widget/facility/LookupScreens.xml#LookupProductInventoryLocation"/> <view-map name="LookupPartyName" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupPartyName"/> <view-map name="LookupInventoryItem" type="screen" page="component://product/widget/facility/LookupScreens.xml#LookupInventoryItem"/> <view-map name="LookupContent" type="screen" page="component://content/widget/content/ContentScreens.xml#LookupContent"/> @@ -1456,10 +1456,10 @@ under the License. <view-map name="LookupShipment" type="screen" page="component://product/widget/facility/LookupScreens.xml#LookupShipment"/> <!-- Shipment Gateway Config --> - <view-map name="FindShipmentGatewayConfig" page="component://product//widget/facility/ShipmentGatewayConfigScreens.xml#FindShipmentGatewayConfig" type="screen"/> - <view-map name="EditShipmentGatewayConfig" page="component://product//widget/facility/ShipmentGatewayConfigScreens.xml#EditShipmentGatewayConfig" type="screen"/> - <view-map name="FindShipmentGatewayConfigTypes" page="component://product//widget/facility/ShipmentGatewayConfigScreens.xml#FindShipmentGatewayConfigTypes" type="screen"/> - <view-map name="EditShipmentGatewayConfigType" page="component://product//widget/facility/ShipmentGatewayConfigScreens.xml#EditShipmentGatewayConfigType" type="screen"/> + <view-map name="FindShipmentGatewayConfig" type="screen" page="component://product//widget/facility/ShipmentGatewayConfigScreens.xml#FindShipmentGatewayConfig"/> + <view-map name="EditShipmentGatewayConfig" type="screen" page="component://product//widget/facility/ShipmentGatewayConfigScreens.xml#EditShipmentGatewayConfig"/> + <view-map name="FindShipmentGatewayConfigTypes" type="screen" page="component://product//widget/facility/ShipmentGatewayConfigScreens.xml#FindShipmentGatewayConfigTypes"/> + <view-map name="EditShipmentGatewayConfigType" type="screen" page="component://product//widget/facility/ShipmentGatewayConfigScreens.xml#EditShipmentGatewayConfigType"/> <view-map name="EditFacilityAgreements" type="screen" page="component://product/widget/facility/FacilityScreens.xml#EditFacilityAgreements"/> <!-- end of view mappings --> Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml?rev=1805892&r1=1805891&r2=1805892&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/workeffort/webapp/workeffort/WEB-INF/controller.xml Wed Aug 23 12:18:09 2017 @@ -770,14 +770,14 @@ under the License. <view-map name="LookupQuote" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupQuote"/> <view-map name="LookupQuoteItem" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupQuoteItem"/> <view-map name="LookupOrderHeader" type="screen" page="component://order/widget/ordermgr/LookupScreens.xml#LookupOrderHeader"/> - <view-map name="LookupInvoice" page="component://accounting/widget/LookupScreens.xml#LookupInvoice" type="screen"/> - <view-map name="LookupContent" page="component://content/widget/content/ContentScreens.xml#LookupContent" type="screen"/> + <view-map name="LookupInvoice" type="screen" page="component://accounting/widget/LookupScreens.xml#LookupInvoice"/> + <view-map name="LookupContent" type="screen" page="component://content/widget/content/ContentScreens.xml#LookupContent"/> <view-map name="LookupContactMech" type="screen" page="component://party/widget/partymgr/LookupScreens.xml#LookupContactMech"/> <view-map name="LookupPreferredContactMech" type="screen" page="component://marketing/widget/ContactListScreens.xml#LookupPreferredContactMech"/> <view-map name="LookupContactList" type="screen" page="component://party/widget/partymgr/PartyContactListScreens.xml#ListLookupContactList"/> <view-map name="EditAgreementWorkEffortApplics" type="screen" page="component://workeffort/widget/WorkEffortScreens.xml#EditAgreementWorkEffortApplics"/> - <view-map name="LookupAgreement" page="component://accounting/widget/LookupScreens.xml#LookupAgreement" type="screen"/> - <view-map name="LookupAgreementItem" page="component://accounting/widget/LookupScreens.xml#LookupAgreementItem" type="screen"/> + <view-map name="LookupAgreement" type="screen" page="component://accounting/widget/LookupScreens.xml#LookupAgreement"/> + <view-map name="LookupAgreementItem" type="screen" page="component://accounting/widget/LookupScreens.xml#LookupAgreementItem"/> <!-- end of view mappings --> </site-conf> Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml?rev=1805892&r1=1805891&r2=1805892&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/webtools/webapp/webtools/WEB-INF/controller.xml Wed Aug 23 12:18:09 2017 @@ -629,21 +629,21 @@ under the License. <view-map name="printStart" type="screen" page="component://webtools/widget/CommonScreens.xml#printStart"/> <view-map name="printDone" type="screen" page="component://webtools/widget/CommonScreens.xml#printDone"/> - <view-map name="EntitySyncStatus" page="component://webtools/widget/EntitySyncScreens.xml#EntitySyncStatus" type="screen"/> - <view-map name="EntitySQLProcessor" page="component://webtools/widget/EntityScreens.xml#EntitySQLProcessor" type="screen"/> - <view-map name="ConnectionPoolStatus" page="component://webtools/widget/EntityScreens.xml#ConnectionPoolStatus" type="screen"/> - <view-map name="EntityExportAll" page="component://webtools/widget/EntityScreens.xml#EntityExportAll" type="screen"/> - <view-map name="ProgramExport" page="component://webtools/widget/EntityScreens.xml#ProgramExport" type="screen"/> - <view-map name="EntityImportDir" page="component://webtools/widget/EntityScreens.xml#EntityImportDir" type="screen"/> - <view-map name="EntityImport" page="component://webtools/widget/EntityScreens.xml#EntityImport" type="screen"/> - <view-map name="EntityImportReaders" page="component://webtools/widget/EntityScreens.xml#EntityImportReaders" type="screen"/> + <view-map name="EntitySyncStatus" type="screen" page="component://webtools/widget/EntitySyncScreens.xml#EntitySyncStatus"/> + <view-map name="EntitySQLProcessor" type="screen" page="component://webtools/widget/EntityScreens.xml#EntitySQLProcessor"/> + <view-map name="ConnectionPoolStatus" type="screen" page="component://webtools/widget/EntityScreens.xml#ConnectionPoolStatus"/> + <view-map name="EntityExportAll" type="screen" page="component://webtools/widget/EntityScreens.xml#EntityExportAll"/> + <view-map name="ProgramExport" type="screen" page="component://webtools/widget/EntityScreens.xml#ProgramExport"/> + <view-map name="EntityImportDir" type="screen" page="component://webtools/widget/EntityScreens.xml#EntityImportDir"/> + <view-map name="EntityImport" type="screen" page="component://webtools/widget/EntityScreens.xml#EntityImport"/> + <view-map name="EntityImportReaders" type="screen" page="component://webtools/widget/EntityScreens.xml#EntityImportReaders"/> <!-- cert views --> <view-map name="viewbrowsercerts" type="screen" page="component://webtools/widget/CommonScreens.xml#browsercerts"/> <!-- Artifact Info Views --> - <view-map name="ViewComponents" page="component://webtools/widget/ArtifactInfoScreens.xml#ViewComponents" type="screen"/> - <view-map name="TestSuiteInfo" page="component://webtools/widget/ArtifactInfoScreens.xml#TestSuiteInfo" type="screen"/> + <view-map name="ViewComponents" type="screen" page="component://webtools/widget/ArtifactInfoScreens.xml#ViewComponents"/> + <view-map name="TestSuiteInfo" type="screen" page="component://webtools/widget/ArtifactInfoScreens.xml#TestSuiteInfo"/> <view-map name="ArtifactInfo" type="screen" page="component://webtools/widget/ArtifactInfoScreens.xml#ArtifactInfo"/> <!-- Label Manager Views --> @@ -665,12 +665,12 @@ under the License. <view-map name="LookupGeo" type="screen" page="component://webtools/widget/GeoManagementScreens.xml#LookupGeo"/> <!-- Layout Demo --> - <view-map name="WebtoolsLayoutDemo" page="component://webtools/widget/MiscScreens.xml#WebtoolsLayoutDemo" type="screen"/> - <view-map name="WebtoolsLayoutDemoFop" page="component://webtools/widget/MiscScreens.xml#WebtoolsLayoutDemoFop" type="screenfop" content-type="application/pdf" encoding="none"/> - <view-map name="WebtoolsLayoutDemoText" page="component://webtools/widget/MiscScreens.xml#WebtoolsLayoutDemoText" type="screentext"/> - <view-map name="WebtoolsLayoutDemoXml" page="component://webtools/widget/MiscScreens.xml#WebtoolsLayoutDemoText" content-type="text/xml" type="screenxml"/> - <view-map name="WebtoolsLayoutDemoCsv" page="component://webtools/widget/MiscScreens.xml#WebtoolsLayoutDemoText" content-type="text/csv" type="screencsv"/> - <view-map name="WebtoolsLayoutDemoXls" page="component://webtools/widget/MiscScreens.xml#WebtoolsLayoutDemoText" content-type="application/vnd.ms-excel" type="screenxls"/> + <view-map name="WebtoolsLayoutDemo" type="screen" page="component://webtools/widget/MiscScreens.xml#WebtoolsLayoutDemo"/> + <view-map name="WebtoolsLayoutDemoFop" type="screenfop" page="component://webtools/widget/MiscScreens.xml#WebtoolsLayoutDemoFop" content-type="application/pdf" encoding="none"/> + <view-map name="WebtoolsLayoutDemoText" type="screentext" page="component://webtools/widget/MiscScreens.xml#WebtoolsLayoutDemoText"/> + <view-map name="WebtoolsLayoutDemoXml" type="screenxml" page="component://webtools/widget/MiscScreens.xml#WebtoolsLayoutDemoText" content-type="text/xml"/> + <view-map name="WebtoolsLayoutDemoCsv" type="screencsv" page="component://webtools/widget/MiscScreens.xml#WebtoolsLayoutDemoText" content-type="text/csv"/> + <view-map name="WebtoolsLayoutDemoXls" type="screenxls" page="component://webtools/widget/MiscScreens.xml#WebtoolsLayoutDemoText" content-type="application/vnd.ms-excel"/> <!-- end of view mappings --> </site-conf> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |