Author: jacopoc
Date: Sun Feb 11 03:08:33 2007 New Revision: 505886 URL: http://svn.apache.org/viewvc?view=rev&rev=505886 Log: Applied patch from Chris Howe to replace all relative path form resource names with their component:// equivalent when an HtmlFormWrapper object is created. OFBIZ-711 Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/EditGlobalGlAccount.bsh ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/editPayment.bsh ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.bsh ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/showforumresponse.xml ofbiz/trunk/applications/ecommerce/widget/ContentScreens.xml ofbiz/trunk/applications/ecommerce/widget/ForumScreens.xml ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/EditProductionRun.bsh ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.bsh ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.bsh ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/WorkWithShipmentPlans.bsh ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.bsh ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.bsh ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/ListCalendarWeek.bsh ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderDeliveryScheduleInfo.bsh ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.bsh ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContentContent.bsh ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigOptions.bsh ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/feature/EditSupplierFeature.bsh ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.bsh ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.bsh Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/EditGlobalGlAccount.bsh URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/EditGlobalGlAccount.bsh?view=diff&rev=505886&r1=505885&r2=505886 ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/EditGlobalGlAccount.bsh (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/chartofaccounts/EditGlobalGlAccount.bsh Sun Feb 11 03:08:33 2007 @@ -33,7 +33,7 @@ glAccountId = request.getParameter("glAccountId"); glAccount = delegator.findByPrimaryKey("GlAccount", UtilMisc.toMap("glAccountId", glAccountId)); -HtmlFormWrapper editGlAccountWrapper = new HtmlFormWrapper("/chartofaccounts/GlAccountForms.xml", "EditGlAccount", request, response); +HtmlFormWrapper editGlAccountWrapper = new HtmlFormWrapper("component://accounting/webapp/accounting/chartofaccounts/GlAccountForms.xml", "EditGlAccount", request, response); editGlAccountWrapper.putInContext("glAccount", glAccount); editGlAccountWrapper.putInContext("glAccountId", glAccountId); editGlAccountWrapper.putInContext("uiLabelMap", request.getAttribute("uiLabelMap")); Modified: ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/editPayment.bsh URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/editPayment.bsh?view=diff&rev=505886&r1=505885&r2=505886 ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/editPayment.bsh (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/WEB-INF/actions/payment/editPayment.bsh Sun Feb 11 03:08:33 2007 @@ -47,11 +47,11 @@ currentMethod = payment.getRelatedOne("PaymentMethodType"); // get the payment's applications paymentApplications = payment.getRelated("PaymentApplication"); - HtmlFormWrapper paymentApplicationsWrapper = new HtmlFormWrapper("/payment/PaymentForms.xml", "PaymentApplicationsList", request, response); + HtmlFormWrapper paymentApplicationsWrapper = new HtmlFormWrapper("component://accounting/webapp/accounting/payment/PaymentForms.xml", "PaymentApplicationsList", request, response); paymentApplicationsWrapper.putInContext("entityList", paymentApplications); paymentApplicationsWrapper.putInContext("uiLabelMap", request.getAttribute("uiLabelMap")); context.put("paymentApplicationsWrapper", paymentApplicationsWrapper); - HtmlFormWrapper editPaymentApplicationWrapper = new HtmlFormWrapper("/payment/PaymentForms.xml", "EditPaymentApplication", request, response); + HtmlFormWrapper editPaymentApplicationWrapper = new HtmlFormWrapper("component://accounting/webapp/accounting/payment/PaymentForms.xml", "EditPaymentApplication", request, response); editPaymentApplicationWrapper.putInContext("paymentApplication", null); editPaymentApplicationWrapper.putInContext("paymentId", paymentId); editPaymentApplicationWrapper.putInContext("uiLabelMap", request.getAttribute("uiLabelMap")); Modified: ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.bsh URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.bsh?view=diff&rev=505886&r1=505885&r2=505886 ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.bsh (original) +++ ofbiz/trunk/applications/content/webapp/content/WEB-INF/actions/survey/EditSurveyQuestions.bsh Sun Feb 11 03:08:33 2007 @@ -31,11 +31,11 @@ surveyPageList = delegator.findByAnd("SurveyPage", UtilMisc.toMap("surveyId", surveyId), UtilMisc.toList("sequenceNum")); surveyMultiRespList = delegator.findByAnd("SurveyMultiResp", UtilMisc.toMap("surveyId", surveyId), UtilMisc.toList("multiRespTitle")); -HtmlFormWrapper createSurveyQuestionWrapper = new HtmlFormWrapper("/survey/SurveyForms.xml", "CreateSurveyQuestion", request, response); +HtmlFormWrapper createSurveyQuestionWrapper = new HtmlFormWrapper("component://content/webapp/content/survey/SurveyForms.xml", "CreateSurveyQuestion", request, response); createSurveyQuestionWrapper.putInContext("surveyId", surveyId); createSurveyQuestionWrapper.putInContext("surveyQuestion", surveyQuestion); -HtmlFormWrapper createSurveyQuestionCategoryWrapper = new HtmlFormWrapper("/survey/SurveyForms.xml", "CreateSurveyQuestionCategory", request, response); +HtmlFormWrapper createSurveyQuestionCategoryWrapper = new HtmlFormWrapper("component://content/webapp/content/survey/SurveyForms.xml", "CreateSurveyQuestionCategory", request, response); createSurveyQuestionCategoryWrapper.putInContext("surveyId", surveyId); if (surveyQuestion != null && surveyQuestion.get("surveyQuestionTypeId") != null && "OPTION".equals(surveyQuestion.getString("surveyQuestionTypeId"))) { @@ -43,7 +43,7 @@ questionOptions = delegator.findByAnd("SurveyQuestionOption", UtilMisc.toMap("surveyQuestionId", surveyQuestionId), UtilMisc.toList("sequenceNum")); context.put("questionOptions", questionOptions); - HtmlFormWrapper createSurveyOptionWrapper = new HtmlFormWrapper("/survey/SurveyForms.xml", "CreateSurveyQuestionOption", request, response); + HtmlFormWrapper createSurveyOptionWrapper = new HtmlFormWrapper("component://content/webapp/content/survey/SurveyForms.xml", "CreateSurveyQuestionOption", request, response); // survey question option optionSeqId = parameters.get("surveyOptionSeqId"); Modified: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/showforumresponse.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/showforumresponse.xml?view=diff&rev=505886&r1=505885&r2=505886 ============================================================================== --- ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/showforumresponse.xml (original) +++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/forum/showforumresponse.xml Sun Feb 11 03:08:33 2007 @@ -21,7 +21,7 @@ <page> <template>main</template> <property name="title">View Response</property> - <property name="formDefFile">/content/BlogContentForms.xml</property> + <property name="formDefFile">component://ecommerce/webapp/ecommerce/content/BlogContentForms.xml</property> <property name="singleFormName">ViewComboResponse</property> <property name="addFormName">ViewComboResponse</property> <property name="editFormName">ViewComboResponse</property> Modified: ofbiz/trunk/applications/ecommerce/widget/ContentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/ContentScreens.xml?view=diff&rev=505886&r1=505885&r2=505886 ============================================================================== --- ofbiz/trunk/applications/ecommerce/widget/ContentScreens.xml (original) +++ ofbiz/trunk/applications/ecommerce/widget/ContentScreens.xml Sun Feb 11 03:08:33 2007 @@ -116,7 +116,7 @@ <set field="titleProperty" value="PageTitleShoppingCart"/> <set field="headerItem" value="ContentMenu"/> - <set field="formDefFile" value="/content/ContentForms.xml"/> + <set field="formDefFile" value="component://ecommerce/webapp/ecommerce/content/ContentForms.xml"/> <set field="entityName" value=""/> <set field="permission" value="CONTENTMGR"/> <set field="permissionType" value="simple"/> Modified: ofbiz/trunk/applications/ecommerce/widget/ForumScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/ForumScreens.xml?view=diff&rev=505886&r1=505885&r2=505886 ============================================================================== --- ofbiz/trunk/applications/ecommerce/widget/ForumScreens.xml (original) +++ ofbiz/trunk/applications/ecommerce/widget/ForumScreens.xml Sun Feb 11 03:08:33 2007 @@ -132,7 +132,7 @@ <set field="titleProperty" value="PageTitleAddContent"/> <set field="headerItem" value="Forum"/> - <set field="formDefFile" value="/forum/ForumForms.xml"/> + <set field="formDefFile" value="component://ecommerce/webapp/ecommerce/forum/ForumForms.xml"/> <set field="singleFormName" value="AddContent"/> <set field="subMenu" value="/admin/admin_menu.ftl"/> <set field="entityName" value="Content"/> @@ -179,7 +179,7 @@ <set field="titleProperty" value="PageTitleEditContent"/> <set field="headerItem" value="Forum"/> - <set field="formDefFile" value="/forum/ForumForms.xml"/> + <set field="formDefFile" value="component://ecommerce/webapp/ecommerce/forum/ForumForms.xml"/> <set field="singleFormName" value="AddContent"/> <set field="subMenu" value="/admin/admin_menu.ftl"/> <set field="entityName" value="Content"/> @@ -227,7 +227,7 @@ <set field="titleProperty" value="PageTitleForumResponse"/> <set field="headerItem" value="Forum"/> - <set field="formDefFile" value="/forum/ForumForms.xml"/> + <set field="formDefFile" value="component://ecommerce/webapp/ecommerce/forum/ForumForms.xml"/> <set field="singleFormName" value="ViewComboResponse"/> <set field="addFormName" value="ViewComboResponse"/> <set field="editFormName" value="ViewComboResponse"/> @@ -272,7 +272,7 @@ <set field="titleProperty" value="PageTitleAddResponse"/> <set field="headerItem" value="Forum"/> - <set field="formDefFile" value="/forum/ForumForms.xml"/> + <set field="formDefFile" value="component://ecommerce/webapp/ecommerce/forum/ForumForms.xml"/> <set field="singleFormName" value="AddResponse"/> <set field="addFormName" value="EditResponse"/> <set field="editFormName" value="EditResponse"/> @@ -322,7 +322,7 @@ <set field="titleProperty" value="PageTitleEditForumContentInfo"/> <set field="headerItem" value="Forum"/> - <set field="formDefFile" value="/forum/ForumForms.xml"/> + <set field="formDefFile" value="component://ecommerce/webapp/ecommerce/forum/ForumForms.xml"/> <set field="singleFormName" value="EditContentInfo"/> <set field="entityName" value="Content"/> <set field="permission" value="CONTENTMGR"/> @@ -364,7 +364,7 @@ <set field="titleProperty" value="PageTitleEditAddContent"/> <set field="headerItem" value="Forum"/> - <set field="formDefFile" value="/forum/ForumForms.xml"/> + <set field="formDefFile" value="component://ecommerce/webapp/ecommerce/forum/ForumForms.xml"/> <set field="singleFormName" value="EditAddContent"/> <set field="subMenu" value="/admin/admin_menu.ftl"/> <set field="entityName" value="Content"/> @@ -417,7 +417,7 @@ <set field="titleProperty" value="PageTitleEditAddImage"/> <set field="headerItem" value="Forum"/> - <set field="formDefFile" value="/forum/ForumForms.xml"/> + <set field="formDefFile" value="component://ecommerce/webapp/ecommerce/forum/ForumForms.xml"/> <set field="singleFormName" value="EditAddImage"/> <set field="subMenu" value="/admin/admin_menu.ftl"/> <set field="entityName" value="Content"/> Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/EditProductionRun.bsh URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/EditProductionRun.bsh?view=diff&rev=505886&r1=505885&r2=505886 ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/EditProductionRun.bsh (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/EditProductionRun.bsh Sun Feb 11 03:08:33 2007 @@ -58,7 +58,7 @@ } // productionRun update sub-screen - HtmlFormWrapper updateProductionRunWrapper = new HtmlFormWrapper("/jobshopmgt/ProductionRunForms.xml", "UpdateProductionRun", request, response); + HtmlFormWrapper updateProductionRunWrapper = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "UpdateProductionRun", request, response); updateProductionRunWrapper.putInContext("productionRunData", productionRunData); updateProductionRunWrapper.putInContext("actionForm", "updateProductionRun"); updateProductionRunWrapper.setUseRequestParameters(false); @@ -115,7 +115,7 @@ // routingTask add sub-screen if (actionForm.equals("AddRoutingTask")){ Map routingTaskData =UtilMisc.toMap("workEffortParentId",productionRunId); - HtmlFormWrapper editPrRoutingTaskWrapper = new HtmlFormWrapper("/jobshopmgt/ProductionRunForms.xml", "EditProductionRunRoutingTask", request, response); + HtmlFormWrapper editPrRoutingTaskWrapper = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "EditProductionRunRoutingTask", request, response); editPrRoutingTaskWrapper.putInContext("routingTaskData", routingTaskData); editPrRoutingTaskWrapper.putInContext("actionForm", "addRoutingTask"); editPrRoutingTaskWrapper.putInContext("actionIsAdd", "Y"); @@ -134,7 +134,7 @@ routingTaskData.put("estimatedMilliSeconds",routingTask.getDouble("estimatedMilliSeconds").toString()); else routingTaskData.put("estimatedMilliSeconds", "0"); - HtmlFormWrapper editPrRoutingTaskWrapper = new HtmlFormWrapper("/jobshopmgt/ProductionRunForms.xml", "EditProductionRunRoutingTask", request, response); + HtmlFormWrapper editPrRoutingTaskWrapper = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "EditProductionRunRoutingTask", request, response); editPrRoutingTaskWrapper.putInContext("routingTaskData", routingTaskData); editPrRoutingTaskWrapper.putInContext("actionForm", "UpdateRoutingTask"); editPrRoutingTaskWrapper.putInContext("actionIsAdd", "null"); @@ -143,7 +143,7 @@ } // RoutingTasks list List productionRunRoutingTasks = productionRun.getProductionRunRoutingTasks(); - HtmlFormWrapper ListProductionRunRoutingTasksWrapper = new HtmlFormWrapper("/jobshopmgt/ProductionRunForms.xml", "ListProductionRunRoutingTasks", request, response); + HtmlFormWrapper ListProductionRunRoutingTasksWrapper = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "ListProductionRunRoutingTasks", request, response); ListProductionRunRoutingTasksWrapper.putInContext("productionRunRoutingTasks", productionRunRoutingTasks); context.put("ListProductionRunRoutingTasksWrapper",ListProductionRunRoutingTasksWrapper); @@ -153,7 +153,7 @@ // Product component add sub-screen if (actionForm.equals("AddProductComponent")){ Map productComponentData = UtilMisc.toMap("productionRunId", productionRunId); - HtmlFormWrapper editPrProductComponentWrapper = new HtmlFormWrapper("/jobshopmgt/ProductionRunForms.xml", "EditProductionRunComponent", request, response); + HtmlFormWrapper editPrProductComponentWrapper = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "EditProductionRunComponent", request, response); editPrProductComponentWrapper.putInContext("productComponentData", productComponentData); editPrProductComponentWrapper.putInContext("actionForm", "addProductComponent"); editPrProductComponentWrapper.putInContext("actionIsAdd","Y"); @@ -169,7 +169,7 @@ productComponentData.put("productionRunId", productionRunId); internalName = productComponent.getRelatedOne("Product").getString("internalName"); productComponentData.put("internalName",internalName); - HtmlFormWrapper editPrProductComponentWrapper = new HtmlFormWrapper("/jobshopmgt/ProductionRunForms.xml", "EditProductionRunComponent", request, response); + HtmlFormWrapper editPrProductComponentWrapper = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "EditProductionRunComponent", request, response); editPrProductComponentWrapper.putInContext("productComponentData", productComponentData); editPrProductComponentWrapper.putInContext("actionForm", "updateProductComponent"); editPrProductComponentWrapper.putInContext("actionIsAdd", "null"); @@ -191,7 +191,7 @@ productionRunComponentsData.add(componentData); } } - HtmlFormWrapper ListProductionRunComponentsWrapper = new HtmlFormWrapper("/jobshopmgt/ProductionRunForms.xml", "ListProductionRunComponents", request, response); + HtmlFormWrapper ListProductionRunComponentsWrapper = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "ListProductionRunComponents", request, response); ListProductionRunComponentsWrapper.putInContext("productionRunId", productionRunId); ListProductionRunComponentsWrapper.putInContext("productionRunComponentsData", productionRunComponentsData); context.put("ListProductionRunComponentsWrapper",ListProductionRunComponentsWrapper); @@ -202,7 +202,7 @@ // Fixed asset add sub-screen if (actionForm.equals("AddFixedAsset")) { Map fixedAssetData = UtilMisc.toMap("productionRunId", productionRunId); - HtmlFormWrapper editProdRunFixedAssetWrapper = new HtmlFormWrapper("/jobshopmgt/ProductionRunForms.xml", "EditProductionRunTaskFixedAsset", request, response); + HtmlFormWrapper editProdRunFixedAssetWrapper = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "EditProductionRunTaskFixedAsset", request, response); editProdRunFixedAssetWrapper.putInContext("fixedAssetData", fixedAssetData); editProdRunFixedAssetWrapper.putInContext("actionForm", "addFixedAsset"); editProdRunFixedAssetWrapper.putInContext("actionIsAdd", "Y"); @@ -220,7 +220,7 @@ UtilMisc.toMap("workEffortId", workEffortId, "fixedAssetId", fixedAssetId, "fromDate", fromDate)); Map fixedAssetData = fixedAsset.getAllFields(); fixedAssetData.put("productionRunId", productionRunId); - HtmlFormWrapper editProdRunFixedAssetWrapper = new HtmlFormWrapper("/jobshopmgt/ProductionRunForms.xml", "EditProductionRunTaskFixedAsset", request, response); + HtmlFormWrapper editProdRunFixedAssetWrapper = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "EditProductionRunTaskFixedAsset", request, response); editProdRunFixedAssetWrapper.putInContext("fixedAssetData", fixedAssetData); editProdRunFixedAssetWrapper.putInContext("actionForm", "updateFixedAsset"); editProdRunFixedAssetWrapper.putInContext("actionIsAdd", "null"); @@ -235,7 +235,7 @@ List taskFixedAssets = prodRunTask.getRelated("WorkEffortFixedAssetAssign"); productionRunFixedAssetsData.addAll(taskFixedAssets); } - HtmlFormWrapper ListProductionRunFixedAssetsWrapper = new HtmlFormWrapper("/jobshopmgt/ProductionRunForms.xml", "ListProductionRunTaskFixedAssets", request, response); + HtmlFormWrapper ListProductionRunFixedAssetsWrapper = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "ListProductionRunTaskFixedAssets", request, response); ListProductionRunFixedAssetsWrapper.putInContext("productionRunId", productionRunId); ListProductionRunFixedAssetsWrapper.putInContext("productionRunFixedAssetsData", productionRunFixedAssetsData); ListProductionRunFixedAssetsWrapper.putInContext("declarationScreen", "N"); Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.bsh URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.bsh?view=diff&rev=505886&r1=505885&r2=505886 ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.bsh (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunCosts.bsh Sun Feb 11 03:08:33 2007 @@ -40,7 +40,7 @@ while (tasksIt.hasNext()) { GenericValue task = (GenericValue)tasksIt.next(); List costs = EntityUtil.filterByDate(delegator.findByAnd("CostComponent", UtilMisc.toMap("workEffortId", task.getString("workEffortId")))); - HtmlFormWrapper taskCostsForm = new HtmlFormWrapper("/jobshopmgt/ProductionRunForms.xml", "ProductionRunTaskCosts", request, response); + HtmlFormWrapper taskCostsForm = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "ProductionRunTaskCosts", request, response); taskCostsForm.putInContext("taskCosts", costs); taskCosts.add(UtilMisc.toMap("task", task, "costsForm", taskCostsForm)); } Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.bsh URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.bsh?view=diff&rev=505886&r1=505885&r2=505886 ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.bsh (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/ProductionRunDeclaration.bsh Sun Feb 11 03:08:33 2007 @@ -88,7 +88,7 @@ double maxQuantity = quantityDeclared.doubleValue() - quantityProduced.doubleValue(); // productionRun update sub-screen - HtmlFormWrapper updateProductionRunWrapper = new HtmlFormWrapper("/jobshopmgt/ProductionRunForms.xml", "ShowProductionRun", request, response); + HtmlFormWrapper updateProductionRunWrapper = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "ShowProductionRun", request, response); updateProductionRunWrapper.putInContext("productionRunData", productionRunData); updateProductionRunWrapper.putInContext("actionForm", "updateProductionRun"); updateProductionRunWrapper.setUseRequestParameters(false); @@ -133,7 +133,7 @@ Map routingTaskData = routingTask.getAllFields(); routingTaskData.put("estimatedSetupMillis", routingTask.getDouble("estimatedSetupMillis")); routingTaskData.put("estimatedMilliSeconds", routingTask.getDouble("estimatedMilliSeconds")); - HtmlFormWrapper editPrRoutingTaskWrapper = new HtmlFormWrapper("/jobshopmgt/ProductionRunForms.xml", "EditProductionRunDeclRoutingTask", request, response); + HtmlFormWrapper editPrRoutingTaskWrapper = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "EditProductionRunDeclRoutingTask", request, response); editPrRoutingTaskWrapper.putInContext("routingTaskData", routingTaskData); editPrRoutingTaskWrapper.putInContext("actionForm", "UpdateRoutingTask"); routingTaskData.put("partyId", userLogin.getString("partyId")); @@ -151,14 +151,14 @@ if (templateTask != null) { delivProducts = EntityUtil.filterByDate(templateTask.getRelatedByAnd("WorkEffortGoodStandard", UtilMisc.toMap("workEffortGoodStdTypeId", "PRUNT_PROD_DELIV"))); } - HtmlFormWrapper createRoutingTaskDelivProductForm = new HtmlFormWrapper("/jobshopmgt/ProductionRunForms.xml", "CreateRoutingTaskDelivProduct", request, response); + HtmlFormWrapper createRoutingTaskDelivProductForm = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "CreateRoutingTaskDelivProduct", request, response); createRoutingTaskDelivProductForm.putInContext("formData", UtilMisc.toMap("productionRunId", productionRunId, "workEffortId", routingTaskId)); context.put("createRoutingTaskDelivProductForm", createRoutingTaskDelivProductForm); context.put("delivProducts", delivProducts); // Get the list of delivered products, i.e. inventory items List prunInventoryProduced = delegator.findByAnd("WorkEffortAndInventoryProduced", UtilMisc.toMap("workEffortId", routingTaskId)); context.put("prunInventoryProduced", prunInventoryProduced); - HtmlFormWrapper prunInventoryProducedForm = new HtmlFormWrapper("/jobshopmgt/ProductionRunForms.xml", "ProductionRunTaskInventoryProducedList", request, response); + HtmlFormWrapper prunInventoryProducedForm = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "ProductionRunTaskInventoryProducedList", request, response); prunInventoryProducedForm.putInContext("prunInventoryProduced", prunInventoryProduced); context.put("prunInventoryProducedForm", prunInventoryProducedForm); } @@ -189,7 +189,7 @@ startTaskId = task.getString("workEffortId"); } } - HtmlFormWrapper ListProductionRunRoutingTasksWrapper = new HtmlFormWrapper("/jobshopmgt/ProductionRunForms.xml", "ListProductionRunDeclRoutingTasks", request, response); + HtmlFormWrapper ListProductionRunRoutingTasksWrapper = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "ListProductionRunDeclRoutingTasks", request, response); ListProductionRunRoutingTasksWrapper.putInContext("productionRunRoutingTasks", productionRunRoutingTasks); ListProductionRunRoutingTasksWrapper.putInContext("startTaskId", (startTaskId != null? startTaskId: "null")); ListProductionRunRoutingTasksWrapper.putInContext("issueTaskId", (issueTaskId != null? issueTaskId: "null")); @@ -210,7 +210,7 @@ productComponentData.put("productionRunId", productionRunId); internalName = productComponent.getRelatedOne("Product").getString("internalName"); productComponentData.put("internalName",internalName); - HtmlFormWrapper editPrProductComponentWrapper = new HtmlFormWrapper("/jobshopmgt/ProductionRunForms.xml", "EditProductionRunComponent", request, response); + HtmlFormWrapper editPrProductComponentWrapper = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "EditProductionRunComponent", request, response); editPrProductComponentWrapper.putInContext("productComponentData", productComponentData); editPrProductComponentWrapper.putInContext("actionForm", "updateProductComponent"); editPrProductComponentWrapper.putInContext("uiLabelButton",request.getAttribute("uiLabelMap").get("CommonUpdate")); @@ -263,7 +263,7 @@ productionRunComponentsData.add(componentData); } } - HtmlFormWrapper ListProductionRunComponentsWrapper = new HtmlFormWrapper("/jobshopmgt/ProductionRunForms.xml", "ListProductionRunDeclComponents", request, response); + HtmlFormWrapper ListProductionRunComponentsWrapper = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "ListProductionRunDeclComponents", request, response); ListProductionRunComponentsWrapper.putInContext("productionRunId", productionRunId); ListProductionRunComponentsWrapper.putInContext("productionRunComponentsData", productionRunComponentsData); context.put("ListProductionRunComponentsWrapper",ListProductionRunComponentsWrapper); @@ -275,7 +275,7 @@ // Fixed asset add sub-screen if (actionForm.equals("AddFixedAsset")) { Map fixedAssetData = UtilMisc.toMap("productionRunId", productionRunId); - HtmlFormWrapper editProdRunFixedAssetWrapper = new HtmlFormWrapper("/jobshopmgt/ProductionRunForms.xml", "EditProductionRunTaskFixedAsset", request, response); + HtmlFormWrapper editProdRunFixedAssetWrapper = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "EditProductionRunTaskFixedAsset", request, response); editProdRunFixedAssetWrapper.putInContext("fixedAssetData", fixedAssetData); editProdRunFixedAssetWrapper.putInContext("actionForm", "addFixedAsset"); editProdRunFixedAssetWrapper.putInContext("actionIsAdd", "Y"); @@ -291,7 +291,7 @@ UtilMisc.toMap("workEffortId", workEffortId, "fixedAssetId", fixedAssetId, "fromDate", fromDate)); Map fixedAssetData = fixedAsset.getAllFields(); fixedAssetData.put("productionRunId", productionRunId); - HtmlFormWrapper editProdRunFixedAssetWrapper = new HtmlFormWrapper("/jobshopmgt/ProductionRunForms.xml", "EditProductionRunTaskFixedAsset", request, response); + HtmlFormWrapper editProdRunFixedAssetWrapper = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "EditProductionRunTaskFixedAsset", request, response); editProdRunFixedAssetWrapper.putInContext("fixedAssetData", fixedAssetData); editProdRunFixedAssetWrapper.putInContext("actionForm", "updateFixedAsset"); editProdRunFixedAssetWrapper.putInContext("actionIsAdd", "null"); @@ -306,7 +306,7 @@ List taskFixedAssets = prodRunTask.getRelated("WorkEffortFixedAssetAssign"); productionRunFixedAssetsData.addAll(taskFixedAssets); } - HtmlFormWrapper ListProductionRunFixedAssetsWrapper = new HtmlFormWrapper("/jobshopmgt/ProductionRunForms.xml", "ListProductionRunTaskFixedAssets", request, response); + HtmlFormWrapper ListProductionRunFixedAssetsWrapper = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "ListProductionRunTaskFixedAssets", request, response); ListProductionRunFixedAssetsWrapper.putInContext("productionRunId", productionRunId); ListProductionRunFixedAssetsWrapper.putInContext("productionRunFixedAssetsData", productionRunFixedAssetsData); ListProductionRunFixedAssetsWrapper.putInContext("declarationScreen", "Y"); Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/WorkWithShipmentPlans.bsh URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/WorkWithShipmentPlans.bsh?view=diff&rev=505886&r1=505885&r2=505886 ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/WorkWithShipmentPlans.bsh (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/jobshopmgt/WorkWithShipmentPlans.bsh Sun Feb 11 03:08:33 2007 @@ -175,7 +175,7 @@ rows.add(oneRow); } context.put("workInProgress", workInProgress); - HtmlFormWrapper listShipmentPlanForm = new HtmlFormWrapper("/jobshopmgt/ProductionRunForms.xml", "listShipmentPlan", request, response); + HtmlFormWrapper listShipmentPlanForm = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "listShipmentPlan", request, response); listShipmentPlanForm.putInContext("shipmentPlan", rows); context.put("listShipmentPlanForm", listShipmentPlanForm); // Form for ShipmentPlan list } else { @@ -188,7 +188,7 @@ } //List confirmedShipments = delegator.findByAndCache("Shipment", UtilMisc.toMap("shipmentTypeId", "SALES_SHIPMENT", "statusId", "SCHEDULED_CONFIRMED")); - HtmlFormWrapper listShipmentPlansForm = new HtmlFormWrapper("/jobshopmgt/ProductionRunForms.xml", "listShipmentPlans", request, response); + HtmlFormWrapper listShipmentPlansForm = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml", "listShipmentPlans", request, response); listShipmentPlansForm.putInContext("shipmentPlans", shipments); context.put("listShipmentPlansForm", listShipmentPlansForm); } Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.bsh URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.bsh?view=diff&rev=505886&r1=505885&r2=505886 ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.bsh (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionDay.bsh Sun Feb 11 03:08:33 2007 @@ -44,10 +44,10 @@ if (techDataCalendar != null) { calendarExceptionDays = techDataCalendar.getRelated("TechDataCalendarExcDay"); } -HtmlFormWrapper listCalendarExceptionDayWrapper = new HtmlFormWrapper("/routing/CalendarForms.xml", "ListCalendarExceptionDay", request, response); +HtmlFormWrapper listCalendarExceptionDayWrapper = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/routing/CalendarForms.xml", "ListCalendarExceptionDay", request, response); listCalendarExceptionDayWrapper.putInContext("calendarExceptionDays", calendarExceptionDays); -HtmlFormWrapper addCalendarExceptionDayWrapper = new HtmlFormWrapper("/routing/CalendarForms.xml", "AddCalendarExceptionDay", request, response); +HtmlFormWrapper addCalendarExceptionDayWrapper = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/routing/CalendarForms.xml", "AddCalendarExceptionDay", request, response); addCalendarExceptionDayWrapper.putInContext("techDataCalendar", techDataCalendar); context.put("techDataCalendar", techDataCalendar); @@ -60,9 +60,9 @@ if (exceptionDateStartTime != null) { calendarExceptionDay = delegator.findByPrimaryKey("TechDataCalendarExcDay", UtilMisc.toMap("calendarId", calendarId,"exceptionDateStartTime", exceptionDateStartTime)); if (calendarExceptionDay != null) { - HtmlFormWrapper updateCalendarExceptionDayWrapper = new HtmlFormWrapper("/routing/CalendarForms.xml", "UpdateCalendarExceptionDay", request, response); + HtmlFormWrapper updateCalendarExceptionDayWrapper = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/routing/CalendarForms.xml", "UpdateCalendarExceptionDay", request, response); updateCalendarExceptionDayWrapper.putInContext("calendarExceptionDay", calendarExceptionDay); context.put("calendarExceptionDay", calendarExceptionDay); context.put("updateCalendarExceptionDayWrapper", updateCalendarExceptionDayWrapper); } -} \ No newline at end of file +} Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.bsh URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.bsh?view=diff&rev=505886&r1=505885&r2=505886 ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.bsh (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/EditCalendarExceptionWeek.bsh Sun Feb 11 03:08:33 2007 @@ -52,10 +52,10 @@ calendarExceptionWeeksDatas.add(UtilMisc.toMap("calendarExceptionWeek", calendarExceptionWeek, "calendarWeek", calendarWeek)); } -HtmlFormWrapper listCalendarExceptionWeekWrapper = new HtmlFormWrapper("/routing/CalendarForms.xml", "ListCalendarExceptionWeek", request, response); +HtmlFormWrapper listCalendarExceptionWeekWrapper = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/routing/CalendarForms.xml", "ListCalendarExceptionWeek", request, response); listCalendarExceptionWeekWrapper.putInContext("calendarExceptionWeeksDatas", calendarExceptionWeeksDatas); -HtmlFormWrapper addCalendarExceptionWeekWrapper = new HtmlFormWrapper("/routing/CalendarForms.xml", "AddCalendarExceptionWeek", request, response); +HtmlFormWrapper addCalendarExceptionWeekWrapper = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/routing/CalendarForms.xml", "AddCalendarExceptionWeek", request, response); addCalendarExceptionWeekWrapper.putInContext("techDatacalendar", techDataCalendar); context.put("techDataCalendar", techDataCalendar); @@ -68,9 +68,9 @@ if (exceptionDateStart != null) { calendarExceptionWeek = delegator.findByPrimaryKey("TechDataCalendarExcWeek", UtilMisc.toMap("calendarId", calendarId,"exceptionDateStart", exceptionDateStart)); if (calendarExceptionWeek != null) { - HtmlFormWrapper updateCalendarExceptionWeekWrapper = new HtmlFormWrapper("/routing/CalendarForms.xml", "UpdateCalendarExceptionWeek", request, response); + HtmlFormWrapper updateCalendarExceptionWeekWrapper = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/routing/CalendarForms.xml", "UpdateCalendarExceptionWeek", request, response); updateCalendarExceptionWeekWrapper.putInContext("calendarExceptionWeek", calendarExceptionWeek); context.put("calendarExceptionWeek", calendarExceptionWeek); context.put("updateCalendarExceptionWeekWrapper", updateCalendarExceptionWeekWrapper); } -} \ No newline at end of file +} Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/ListCalendarWeek.bsh URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/ListCalendarWeek.bsh?view=diff&rev=505886&r1=505885&r2=505886 ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/ListCalendarWeek.bsh (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/actions/routing/ListCalendarWeek.bsh Sun Feb 11 03:08:33 2007 @@ -32,7 +32,7 @@ } List allCalendarWeek = delegator.findAll("TechDataCalendarWeek"); context.put("allCalendarWeek",allCalendarWeek); -HtmlFormWrapper listCalendarWeekWrapper = new HtmlFormWrapper("/routing/CalendarForms.xml", "ListCalendarWeek", request, response); +HtmlFormWrapper listCalendarWeekWrapper = new HtmlFormWrapper("component://manufacturing/webapp/manufacturing/routing/CalendarForms.xml", "ListCalendarWeek", request, response); listCalendarWeekWrapper.putInContext("calendarWeeks", allCalendarWeek); context.put("listCalendarWeekWrapper",listCalendarWeekWrapper); Modified: ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderDeliveryScheduleInfo.bsh URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderDeliveryScheduleInfo.bsh?view=diff&rev=505886&r1=505885&r2=505886 ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderDeliveryScheduleInfo.bsh (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/WEB-INF/actions/order/OrderDeliveryScheduleInfo.bsh Sun Feb 11 03:08:33 2007 @@ -44,7 +44,7 @@ hasSupplierRelatedPermission = "true".equals(hasSupplierRelatedPermissionStr); // Initialize the PO Delivery Schedule form -HtmlFormWrapper updatePODeliveryInfoWrapper = new HtmlFormWrapper("/order/OrderDeliveryScheduleForms.xml", "UpdateDeliveryScheduleInformation", request, response); +HtmlFormWrapper updatePODeliveryInfoWrapper = new HtmlFormWrapper("component://order/webapp/ordermgr/order/OrderDeliveryScheduleForms.xml", "UpdateDeliveryScheduleInformation", request, response); updatePODeliveryInfoWrapper.putInContext("orderId", orderId); updatePODeliveryInfoWrapper.putInContext("orderItemSeqId", "_NA_"); updatePODeliveryInfoWrapper.putInContext("schedule", schedule); Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.bsh URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.bsh?view=diff&rev=505886&r1=505885&r2=505886 ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.bsh (original) +++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContent.bsh Sun Feb 11 03:08:33 2007 @@ -45,15 +45,15 @@ productContentDatas.add(UtilMisc.toMap("productContent", productContent, "content", content)); } -HtmlFormWrapper updateProductContentWrapper = new HtmlFormWrapper("/config/ConfigForms.xml", "UpdateProductConfigItemContentAssoc", request, response); +HtmlFormWrapper updateProductContentWrapper = new HtmlFormWrapper("component://product/webapp/catalog/config/ConfigForms.xml", "UpdateProductConfigItemContentAssoc", request, response); context.put("updateProductContentWrapper", updateProductContentWrapper); updateProductContentWrapper.putInContext("productContentDatas", productContentDatas); -HtmlFormWrapper prepareAddProductContentWrapper = new HtmlFormWrapper("/config/ConfigForms.xml", "PrepareAddProductConfigItemContentAssoc", request, response); +HtmlFormWrapper prepareAddProductContentWrapper = new HtmlFormWrapper("component://product/webapp/catalog/config/ConfigForms.xml", "PrepareAddProductConfigItemContentAssoc", request, response); context.put("prepareAddProductContentWrapper", prepareAddProductContentWrapper); prepareAddProductContentWrapper.putInContext("configItem", configItem); -HtmlFormWrapper addProductContentWrapper = new HtmlFormWrapper("/config/ConfigForms.xml", "AddProductConfigItemContentAssoc", request, response); +HtmlFormWrapper addProductContentWrapper = new HtmlFormWrapper("component://product/webapp/catalog/config/ConfigForms.xml", "AddProductConfigItemContentAssoc", request, response); context.put("addProductContentWrapper", addProductContentWrapper); addProductContentWrapper.putInContext("configItem", configItem); Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContentContent.bsh URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContentContent.bsh?view=diff&rev=505886&r1=505885&r2=505886 ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContentContent.bsh (original) +++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigItemContentContent.bsh Sun Feb 11 03:08:33 2007 @@ -69,7 +69,7 @@ textData.put("textDataResourceId", text.get("dataResourceId")); } } -updateProductContentWrapper = new HtmlFormWrapper("/config/ConfigForms.xml", "EditProductConfigItemContentSimpleText", request, response); +updateProductContentWrapper = new HtmlFormWrapper("component://product/webapp/catalog/config/ConfigForms.xml", "EditProductConfigItemContentSimpleText", request, response); updateProductContentWrapper.putInContext("textData", textData); context.put("updateProductContentWrapper", updateProductContentWrapper); Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigOptions.bsh URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigOptions.bsh?view=diff&rev=505886&r1=505885&r2=505886 ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigOptions.bsh (original) +++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/config/EditProductConfigOptions.bsh Sun Feb 11 03:08:33 2007 @@ -22,7 +22,7 @@ import org.ofbiz.widget.html.*; -HtmlFormWrapper createConfigOptionWrapper = new HtmlFormWrapper("/config/ConfigForms.xml", "CreateConfigOption", request, response); +HtmlFormWrapper createConfigOptionWrapper = new HtmlFormWrapper("component://product/webapp/catalog/config/ConfigForms.xml", "CreateConfigOption", request, response); createConfigOptionWrapper.putInContext("configItemId", configItemId); createConfigOptionWrapper.putInContext("configOption", configOption); @@ -30,7 +30,7 @@ if (configOption != null) { - HtmlFormWrapper createConfigProductWrapper = new HtmlFormWrapper("/config/ConfigForms.xml", "CreateProductConfigProduct", request, response); + HtmlFormWrapper createConfigProductWrapper = new HtmlFormWrapper("component://product/webapp/catalog/config/ConfigForms.xml", "CreateProductConfigProduct", request, response); createConfigProductWrapper.putInContext("productConfigProduct", configProduct); createConfigProductWrapper.putInContext("configOptionId", configOptionId); createConfigProductWrapper.putInContext("configItemId", configItemId); Modified: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/feature/EditSupplierFeature.bsh URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/feature/EditSupplierFeature.bsh?view=diff&rev=505886&r1=505885&r2=505886 ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/feature/EditSupplierFeature.bsh (original) +++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/actions/feature/EditSupplierFeature.bsh Sun Feb 11 03:08:33 2007 @@ -39,12 +39,12 @@ if (result.get(ModelService.RESPONSE_MESSAGE).equals(ModelService.RESPOND_SUCCESS)) { supplierProductFeatures = result.get("supplierProductFeatures"); - HtmlFormWrapper editSupplierFeaturesForm = new HtmlFormWrapper("/feature/FeatureForms.xml", "EditSupplierProductFeatures", request, response); + HtmlFormWrapper editSupplierFeaturesForm = new HtmlFormWrapper("component://product/webapp/catalog/feature/FeatureForms.xml", "EditSupplierProductFeatures", request, response); editSupplierFeaturesForm.putInContext("supplierProductFeatures", supplierProductFeatures); context.put("editSupplierFeaturesForm", editSupplierFeaturesForm); } - HtmlFormWrapper createSupplierFeatureForm = new HtmlFormWrapper("/feature/FeatureForms.xml", "CreateSupplierProductFeature", request, response); + HtmlFormWrapper createSupplierFeatureForm = new HtmlFormWrapper("component://product/webapp/catalog/feature/FeatureForms.xml", "CreateSupplierProductFeature", request, response); // we are fooling the form with a dummy productFeature map, which consists only of a productFeatureId createSupplierFeatureForm.putInContext("productFeature", UtilMisc.toMap("productFeatureId", productFeatureId)); context.put("createSupplierFeatureForm", createSupplierFeatureForm); Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.bsh URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.bsh?view=diff&rev=505886&r1=505885&r2=505886 ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.bsh (original) +++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipment.bsh Sun Feb 11 03:08:33 2007 @@ -38,7 +38,7 @@ } orderHeader = delegator.findByPrimaryKey("OrderHeader", UtilMisc.toMap("orderId", primaryOrderId)); -HtmlFormWrapper editShipmentWrapper = new HtmlFormWrapper("/shipment/ShipmentForms.xml", "EditShipment", request, response); +HtmlFormWrapper editShipmentWrapper = new HtmlFormWrapper("component://product/webapp/facility/shipment/ShipmentForms.xml", "EditShipment", request, response); editShipmentWrapper.putInContext("shipmentId", shipmentId); editShipmentWrapper.putInContext("shipment", shipment); editShipmentWrapper.putInContext("productStoreId", null); // seems to be needed not exist != null Modified: ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.bsh URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.bsh?view=diff&rev=505886&r1=505885&r2=505886 ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.bsh (original) +++ ofbiz/trunk/applications/product/webapp/facility/WEB-INF/actions/shipment/EditShipmentPlan.bsh Sun Feb 11 03:08:33 2007 @@ -181,7 +181,7 @@ rows.add(oneRow); } } -HtmlFormWrapper listShipmentPlanForm = new HtmlFormWrapper("/shipment/ShipmentForms.xml", "listShipmentPlan", request, response); +HtmlFormWrapper listShipmentPlanForm = new HtmlFormWrapper("component://product/webapp/facility/shipment/ShipmentForms.xml", "listShipmentPlan", request, response); listShipmentPlanForm.putInContext("shipmentPlan", rows); // ************************************** @@ -271,16 +271,16 @@ } } // Add form -HtmlFormWrapper addToShipmentPlanForm = new HtmlFormWrapper("/shipment/ShipmentForms.xml", "addToShipmentPlan", request, response); +HtmlFormWrapper addToShipmentPlanForm = new HtmlFormWrapper("component://product/webapp/facility/shipment/ShipmentForms.xml", "addToShipmentPlan", request, response); addToShipmentPlanForm.putInContext("shipmentPlan", addRows); -HtmlFormWrapper findOrderItemsForm = new HtmlFormWrapper("/shipment/ShipmentForms.xml", "findOrderItems", request, response); +HtmlFormWrapper findOrderItemsForm = new HtmlFormWrapper("component://product/webapp/facility/shipment/ShipmentForms.xml", "findOrderItems", request, response); findOrderItemsForm.putInContext("shipmentId", shipmentId); if (shipment != null && shipment.get("primaryOrderId") != null) { findOrderItemsForm.putInContext("orderId", shipment.getString("primaryOrderId")); } -HtmlFormWrapper shipmentPlanToOrderItemsForm = new HtmlFormWrapper("/shipment/ShipmentForms.xml", "shipmentPlanToOrderItems", request, response); +HtmlFormWrapper shipmentPlanToOrderItemsForm = new HtmlFormWrapper("component://product/webapp/facility/shipment/ShipmentForms.xml", "shipmentPlanToOrderItems", request, response); shipmentPlanToOrderItemsForm.putInContext("shipmentId", shipmentId); |
Free forum by Nabble | Edit this page |