[OFBiz] SVN: r4806 - in trunk/applications/product: config
webapp/catalog/WEB-INF webapp/catalog/WEB-INF/actions/category
webapp/catalog/WEB-INF/actions/find
webapp/catalog/WEB-INF/actions/product
webapp/catalog/WEB-INF/actions/promo
webapp/catalog/WEB-INF/actions/store
webapp/catalog/WEB-INF/actions/thesaurus
webapp/catalog/WEB-INF/pagedefs
webapp/catalog/WEB-INF/pagedefs/find webapp/catalog/catalog
webapp/catalog/category webapp/catalog/find
webapp/catalog/product webapp/catalog/promo
webapp/catalog/store webapp/catalog/thesaurus widget/catalog
jonesde at svn.ofbiz.org
jonesde at svn.ofbiz.org
Tue Apr 12 04:39:01 EDT 2005
Author: jonesde
Date: 2005-04-12 03:37:49 -0500 (Tue, 12 Apr 2005)
New Revision: 4806
Added:
trunk/applications/product/widget/catalog/CategoryScreens.xml
trunk/applications/product/widget/catalog/FindScreens.xml
trunk/applications/product/widget/catalog/PromoScreens.xml
trunk/applications/product/widget/catalog/StoreScreens.xml
trunk/applications/product/widget/catalog/ThesaurusScreens.xml
Removed:
trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryFeatureCats.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryParties.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryProdCatalogs.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryRollup.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/category/createProductInCategoryStart.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductAttributes.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductCategories.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductFacilities.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductFacilityLocations.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductGlAccounts.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductGoodIdentifications.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditSupplierProduct.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/promo/EditProductPromo.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/promo/EditProductPromoRules.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/promo/EditProductPromoStores.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/promo/FindProductPromo.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/promo/FindProductPromoCode.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStore.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreCatalogs.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreEmails.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreKeywordOver.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreTaxSetup.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreWebSites.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/store/FindProductStore.bsh
trunk/applications/product/webapp/catalog/WEB-INF/pagedefs/category/
trunk/applications/product/webapp/catalog/WEB-INF/pagedefs/find/advancedsearch.xml
trunk/applications/product/webapp/catalog/WEB-INF/pagedefs/find/keywordsearch.xml
trunk/applications/product/webapp/catalog/WEB-INF/pagedefs/product/
trunk/applications/product/webapp/catalog/WEB-INF/pagedefs/promo/
trunk/applications/product/webapp/catalog/WEB-INF/pagedefs/store/
trunk/applications/product/webapp/catalog/WEB-INF/pagedefs/thesaurus/
trunk/applications/product/webapp/catalog/product/EditProductCategories.ftl
trunk/applications/product/webapp/catalog/product/EditSupplierProduct.ftl
trunk/applications/product/webapp/catalog/promo/EditProductPromo.ftl
trunk/applications/product/webapp/catalog/store/EditProductStore.ftl
trunk/applications/product/webapp/catalog/store/EditProductStoreCatalogs.ftl
trunk/applications/product/webapp/catalog/store/EditProductStoreEmails.ftl
trunk/applications/product/webapp/catalog/store/EditProductStoreKeywordOvrd.ftl
Modified:
trunk/applications/product/config/ProductUiLabels.properties
trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryContent.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryContentContent.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryProducts.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/category/createProductInCategoryCheckExisting.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/find/advancedsearchoptions.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/find/keywordsearchbox.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromCategory.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromGroup.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductAssoc.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContentContent.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductInventoryItems.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/product/QuickAddVariants.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/promo/EditProductPromoCode.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePromos.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreRoles.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreShipSetup.bsh
trunk/applications/product/webapp/catalog/WEB-INF/actions/thesaurus/EditKeywordThesaurus.bsh
trunk/applications/product/webapp/catalog/WEB-INF/controller.xml
trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml
trunk/applications/product/webapp/catalog/category/CategoryTabBar.ftl
trunk/applications/product/webapp/catalog/category/EditCategory.ftl
trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl
trunk/applications/product/webapp/catalog/category/EditCategoryContentContent.ftl
trunk/applications/product/webapp/catalog/category/EditCategoryFeatureCats.ftl
trunk/applications/product/webapp/catalog/category/EditCategoryParties.ftl
trunk/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl
trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl
trunk/applications/product/webapp/catalog/category/EditCategoryRollup.ftl
trunk/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl
trunk/applications/product/webapp/catalog/category/createProductInCategoryStart.ftl
trunk/applications/product/webapp/catalog/find/advancedsearch.ftl
trunk/applications/product/webapp/catalog/find/keywordsearch.ftl
trunk/applications/product/webapp/catalog/find/keywordsearchbox.ftl
trunk/applications/product/webapp/catalog/product/ApplyFeaturesFromCategory.ftl
trunk/applications/product/webapp/catalog/product/CreateVirtualWithVariantsForm.ftl
trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl
trunk/applications/product/webapp/catalog/product/EditProductAttributes.ftl
trunk/applications/product/webapp/catalog/product/EditProductContent.ftl
trunk/applications/product/webapp/catalog/product/EditProductContentContent.ftl
trunk/applications/product/webapp/catalog/product/EditProductFacilities.ftl
trunk/applications/product/webapp/catalog/product/EditProductFacilityLocations.ftl
trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl
trunk/applications/product/webapp/catalog/product/EditProductGlAccounts.ftl
trunk/applications/product/webapp/catalog/product/EditProductGoodIdentifications.ftl
trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl
trunk/applications/product/webapp/catalog/product/EditProductKeyword.ftl
trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl
trunk/applications/product/webapp/catalog/product/ProductForms.xml
trunk/applications/product/webapp/catalog/product/QuickAddVariants.ftl
trunk/applications/product/webapp/catalog/promo/EditProductPromoCode.ftl
trunk/applications/product/webapp/catalog/promo/EditProductPromoRules.ftl
trunk/applications/product/webapp/catalog/promo/EditProductPromoStores.ftl
trunk/applications/product/webapp/catalog/promo/FindProductPromo.ftl
trunk/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl
trunk/applications/product/webapp/catalog/store/EditProductStorePaySetup.ftl
trunk/applications/product/webapp/catalog/store/EditProductStorePromos.ftl
trunk/applications/product/webapp/catalog/store/EditProductStoreRoles.ftl
trunk/applications/product/webapp/catalog/store/EditProductStoreShipSetup.ftl
trunk/applications/product/webapp/catalog/store/EditProductStoreSurveys.ftl
trunk/applications/product/webapp/catalog/store/EditProductStoreTaxSetup.ftl
trunk/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl
trunk/applications/product/webapp/catalog/store/FindProductStore.ftl
trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml
trunk/applications/product/webapp/catalog/store/ProductStoreTabBar.ftl
trunk/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl
trunk/applications/product/widget/catalog/CommonScreens.xml
trunk/applications/product/widget/catalog/ProductScreens.xml
Log:
Fairly major screen migration and cleanup effort, moving away from JPublish and eliminating quite a few bsh and ftl files as well; thanks to Chris Howe for the initial changes, which are about 20% of this commit
Modified: trunk/applications/product/config/ProductUiLabels.properties
===================================================================
--- trunk/applications/product/config/ProductUiLabels.properties 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/config/ProductUiLabels.properties 2005-04-12 08:37:49 UTC (rev 4806)
@@ -380,6 +380,7 @@
ProductFacilityId=Facility ID
ProductFacilityLetter=F
ProductFacilityLocation=Facility Location
+ProductFacilityLocations=Facility Locations
ProductFacilityManagerApplication=Facility Manager Application
ProductFacilityNameId=Facility Name [ID]
ProductFacilityRoleMemberMaintenance=Facility Role Member Maintenance
@@ -391,6 +392,7 @@
ProductFeatures=Features
ProductFeatureApplicationType=Feature Application Type
ProductFeatureAppls=Feature Appls
+ProductFeatureCategoriesGroups=Feature Categories and Groups
ProductFeatureCategory=Feature Category
ProductFeatureCats=Features
ProductFeatures=Features
@@ -823,10 +825,12 @@
ProductStoresFor=Stores For
ProductStore=Store
ProductStoreId=Store ID
+ProductStoreKeywordOverrides=Store Keyword Overrides
ProductStores=Stores
ProductStoreName=Store Name
ProductStoreNameId=Store Name [ID]
ProductStoreShipmentMethodAssociations=Store Shipment Method Associations
+ProductStoreSurveySettings=Store Survey Settings
ProductStyleSheet=Style Sheet
ProductSubject=Subject
ProductSubmit=Submit
Modified: trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategory.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -29,51 +29,22 @@
import org.ofbiz.base.util.string.*;
import org.ofbiz.entity.*;
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
-
-
-boolean useValues = true;
-if(request.getAttribute("_ERROR_MESSAGE_") != null) useValues = false;
-
-productCategoryId = request.getParameter("productCategoryId");
-if (productCategoryId == null || productCategoryId.length() == 0) productCategoryId = (String) request.getAttribute("productCategoryId");
-productCategory = delegator.findByPrimaryKey("ProductCategory", UtilMisc.toMap("productCategoryId", productCategoryId));
productCategoryType = null;
-if (productCategory == null) {
- useValues = false;
-} else {
+if (productCategory != null) {
productCategoryType = productCategory.getRelatedOne("ProductCategoryType");
+ context.put("productCategoryType", productCategoryType);
}
-//ProductCategoryTypes
-productCategoryTypes = delegator.findAll("ProductCategoryType");
-
primaryParentCategory = null;
primParentCatIdParam = request.getParameter("primaryParentCategoryId");
-if(productCategory != null && useValues) {
+if(productCategory != null) {
primaryParentCategory = productCategory.getRelatedOne("PrimaryParentProductCategory");
-} else if(primParentCatIdParam != null && primParentCatIdParam.length() > 0) {
+} else if (primParentCatIdParam != null && primParentCatIdParam.length() > 0) {
primaryParentCategory = delegator.findByPrimaryKey("ProductCategory", UtilMisc.toMap("productCategoryId", primParentCatIdParam));
}
-
-categoryList = delegator.findAll("ProductCategory", UtilMisc.toList("description"));
-
-context.put("productCategoryId", productCategoryId);
-context.put("productCategory", productCategory);
-context.put("productCategoryType", productCategoryType);
-context.put("productCategoryTypes", productCategoryTypes);
context.put("primaryParentCategory", primaryParentCategory);
-context.put("categoryList", categoryList);
-
// make the image file formats
String imageFilenameFormat = UtilProperties.getPropertyValue("catalog", "image.filename.format");
String imageServerPath = UtilProperties.getPropertyValue("catalog", "image.server.path");
@@ -152,4 +123,3 @@
}
}
}
-
Modified: trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryContent.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryContent.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryContent.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
+ * Copyright (c) 2003-2005 The Open For Business Project - www.ofbiz.org
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -26,55 +26,27 @@
*@since 2.2
*/
-import java.util.*;
-import java.sql.*;
-import java.io.*;
-import org.ofbiz.entity.*;
import org.ofbiz.base.util.*;
import org.ofbiz.widget.html.*;
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
nowTimestamp = UtilDateTime.nowTimestamp();
context.put("nowTimestamp", nowTimestamp);
String nowTimestampString = nowTimestamp.toString();
context.put("nowTimestampString", nowTimestampString);
-URL catalogPropertiesURL = application.getResource("/WEB-INF/catalog.properties");
-if (catalogPropertiesURL != null) context.put("catalogPropertiesURL", catalogPropertiesURL.toString());
-
-String productCategoryId = request.getParameter("productCategoryId");
-context.put("productCategoryId", productCategoryId);
-
-GenericValue productCategory = delegator.findByPrimaryKey("ProductCategory", UtilMisc.toMap("productCategoryId", productCategoryId));
-context.put("productCategory", productCategory);
-
-if (productCategoryId == null || productCategoryId.length() == 0) productCategoryId = (String) request.getAttribute("productCategoryId");
-productCategory = delegator.findByPrimaryKey("ProductCategory", UtilMisc.toMap("productCategoryId", productCategoryId));
-productCategoryType = null;
-if (productCategory == null) {
- useValues = false;
-} else {
+if (productCategory != null) {
productCategoryType = productCategory.getRelatedOne("ProductCategoryType");
+ categoryContent = productCategory.getRelated("ProductCategoryContent", null, UtilMisc.toList("prodCatContentTypeId"));
+
+ context.put("productCategoryType", productCategoryType);
+ context.put("categoryContent", categoryContent);
}
//ProductCategoryTypes
productCategoryTypes = delegator.findAll("ProductCategoryType");
-context.put("productCategoryType", productCategoryType);
context.put("productCategoryTypes", productCategoryTypes);
// Start CategoryContent stuff
-
-categoryContent = null;
-if (productCategory != null) categoryContent = productCategory.getRelated("ProductCategoryContent", null, UtilMisc.toList("prodCatContentTypeId"));
-context.put("categoryContent", categoryContent);
-
List categoryContentDatas = new LinkedList();
Iterator categoryContentIter = categoryContent.iterator();
while (categoryContentIter.hasNext()) {
@@ -96,17 +68,10 @@
HtmlFormWrapper addCategoryContentWrapper = new HtmlFormWrapper("/product/ProductForms.xml", "AddCategoryContentAssoc", request, response);
context.put("addCategoryContentWrapper", addCategoryContentWrapper);
-
addCategoryContentWrapper.putInContext("productCategory", productCategory);
context.put("categoryContentList", categoryContentDatas);
// End ProductContent stuff
-boolean tryEntity = true;
-if (request.getAttribute("_ERROR_MESSAGE_") != null) tryEntity = false;
-if (product == null) tryEntity = false;
-if("true".equalsIgnoreCase((String) request.getParameter("tryEntity"))) tryEntity = true;
-context.put("tryEntity", tryEntity);
-
// UPLOADING STUFF
Modified: trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryContentContent.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryContentContent.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryContentContent.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
+ * Copyright (c) 2003-2005 The Open For Business Project - www.ofbiz.org
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -34,21 +34,6 @@
import org.ofbiz.widget.html.*;
import javax.servlet.HttpServletRequest;
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-dispatcher = request.getAttribute("dispatcher");
-userLogin = request.getAttribute("userLogin");
-
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
-
-productCategoryId = request.getParameter("productCategoryId");
-context.put("productCategoryId", productCategoryId);
-
contentId = request.getParameter("contentId");
if("".equals(contentId)) contentId = null;
@@ -74,13 +59,10 @@
}
context.put("categoryContent", categoryContent);
-
categoryContentData = new HashMap();
categoryContentData.putAll(categoryContent);
-
Map content = null;
-
context.put("contentId", contentId);
if(contentId != null) {
content = delegator.findByPrimaryKey("Content", UtilMisc.toMap("contentId", contentId));
@@ -90,9 +72,6 @@
if(description != null) content.put("description", description);
}
-productCategory = delegator.findByPrimaryKey("ProductCategory", UtilMisc.toMap("productCategoryId", productCategoryId));
-context.put("productCategory", productCategory);
-
HtmlFormWrapper updateCategoryContentWrapper = null;
//Email
Deleted: trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryFeatureCats.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryFeatureCats.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryFeatureCats.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author David E. Jones
- *@author Brad Steiner
- *@version $Rev$
- *@since 2.2
- */
-
-import java.util.*;
-import java.sql.*;
-import java.io.*;
-import org.ofbiz.entity.*;
-import org.ofbiz.base.util.*;
-import org.ofbiz.widget.html.*;
-
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
-
-nowTimestamp = UtilDateTime.nowTimestamp();
-nowTimestampString = nowTimestamp.toString();
-
-productCategoryId = request.getParameter("productCategoryId");
-productCategory = delegator.findByPrimaryKey("ProductCategory", UtilMisc.toMap("productCategoryId", productCategoryId));
-productFeatureCategoryAppls = null;
-productFeatureCatGrpAppls = null;
-if (productCategory != null) {
- productFeatureCategoryAppls = productCategory.getRelated("ProductFeatureCategoryAppl", null, UtilMisc.toList("productFeatureCategoryId"));
- productFeatureCatGrpAppls = productCategory.getRelated("ProductFeatureCatGrpAppl", null, UtilMisc.toList("productFeatureGroupId"));
-}
-productFeatureCategories = delegator.findAll("ProductFeatureCategory", UtilMisc.toList("description"));
-productFeatureGroups = delegator.findAll("ProductFeatureGroup", UtilMisc.toList("description"));
-
-context.put("nowTimestamp", nowTimestamp);
-context.put("nowTimestampString", nowTimestampString);
-context.put("productCategoryId", productCategoryId);
-context.put("productCategory", productCategory);
-context.put("productFeatureCategoryAppls", productFeatureCategoryAppls);
-context.put("productFeatureCatGrpAppls", productFeatureCatGrpAppls);
-context.put("productFeatureCategories", productFeatureCategories);
-context.put("productFeatureGroups", productFeatureGroups);
Deleted: trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryParties.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryParties.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryParties.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author David E. Jones
- *@author Brad Steiner
- *@version $Rev$
- *@since 2.2
- */
-
-import java.util.*;
-import java.io.*;
-import java.sql.Timestamp;
-import org.ofbiz.entity.*;
-import org.ofbiz.base.util.*;
-import org.ofbiz.widget.html.*;
-
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
-
-nowTimestamp = UtilDateTime.nowTimestamp();
-nowTimestampString = nowTimestamp.toString();
-
-productCategoryId = request.getParameter("productCategoryId");
-productCategory = delegator.findByPrimaryKey("ProductCategory", UtilMisc.toMap("productCategoryId", productCategoryId));
-
-productCategoryRoles = null;
-if (productCategory != null) {
- productCategoryRoles = productCategory.getRelated("ProductCategoryRole", null, UtilMisc.toList("roleTypeId", "partyId"));
-}
-roleTypes = delegator.findAll("RoleType", UtilMisc.toList("description"));
-
-context.put("nowTimestamp", nowTimestamp);
-context.put("nowTimestampString", nowTimestampString);
-context.put("productCategoryId", productCategoryId);
-context.put("productCategory", productCategory);
-context.put("productCategoryRoles", productCategoryRoles);
-context.put("roleTypes", roleTypes);
Deleted: trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryProdCatalogs.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryProdCatalogs.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryProdCatalogs.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author David E. Jones
- *@author Brad Steiner
- *@version $Rev$
- *@since 2.2
- */
-
-import java.util.*;
-import java.sql.*;
-import java.io.*;
-import org.ofbiz.entity.*;
-import org.ofbiz.base.util.*;
-import org.ofbiz.widget.html.*;
-
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
-nowTimestamp = UtilDateTime.nowTimestamp();
-nowTimestampString = nowTimestamp.toString();
-
-productCategoryId = request.getParameter("productCategoryId");
-productCategory = delegator.findByPrimaryKey("ProductCategory", UtilMisc.toMap("productCategoryId", productCategoryId));
-
-prodCatalogCategories = null;
-if (productCategory != null) {
- prodCatalogCategories = productCategory.getRelated("ProdCatalogCategory", null, UtilMisc.toList("prodCatalogCategoryTypeId", "sequenceNum", "prodCatalogId"));
-}
-prodCatalogs = delegator.findAll("ProdCatalog", UtilMisc.toList("catalogName"));
-prodCatalogCategoryTypes = delegator.findAll("ProdCatalogCategoryType", UtilMisc.toList("description"));
-
-context.put("nowTimestamp", nowTimestamp);
-context.put("nowTimestampString", nowTimestampString);
-context.put("productCategoryId", productCategoryId);
-context.put("productCategory", productCategory);
-context.put("prodCatalogCategories", prodCatalogCategories);
-context.put("prodCatalogs", prodCatalogs);
-context.put("prodCatalogCategoryTypes", prodCatalogCategoryTypes);
Modified: trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryProducts.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryProducts.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryProducts.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
+ * Copyright (c) 2003-2005 The Open For Business Project - www.ofbiz.org
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -25,32 +25,12 @@
*@since 2.2
*/
-import java.util.*;
-import java.sql.*;
-import java.io.*;
-import org.ofbiz.entity.*;
import org.ofbiz.entity.util.*;
import org.ofbiz.base.util.*;
-import org.ofbiz.widget.html.*;
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
-
-nowTimestamp = UtilDateTime.nowTimestamp();
-nowTimestampString = nowTimestamp.toString();
-
//default this to true, ie only show active
boolean activeOnly = !"false".equals(request.getParameter("activeOnly"));
-productCategoryId = request.getParameter("productCategoryId");
-productCategory = delegator.findByPrimaryKey("ProductCategory", UtilMisc.toMap("productCategoryId", productCategoryId));
-
productCategoryMembers = null;
if (productCategory != null) {
productCategoryMembers = productCategory.getRelated("ProductCategoryMember", null, UtilMisc.toList("sequenceNum", "productId"));
@@ -61,11 +41,7 @@
productCategories = delegator.findAll("ProductCategory", UtilMisc.toList("description"));
-context.put("nowTimestamp", nowTimestamp);
-context.put("nowTimestampString", nowTimestampString);
context.put("activeOnly", activeOnly);
-context.put("productCategoryId", productCategoryId);
-context.put("productCategory", productCategory);
context.put("productCategoryMembers", productCategoryMembers);
context.put("productCategories", productCategories);
@@ -76,13 +52,13 @@
int listSize = 0;
try {
- viewIndex = Integer.valueOf((String) context.getRequest().getParameter("VIEW_INDEX")).intValue();
+ viewIndex = Integer.valueOf((String) parameters.get("VIEW_INDEX")).intValue();
} catch (Exception e) {
viewIndex = 0;
}
try {
- viewSize = Integer.valueOf((String) context.getRequest().getParameter("VIEW_SIZE")).intValue();
+ viewSize = Integer.valueOf((String) parameters.get("VIEW_SIZE")).intValue();
} catch (Exception e) {
viewSize = 20;
}
Deleted: trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryRollup.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryRollup.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/category/EditCategoryRollup.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author David E. Jones
- *@author Brad Steiner
- *@version $Rev$
- *@since 2.2
- */
-
-import org.ofbiz.base.util.*;
-import org.ofbiz.entity.*;
-
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
-
-nowTimestamp = UtilDateTime.nowTimestamp();
-nowTimestampString = nowTimestamp.toString();
-
-productCategoryId = request.getParameter("showProductCategoryId");
-productCategory = delegator.findByPrimaryKey("ProductCategory", UtilMisc.toMap("productCategoryId", productCategoryId));
-
-parentProductCategoryRollups = null;
-currentProductCategoryRollups = null;
-if(productCategory != null) {
- parentProductCategoryRollups = productCategory.getRelated("ParentProductCategoryRollup");
- currentProductCategoryRollups = productCategory.getRelated("CurrentProductCategoryRollup");
-}
-
-productCategoryCol = delegator.findAll("ProductCategory", UtilMisc.toList("description"));
-
-context.put("nowTimestamp", nowTimestamp);
-context.put("nowTimestampString", nowTimestampString);
-context.put("productCategoryId", productCategoryId);
-context.put("productCategory", productCategory);
-context.put("parentProductCategoryRollups", parentProductCategoryRollups);
-context.put("currentProductCategoryRollups", currentProductCategoryRollups);
-context.put("productCategoryCol", productCategoryCol);
Modified: trunk/applications/product/webapp/catalog/WEB-INF/actions/category/createProductInCategoryCheckExisting.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/category/createProductInCategoryCheckExisting.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/category/createProductInCategoryCheckExisting.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -30,20 +30,8 @@
import org.ofbiz.product.product.ProductSearch;
import org.ofbiz.webapp.stats.VisitHandler;
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
-
visitId = VisitHandler.getVisitId(session);
-productCategoryId = request.getParameter("productCategoryId");
-productCategory = delegator.findByPrimaryKey("ProductCategory", UtilMisc.toMap("productCategoryId", productCategoryId));
-
featureIdByType = ParametricSearch.makeFeatureIdByTypeMap(request);
featureIdSet = new HashSet();
if (featureIdByType != null) {
@@ -73,7 +61,5 @@
productFeatureAndTypeDatas.add(productFeatureAndTypeData);
}
-context.put("productCategoryId", productCategoryId);
-context.put("productCategory", productCategory);
context.put("productFeatureAndTypeDatas", productFeatureAndTypeDatas);
context.put("products", products);
Deleted: trunk/applications/product/webapp/catalog/WEB-INF/actions/category/createProductInCategoryStart.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/category/createProductInCategoryStart.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/category/createProductInCategoryStart.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author David E. Jones
- *@version $Rev$
- *@since 2.1
- */
-
-import org.ofbiz.base.util.*;
-import org.ofbiz.entity.*;
-import org.ofbiz.product.feature.*;
-
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
-
-productCategoryId = request.getParameter("productCategoryId");
-productCategory = delegator.findByPrimaryKey("ProductCategory", UtilMisc.toMap("productCategoryId", productCategoryId));
-
-productFeaturesByTypeMap = ParametricSearch.makeCategoryFeatureLists(productCategoryId, delegator);
-
-context.put("productCategoryId", productCategoryId);
-context.put("productCategory", productCategory);
-context.put("productFeaturesByTypeMap", productFeaturesByTypeMap);
Modified: trunk/applications/product/webapp/catalog/WEB-INF/actions/find/advancedsearchoptions.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/find/advancedsearchoptions.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/find/advancedsearchoptions.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -29,8 +29,6 @@
import org.ofbiz.product.feature.*;
import org.ofbiz.product.product.*;
-delegator = request.getAttribute("delegator");
-
searchCategoryId = request.getParameter("SEARCH_CATEGORY_ID");
if (searchCategoryId == null || searchCategoryId.length() == 0) {
currentCatalogId = CatalogWorker.getCurrentCatalogId(request);
@@ -64,4 +62,3 @@
context.put("searchConstraintStrings", searchConstraintStrings);
context.put("searchSortOrderString", searchSortOrderString);
context.put("supplerPartyRoleAndPartyDetails", supplerPartyRoleAndPartyDetails);
-
Modified: trunk/applications/product/webapp/catalog/WEB-INF/actions/find/keywordsearchbox.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/find/keywordsearchbox.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/find/keywordsearchbox.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -26,10 +26,7 @@
import org.ofbiz.base.util.*;
import org.ofbiz.entity.*;
-import org.ofbiz.entity.condition.*;
-delegator = request.getAttribute("delegator");
-
state = request.getParameter("SearchProductsState");
isOpen = true;
if (state != null) {
@@ -42,10 +39,4 @@
}
}
-expr = new EntityExpr(new EntityExpr("showInSelect", EntityOperator.EQUALS, null),
- EntityOperator.OR,
- new EntityExpr("showInSelect", EntityOperator.NOT_EQUAL, "N"));
-productCategories = delegator.findByCondition("ProductCategory", expr, null, UtilMisc.toList("description"));
-
context.put("isOpen", isOpen);
-context.put("productCategories", productCategories);
Modified: trunk/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromCategory.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromCategory.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromCategory.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -35,20 +35,9 @@
import org.ofbiz.base.util.*;
import org.ofbiz.widget.html.*;
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
nowTimestampString = UtilDateTime.nowTimestamp().toString();
context.put("nowTimestampString", nowTimestampString);
-productId = request.getParameter("productId");
-context.put("productId", productId);
-
productFeatureCategoryId = request.getParameter("productFeatureCategoryId");
context.put("productFeatureCategoryId", productFeatureCategoryId);
@@ -76,13 +65,13 @@
int listSize = (int) productFeaturesSize;
try {
- viewIndex = Integer.valueOf((String) context.getRequest().getParameter("VIEW_INDEX")).intValue();
+ viewIndex = Integer.valueOf((String) parameters.get("VIEW_INDEX")).intValue();
} catch (Exception e) {
viewIndex = 0;
}
try {
- viewSize = Integer.valueOf((String) context.getRequest().getParameter("VIEW_SIZE")).intValue();
+ viewSize = Integer.valueOf((String) parameters.get("VIEW_SIZE")).intValue();
} catch (Exception e) {
viewSize = 10;
}
Modified: trunk/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromGroup.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromGroup.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/product/ApplyFeaturesFromGroup.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -32,9 +32,7 @@
import org.ofbiz.base.util.UtilMisc;
import org.ofbiz.entity.GenericDelegator;
-delegator = request.getAttribute("delegator");
-
-productFeatureGroupId = request.getParameter("productFeatureGroupId");
+productFeatureGroupId = parameters.get("productFeatureGroupId");
if ((productFeatureGroupId != null) && !(productFeatureGroupId.equals(""))) {
productFeatureGroup = delegator.findByPrimaryKey("ProductFeatureGroup", UtilMisc.toMap("productFeatureGroupId", productFeatureGroupId));
productFeatures = new LinkedList();
@@ -47,4 +45,4 @@
// this will not break out the product features by view size
context.put("listSize", productFeatures.size());
context.put("highIndex", productFeatures.size());
-}
\ No newline at end of file
+}
Modified: trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductAssoc.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductAssoc.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductAssoc.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -32,14 +32,6 @@
import org.ofbiz.base.util.*;
import org.ofbiz.widget.html.*;
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
nowDate = UtilDateTime.nowDate();
context.put("nowDate", nowDate);
Deleted: trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductAttributes.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductAttributes.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductAttributes.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author David E. Jones
- *@author Brad Steiner
- *@version $Rev$
- *@since 2.2
- */
-
-import java.util.*;
-import java.io.*;
-import java.lang.Integer;
-import org.ofbiz.entity.*;
-import org.ofbiz.base.util.*;
-import org.ofbiz.widget.html.*;
-
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
-boolean useValues = true;
-if (request.getAttribute("_ERROR_MESSAGE_") != null) useValues = false;
-
-productId = request.getParameter("productId");
-if (productId == null) productId = request.getParameter("PRODUCT_ID");
-if (productId != null) context.put("productId", productId);
-
-GenericValue product = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId));
-context.put("product", product);
-
-if (product == null) useValues = false;
-
-if (product != null) {
- productAttributes = product.getRelated("ProductAttribute", null, UtilMisc.toList("attrType", "attrName"));
- context.put("productAttributes", productAttributes);
-}
-
-if ("true".equalsIgnoreCase((String)request.getParameter("useValues"))) useValues = true;
-context.put("useValues", useValues);
-
Deleted: trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductCategories.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductCategories.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductCategories.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author David E. Jones
- *@author Brad Steiner
- *@version $Rev$
- *@since 2.2
- */
-
-import java.util.*;
-import java.io.*;
-import org.ofbiz.entity.*;
-import org.ofbiz.entity.util.*;
-import org.ofbiz.base.util.*;
-import org.ofbiz.widget.html.*;
-
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
-productId = request.getParameter("productId");
-context.put("productId", productId);
-
-product = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId));
-context.put("product", product);
-
-if (product != null) {
- productCategoryMembers = product.getRelated("ProductCategoryMember", null, UtilMisc.toList("sequenceNum", "productCategoryId"));
- if (productCategoryMembers != null) context.put("productCategoryMembers", productCategoryMembers);
-
- List productCategoryMemberDatas = new LinkedList();
- Iterator productCategoryMemberIter = productCategoryMembers.iterator();
- while (productCategoryMemberIter.hasNext()) {
- GenericValue productCategoryMember = (GenericValue) productCategoryMemberIter.next();
- GenericValue productCategory = productCategoryMember.getRelatedOne("ProductCategory");
- productCategoryMemberDatas.add(UtilMisc.toMap("productCategoryMember", productCategoryMember, "productCategory", productCategory));
- }
-
- HtmlFormWrapper updateProductCategoryMemberWrapper = new HtmlFormWrapper("/product/ProductForms.xml", "UpdateProductCategoryMemeber", request, response);
- context.put("updateProductCategoryMemberWrapper", updateProductCategoryMemberWrapper);
- updateProductCategoryMemberWrapper.putInContext("productCategoryMemberDatas", productCategoryMemberDatas);
- updateProductCategoryMemberWrapper.putInContext("uiLabelMap", request.getAttribute("uiLabelMap"));
-
- HtmlFormWrapper addProductCategoryMemberWrapper = new HtmlFormWrapper("/product/ProductForms.xml", "AddProductCategoryMember", request, response);
- context.put("addProductCategoryMemberWrapper", addProductCategoryMemberWrapper);
- addProductCategoryMemberWrapper.putInContext("product", product);
- addProductCategoryMemberWrapper.putInContext("uiLabelMap", request.getAttribute("uiLabelMap"));
-}
Modified: trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContent.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -33,26 +33,12 @@
import org.ofbiz.base.util.string.*;
import org.ofbiz.widget.html.*;
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
nowTimestamp = UtilDateTime.nowTimestamp();
context.put("nowTimestamp", nowTimestamp);
String nowTimestampString = nowTimestamp.toString();
context.put("nowTimestampString", nowTimestampString);
-String productId = request.getParameter("productId");
-context.put("productId", productId);
-
-GenericValue product = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId));
-context.put("product", product);
-
// make the image file formats
String imageFilenameFormat = UtilProperties.getPropertyValue("catalog", "image.filename.format");
String imageServerPath = UtilProperties.getPropertyValue("catalog", "image.server.path");
@@ -84,17 +70,14 @@
HtmlFormWrapper updateProductContentWrapper = new HtmlFormWrapper("/product/ProductForms.xml", "UpdateProductContentAssoc", request, response);
context.put("updateProductContentWrapper", updateProductContentWrapper);
updateProductContentWrapper.putInContext("productContentDatas", productContentDatas);
- updateProductContentWrapper.putInContext("uiLabelMap", request.getAttribute("uiLabelMap"));
HtmlFormWrapper prepareAddProductContentWrapper = new HtmlFormWrapper("/product/ProductForms.xml", "PrepareAddProductContentAssoc", request, response);
context.put("prepareAddProductContentWrapper", prepareAddProductContentWrapper);
prepareAddProductContentWrapper.putInContext("product", product);
- prepareAddProductContentWrapper.putInContext("uiLabelMap", request.getAttribute("uiLabelMap"));
HtmlFormWrapper addProductContentWrapper = new HtmlFormWrapper("/product/ProductForms.xml", "AddProductContentAssoc", request, response);
context.put("addProductContentWrapper", addProductContentWrapper);
addProductContentWrapper.putInContext("product", product);
- addProductContentWrapper.putInContext("uiLabelMap", request.getAttribute("uiLabelMap"));
context.put("productContentList", productContentDatas);
}
Modified: trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContentContent.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContentContent.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductContentContent.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
+ * Copyright (c) 2003-2005 The Open For Business Project - www.ofbiz.org
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -33,21 +33,6 @@
import org.ofbiz.widget.html.*;
import javax.servlet.HttpServletRequest;
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-dispatcher = request.getAttribute("dispatcher");
-userLogin = request.getAttribute("userLogin");
-
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
-
-productId = request.getParameter("productId");
-context.put("productId", productId);
-
contentId = request.getParameter("contentId");
if("".equals(contentId)) contentId = null;
@@ -75,13 +60,10 @@
}
context.put("productContent", productContent);
-
productContentData = new HashMap();
productContentData.putAll(productContent);
-
Map content = null;
-
context.put("contentId", contentId);
if(contentId != null) {
content = delegator.findByPrimaryKey("Content", UtilMisc.toMap("contentId", contentId));
@@ -91,9 +73,6 @@
if(description != null) content.put("description", description);
}
-product = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId));
-context.put("product", product);
-
HtmlFormWrapper updateProductContentWrapper = null;
//Email
@@ -162,5 +141,4 @@
context.put("productContentData", productContentData);
updateProductContentWrapper.putInContext("content", content);
updateProductContentWrapper.putInContext("contentId", contentId);
-updateProductContentWrapper.putInContext("uiLabelMap", request.getAttribute("uiLabelMap"));
//context.put("log", log);
Deleted: trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductFacilities.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductFacilities.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductFacilities.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author David E. Jones
- *@author Brad Steiner
- *@version $Rev$
- *@since 2.2
- */
-
-import java.util.*;
-import java.io.*;
-import org.ofbiz.entity.*;
-import org.ofbiz.base.util.*;
-import org.ofbiz.widget.html.*;
-
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
-productId = request.getParameter("productId");
-context.put("productId", productId);
-
-product = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId));
-context.put("product", product);
-
-if (product != null) {
- productFacilities = product.getRelated("ProductFacility", null, UtilMisc.toList("facilityId"));
- context.put("productFacilities", productFacilities);
-}
-
-facilities = delegator.findAllCache("Facility", UtilMisc.toList("facilityName"));
-context.put("facilities", facilities);
Deleted: trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductFacilityLocations.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductFacilityLocations.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductFacilityLocations.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author David E. Jones
- *@author Brad Steiner
- *@version $Rev$
- *@since 2.2
- */
-
-import java.util.*;
-import java.io.*;
-import org.ofbiz.entity.*;
-import org.ofbiz.base.util.*;
-import org.ofbiz.widget.html.*;
-
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
-productId = request.getParameter("productId");
-context.put("productId", productId);
-
-product = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId));
-context.put("product", product);
-
-if (product != null) {
- productFacilityLocations = product.getRelated("ProductFacilityLocation", null, UtilMisc.toList("facilityId", "locationSeqId"));
- context.put("productFacilityLocations", productFacilityLocations);
-}
-
-facilities = delegator.findAllCache("Facility", UtilMisc.toList("facilityName"));
-context.put("facilities", facilities);
Deleted: trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductGlAccounts.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductGlAccounts.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductGlAccounts.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author David E. Jones
- *@author Brad Steiner
- *@version $Rev$
- *@since 2.2
- */
-
-import java.util.*;
-import java.io.*;
-import org.ofbiz.entity.*;
-import org.ofbiz.base.util.*;
-import org.ofbiz.widget.html.*;
-
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
-
-boolean useValues = true;
-if (request.getAttribute("_ERROR_MESSAGE_") != null) useValues = false;
-
-String productId = request.getParameter("productId");
-if (productId != null) context.put("productId", productId);
-
-GenericValue product = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId));
-if (product != null) context.put("product", product);
-
-if (product == null) useValues = false;
-
-if (product != null) {
- productGlAccounts = product.getRelated("ProductGlAccount", null, UtilMisc.toList("productGlAccountTypeId"));
- context.put("productGlAccounts", productGlAccounts);
-}
-
-productGlAccountTypes = delegator.findAllCache("ProductGlAccountType", UtilMisc.toList("description"));
-context.put("productGlAccountTypes", productGlAccountTypes);
-
-glAccounts = delegator.findAllCache("GlAccount", UtilMisc.toList("accountCode"));
-context.put("glAccounts", glAccounts);
-
-if ("true".equalsIgnoreCase((String)request.getParameter("useValues"))) useValues = true;
-context.put("useValues", useValues);
Deleted: trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductGoodIdentifications.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductGoodIdentifications.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductGoodIdentifications.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author David E. Jones
- *@author Brad Steiner
- *@version $Rev$
- *@since 2.2
- */
-
-import java.util.*;
-import java.io.*;
-import org.ofbiz.entity.*;
-import org.ofbiz.base.util.*;
-import org.ofbiz.widget.html.*;
-
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
-boolean useValues = true;
-if (request.getAttribute("_ERROR_MESSAGE_") != null) useValues = false;
-
-String productId = request.getParameter("productId");
-context.put("productId", productId);
-
-GenericValue product = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId));
-context.put("product", product);
-
-if (product == null) useValues = false;
-
-if (product != null) {
- Collection goodIdentifications = product.getRelated("GoodIdentification", null, UtilMisc.toList("goodIdentificationTypeId", "idValue"));
- if (goodIdentifications != null) context.put("goodIdentifications", goodIdentifications);
-}
-
-Collection goodIdentificationTypes = delegator.findAllCache("GoodIdentificationType", UtilMisc.toList("description"));
-if (goodIdentificationTypes != null) context.put("goodIdentificationTypes", goodIdentificationTypes);
-
-if ("true".equalsIgnoreCase((String)request.getParameter("useValues"))) useValues = true;
-context.put("useValues", useValues);
Modified: trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductInventoryItems.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductInventoryItems.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductInventoryItems.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
+ * Copyright (c) 2003-2005 The Open For Business Project - www.ofbiz.org
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -33,17 +33,6 @@
import org.ofbiz.widget.html.*;
import org.ofbiz.securityext.login.*;
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
-
-productId = request.getParameter("productId");
-
quantitySummaryByFacility = new HashMap();
// The warehouse list is selected
facilityList = delegator.findByAnd("Facility", UtilMisc.toMap("facilityTypeId", "WAREHOUSE"));
@@ -65,8 +54,6 @@
quantitySummaryByFacility.put(facility.getString("facilityId"), quantitySummary);
}
-product = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId));
-
productInventoryItems = delegator.findByAnd("InventoryItem",
UtilMisc.toMap("productId", productId),
UtilMisc.toList("facilityId", "-datetimeReceived", "-inventoryItemId"));
@@ -226,8 +213,6 @@
showEmpty = "true".equals(request.getParameter("showEmpty"));
-context.put("productId", productId);
-context.put("product", product);
context.put("productInventoryItems", productInventoryItems);
context.put("quantitySummaryByFacility", quantitySummaryByFacility);
context.put("showEmpty", showEmpty);
Modified: trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditProductQuickAdmin.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -36,23 +36,12 @@
import org.ofbiz.product.product.*;
import org.ofbiz.entity.condition.*;
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
nowDate = UtilDateTime.nowDate();
context.put("nowDate", nowDate);
String nowTimestampString = UtilDateTime.nowTimestamp().toString();
context.put("nowTimestampString", nowTimestampString);
-boolean useValues = true;
-if (request.getAttribute("_ERROR_MESSAGE_") != null) useValues = false;
-
Collection assocTypes = delegator.findAll("ProductAssocType");
context.put("assocTypes", assocTypes);
@@ -328,13 +317,6 @@
context.put("featureThruDate", featureThruDate);
context.put("selFeatureDesc", selFeatureDesc);
-if("true".equalsIgnoreCase((String)request.getParameter("useValues"))) useValues = true;
-if(productAssoc == null) useValues = false;
-
-context.put("useValues", useValues);
-boolean isCreate = true;
-context.put("isCreate", isCreate);
-
// get "all" category id
String allCategoryId = UtilProperties.getPropertyValue("catalog", "all.product.category");
context.put("allCategoryId", allCategoryId);
Deleted: trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditSupplierProduct.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditSupplierProduct.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/product/EditSupplierProduct.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author Andy Zeneski (jaz at ofbiz.org)
- *@version $Rev$
- *@since 3.1
- */
-
-import java.util.*;
-import java.io.*;
-import org.ofbiz.entity.*;
-import org.ofbiz.entity.util.*;
-import org.ofbiz.base.util.*;
-import org.ofbiz.widget.html.*;
-
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
-productId = request.getParameter("productId");
-context.put("productId", productId);
-
-product = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId));
-context.put("product", product);
-
-suppliers = delegator.findByAnd("SupplierProduct", UtilMisc.toMap("productId", productId));
-context.put("productSuppliers", suppliers);
-
-partyId = request.getParameter("partyId");
-currencyUomId = request.getParameter("currencyUomId");
-minimumOrderQuantityStr = request.getParameter("minimumOrderQuantity");
-supplierProduct = null;
-if (partyId != null && currencyUomId != null && minimumOrderQuantityStr != null) {
- minimumOrderQuantity = 0;
- try {
- minimumOrderQuantity = Double.parseDouble(minimumOrderQuantityStr);
- } catch(Exception exc) {}
- supplierProduct = delegator.findByPrimaryKey("SupplierProduct", UtilMisc.toMap("productId", productId, "partyId", partyId, "currencyUomId", currencyUomId, "minimumOrderQuantity", new Double(minimumOrderQuantity)));
-}
-context.put("supplierProduct", supplierProduct);
-
-HtmlFormWrapper updateSupplierForm = new HtmlFormWrapper("/product/ProductForms.xml", "UpdateSupplierProduct", request, response);
-context.put("updateSupplierProductForm", updateSupplierForm);
-updateSupplierForm.putInContext("productSuppliers", suppliers);
-updateSupplierForm.putInContext("uiLabelMap", request.getAttribute("uiLabelMap"));
-
-HtmlFormWrapper addSupplierForm = new HtmlFormWrapper("/product/ProductForms.xml", "AddSupplierProduct", request, response);
-context.put("addSupplierProductForm", addSupplierForm);
-addSupplierForm.putInContext("productId", productId);
-addSupplierForm.putInContext("supplierProduct", supplierProduct);
-addSupplierForm.putInContext("defaultCurrencyUomId", "USD");
-addSupplierForm.putInContext("uiLabelMap", request.getAttribute("uiLabelMap"));
-
Modified: trunk/applications/product/webapp/catalog/WEB-INF/actions/product/QuickAddVariants.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/product/QuickAddVariants.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/product/QuickAddVariants.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -26,37 +26,15 @@
*@since 2.2
*/
-import java.util.*;
-import java.io.*;
-import java.sql.Timestamp;
-import java.lang.Integer;
-import org.ofbiz.entity.*;
import org.ofbiz.entity.util.*;
import org.ofbiz.base.util.*;
-import org.ofbiz.widget.html.*;
import org.ofbiz.service.GenericDispatcher;
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-dispatcher = request.getAttribute("dispatcher");
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
-
-productId = request.getParameter("productId");
-product = delegator.findByPrimaryKey("Product", UtilMisc.toMap("productId", productId));
-
result = dispatcher.runSync("getProductFeaturesByType", UtilMisc.toMap("productId", productId, "productFeatureApplTypeId", "SELECTABLE_FEATURE"));
featureTypes = result.get("productFeatureTypes");
result = dispatcher.runSync("getVariantCombinations", UtilMisc.toMap("productId", productId));
featureCombinationInfos = result.get("featureCombinations");
-context.put("productId", productId);
-context.put("product", product);
context.put("featureTypes", featureTypes);
context.put("featureCombinationInfos", featureCombinationInfos);
-
Deleted: trunk/applications/product/webapp/catalog/WEB-INF/actions/promo/EditProductPromo.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/promo/EditProductPromo.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/promo/EditProductPromo.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author David E. Jones
- *@author Brad Steiner
- *@version $Rev$
- *@since 2.2
- */
-
-import java.util.*;
-import java.io.*;
-import org.ofbiz.entity.*;
-import org.ofbiz.base.util.*;
-import org.ofbiz.widget.html.*;
-
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
-productPromoId = request.getParameter("productPromoId");
-if (UtilValidate.isEmpty(productPromoId)) {
- productPromoId = request.getAttribute("productPromoId");
-}
-productPromo = delegator.findByPrimaryKey("ProductPromo", UtilMisc.toMap("productPromoId", productPromoId));
-
-HtmlFormWrapper productPromoFormWrapper = new HtmlFormWrapper("/promo/PromoForms.xml", "EditProductPromo", request, response);
-productPromoFormWrapper.putInContext("productPromoId", productPromoId);
-productPromoFormWrapper.putInContext("productPromo", productPromo);
-
-context.put("productPromoId", productPromoId);
-context.put("productPromo", productPromo);
-context.put("productPromoFormWrapper", productPromoFormWrapper);
Modified: trunk/applications/product/webapp/catalog/WEB-INF/actions/promo/EditProductPromoCode.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/promo/EditProductPromoCode.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/promo/EditProductPromoCode.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -31,15 +31,6 @@
import org.ofbiz.base.util.*;
import org.ofbiz.widget.html.*;
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
-
productPromoCodeId = request.getParameter("productPromoCodeId");
if (UtilValidate.isEmpty(productPromoCodeId)) {
productPromoCodeId = request.getAttribute("productPromoCodeId");
@@ -58,11 +49,6 @@
productPromo = delegator.findByPrimaryKey("ProductPromo", UtilMisc.toMap("productPromoId", productPromoId));
}
-HtmlFormWrapper productPromoCodeFormWrapper = new HtmlFormWrapper("/promo/PromoForms.xml", "EditProductPromoCode", request, response);
-productPromoCodeFormWrapper.putInContext("productPromoCodeId", productPromoCodeId);
-productPromoCodeFormWrapper.putInContext("productPromoCode", productPromoCode);
-if (productPromoCode == null) productPromoCodeFormWrapper.putInContext("productPromoId", productPromoId);
-
productPromoCodeEmails = null;
productPromoCodeParties = null;
if (productPromoCode != null) {
@@ -74,6 +60,5 @@
context.put("productPromo", productPromo);
context.put("productPromoCodeId", productPromoCodeId);
context.put("productPromoCode", productPromoCode);
-context.put("productPromoCodeFormWrapper", productPromoCodeFormWrapper);
context.put("productPromoCodeEmails", productPromoCodeEmails);
context.put("productPromoCodeParties", productPromoCodeParties);
Deleted: trunk/applications/product/webapp/catalog/WEB-INF/actions/promo/EditProductPromoRules.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/promo/EditProductPromoRules.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/promo/EditProductPromoRules.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author David E. Jones
- *@author Brad Steiner
- *@version $Rev$
- *@since 2.2
- */
-
-import java.util.*;
-import java.io.*;
-import java.lang.Integer;
-import org.ofbiz.entity.*;
-import org.ofbiz.base.util.*;
-import org.ofbiz.widget.html.*;
-
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
-
-String productPromoId = request.getParameter("productPromoId");
-
-GenericValue productPromo = delegator.findByPrimaryKey("ProductPromo", UtilMisc.toMap("productPromoId", productPromoId));
-List productPromoRules = null;
-if (productPromo != null) {
- productPromoRules = productPromo.getRelated("ProductPromoRule", null, UtilMisc.toList("ruleName"));
-}
-
-List promoProductPromoCategories = delegator.findByAnd("ProductPromoCategory", UtilMisc.toMap("productPromoId", productPromoId, "productPromoRuleId", "_NA_", "productPromoActionSeqId", "_NA_", "productPromoCondSeqId", "_NA_"));
-List promoProductPromoProducts = delegator.findByAnd("ProductPromoProduct", UtilMisc.toMap("productPromoId", productPromoId, "productPromoRuleId", "_NA_", "productPromoActionSeqId", "_NA_", "productPromoCondSeqId", "_NA_"));
-
-List inputParamEnums = delegator.findByAndCache("Enumeration", UtilMisc.toMap("enumTypeId", "PROD_PROMO_IN_PARAM"), UtilMisc.toList("sequenceId"));
-List condOperEnums = delegator.findByAndCache("Enumeration", UtilMisc.toMap("enumTypeId", "PROD_PROMO_COND"), UtilMisc.toList("sequenceId"));
-List productPromoActionEnums = delegator.findByAndCache("Enumeration", UtilMisc.toMap("enumTypeId", "PROD_PROMO_ACTION"), UtilMisc.toList("sequenceId"));
-List orderAdjustmentTypes = delegator.findAllCache("OrderAdjustmentType", UtilMisc.toList("description"));
-List productPromoApplEnums = delegator.findByAndCache("Enumeration", UtilMisc.toMap("enumTypeId", "PROD_PROMO_PCAPPL"), UtilMisc.toList("sequenceId"));
-List productCategories = delegator.findAllCache("ProductCategory", UtilMisc.toList("description"));
-
-context.put("productPromoId", productPromoId);
-context.put("productPromo", productPromo);
-context.put("productPromoRules", productPromoRules);
-context.put("promoProductPromoCategories", promoProductPromoCategories);
-context.put("promoProductPromoProducts", promoProductPromoProducts);
-context.put("inputParamEnums", inputParamEnums);
-context.put("condOperEnums", condOperEnums);
-context.put("productPromoActionEnums", productPromoActionEnums);
-context.put("orderAdjustmentTypes", orderAdjustmentTypes);
-context.put("productPromoApplEnums", productPromoApplEnums);
-context.put("productCategories", productCategories);
Deleted: trunk/applications/product/webapp/catalog/WEB-INF/actions/promo/EditProductPromoStores.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/promo/EditProductPromoStores.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/promo/EditProductPromoStores.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author David E. Jones
- *@author Brad Steiner
- *@version $Rev$
- *@since 2.2
- */
-
-import java.util.*;
-import java.io.*;
-import java.sql.Timestamp;
-import java.lang.Integer;
-import org.ofbiz.entity.*;
-import org.ofbiz.base.util.*;
-import org.ofbiz.widget.html.*;
-
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
-
-Timestamp nowTimestamp = UtilDateTime.nowTimestamp();
-context.put("nowTimestamp", nowTimestamp);
-
-String productPromoId = request.getParameter("productPromoId");
-if (productPromoId != null) context.put("productPromoId", productPromoId);
-
-GenericValue productPromo = delegator.findByPrimaryKey("ProductPromo", UtilMisc.toMap("productPromoId", productPromoId));
-Collection productStorePromoAppls = null;
-boolean tryEntity = true;
-
-if (productPromo == null) {
- tryEntity = false;
-} else {
- context.put("productPromo", productPromo);
- productStorePromoAppls = productPromo.getRelated("ProductStorePromoAppl", null, UtilMisc.toList("sequenceNum", "productPromoId"));
- if (productStorePromoAppls != null) context.put("productStorePromoAppls", productStorePromoAppls);
-}
-
-Collection productStores = delegator.findAll("ProductStore", UtilMisc.toList("storeName"));
-if (productStores != null) context.put("productStores", productStores);
-
-if ("true".equalsIgnoreCase((String)request.getParameter("tryEntity"))) tryEntity = true;
-
-context.put("tryEntity", tryEntity);
-
Deleted: trunk/applications/product/webapp/catalog/WEB-INF/actions/promo/FindProductPromo.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/promo/FindProductPromo.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/promo/FindProductPromo.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author David E. Jones
- *@author Brad Steiner
- *@version $Rev$
- *@since 2.2
- */
-
-import java.util.*;
-import java.io.*;
-import org.ofbiz.entity.*;
-import org.ofbiz.base.util.*;
-
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
-
-manualOnly = request.getParameter("manualOnly");
-if (UtilValidate.isEmpty(manualOnly)) {
- manualOnly = "Y";
-}
-
-filterMap = null;
-if ("Y".equals(manualOnly)) {
- filterMap = UtilMisc.toMap("userEntered", "Y");
-}
-
-productPromos = delegator.findByAnd("ProductPromo", filterMap, UtilMisc.toList("-createdDate"));
-
-context.put("manualOnly", manualOnly);
-context.put("productPromos", productPromos);
-
Deleted: trunk/applications/product/webapp/catalog/WEB-INF/actions/promo/FindProductPromoCode.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/promo/FindProductPromoCode.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/promo/FindProductPromoCode.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -1,61 +0,0 @@
-/*
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author David E. Jones
- *@author Brad Steiner
- *@version $Rev$
- *@since 2.2
- */
-
-import java.util.*;
-import java.io.*;
-import org.ofbiz.entity.*;
-import org.ofbiz.base.util.*;
-
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
-
-productPromoId = request.getParameter("productPromoId");
-productPromo = delegator.findByPrimaryKey("ProductPromo", UtilMisc.toMap("productPromoId", productPromoId));
-
-manualOnly = request.getParameter("manualOnly");
-if (UtilValidate.isEmpty(manualOnly)) {
- manualOnly = "Y";
-}
-
-filterMap = UtilMisc.toMap("productPromoId", productPromoId);
-if ("Y".equals(manualOnly)) {
- filterMap.put("userEntered", "Y");
-}
-
-productPromoCodes = delegator.findByAnd("ProductPromoCode", filterMap, UtilMisc.toList("-createdDate"));
-
-context.put("productPromoId", productPromoId);
-context.put("productPromo", productPromo);
-context.put("manualOnly", manualOnly);
-context.put("productPromoCodes", productPromoCodes);
-
Deleted: trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStore.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStore.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStore.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author Andy Zeneski (jaz at ofbiz.org)
- *@version $Rev$
- *@since 2.2
- */
-
-import org.ofbiz.base.util.*;
-import org.ofbiz.entity.*;
-import org.ofbiz.widget.html.*;
-
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
-
-productStoreId = request.getParameter("productStoreId");
-if (productStoreId == null) {
- productStoreId = request.getAttribute("productStoreId");
-}
-
-productStore = delegator.findByPrimaryKey("ProductStore", UtilMisc.toMap("productStoreId", productStoreId));
-HtmlFormWrapper editStoreForm = new HtmlFormWrapper("/store/ProductStoreForms.xml", "EditProductStore", request, response);
-editStoreForm.putInContext("productStore", productStore);
-editStoreForm.putInContext("productStoreId", productStoreId);
-
-context.put("productStoreId", productStoreId);
-context.put("productStore", productStore);
-context.put("editProductStoreForm", editStoreForm);
Deleted: trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreCatalogs.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreCatalogs.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreCatalogs.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author David E. Jones
- *@version $Rev$
- *@since 2.2
- */
-
-import org.ofbiz.base.util.*;
-import org.ofbiz.entity.*;
-import org.ofbiz.widget.html.*;
-
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CONTENTMGR", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
-
-String productStoreId = request.getParameter("productStoreId");
-GenericValue productStore = delegator.findByPrimaryKey("ProductStore", UtilMisc.toMap("productStoreId", productStoreId));
-List productStoreCatalogs = null;
-List productStoreCatalogDatas = new LinkedList();
-if (productStore != null) {
- productStoreCatalogs = productStore.getRelated("ProductStoreCatalog", null, UtilMisc.toList("sequenceNum", "productStoreId"));
- Iterator productStoreCatalogIter = productStoreCatalogs.iterator();
- while (productStoreCatalogIter.hasNext()) {
- GenericValue productStoreCatalog = (GenericValue) productStoreCatalogIter.next();
- Map productStoreCatalogData = new HashMap();
- productStoreCatalogData.put("productStoreCatalog", productStoreCatalog);
- productStoreCatalogData.put("prodCatalog", productStoreCatalog.getRelatedOne("ProdCatalog"));
- productStoreCatalogDatas.add(productStoreCatalogData);
- }
-}
-
-HtmlFormWrapper updateProductStoreCatalogWrapper = new HtmlFormWrapper("/store/ProductStoreForms.xml", "UpdateProductStoreCatalog", request, response);
-updateProductStoreCatalogWrapper.putInContext("productStoreCatalogDatas", productStoreCatalogDatas);
-
-HtmlFormWrapper createProductStoreCatalogWrapper = new HtmlFormWrapper("/store/ProductStoreForms.xml", "CreateProductStoreCatalog", request, response);
-createProductStoreCatalogWrapper.putInContext("productStore", productStore);
-
-context.put("productStoreId", productStoreId);
-context.put("productStore", productStore);
-context.put("updateProductStoreCatalogWrapper", updateProductStoreCatalogWrapper);
-context.put("createProductStoreCatalogWrapper", createProductStoreCatalogWrapper);
Deleted: trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreEmails.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreEmails.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreEmails.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author Andy Zeneski (jaz at ofbiz.org);
- *@version $Rev$
- *@since 2.2
- */
-
-import org.ofbiz.base.util.*;
-import org.ofbiz.entity.*;
-import org.ofbiz.widget.html.*;
-
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
-
-String productStoreId = request.getParameter("productStoreId");
-GenericValue productStore = delegator.findByPrimaryKey("ProductStore", UtilMisc.toMap("productStoreId", productStoreId));
-List productStoreEmailSettings = null;
-if (productStore != null) {
- productStoreEmailSettings = delegator.findByAnd("ProductStoreEmailSetting", UtilMisc.toMap("productStoreId", productStoreId));
-}
-
-HtmlFormWrapper updateProductStoreEmailForm = new HtmlFormWrapper("/store/ProductStoreForms.xml", "updateProductStoreEmail", request, response);
-updateProductStoreEmailForm.putInContext("productStoreEmailSettings", productStoreEmailSettings);
-
-HtmlFormWrapper createProductStoreEmailForm = new HtmlFormWrapper("/store/ProductStoreForms.xml", "createProductStoreEmail", request, response);
-createProductStoreEmailForm.putInContext("productStore", productStore);
-
-context.put("productStoreId", productStoreId);
-context.put("productStore", productStore);
-context.put("updateProductStoreEmailForm", updateProductStoreEmailForm);
-context.put("createProductStoreEmailForm", createProductStoreEmailForm);
Deleted: trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreKeywordOver.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreKeywordOver.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreKeywordOver.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
- * OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
- * THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- *@author Nathan De Graw
- *@version $Rev$
- *@since 3.0
- */
-
-import org.ofbiz.base.util.*;
-import org.ofbiz.entity.*;
-import org.ofbiz.widget.html.*;
-
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
-
-String productStoreId = request.getParameter("productStoreId");
-GenericValue productStore = delegator.findByPrimaryKey("ProductStore", UtilMisc.toMap("productStoreId", productStoreId));
-List productStorekeywordOvrdList = null;
-if (productStore != null) {
- productStorekeywordOvrdList = delegator.findByAnd("ProductStoreKeywordOvrd", UtilMisc.toMap("productStoreId", productStoreId));
-}
-
-HtmlFormWrapper updateproductStorekeywordOvrdForm = new HtmlFormWrapper("/store/ProductStoreForms.xml", "UpdateproductStorekeywordOvrdForm", request, response);
-updateproductStorekeywordOvrdForm.putInContext("productStorekeywordOvrdList", productStorekeywordOvrdList);
-
-HtmlFormWrapper createproductStorekeywordOvrdForm = new HtmlFormWrapper("/store/ProductStoreForms.xml", "CreateproductStorekeywordOvrdForm", request, response);
-createproductStorekeywordOvrdForm.putInContext("productStore", productStore);
-
-context.put("productStoreId", productStoreId);
-context.put("productStore", productStore);
-context.put("updateproductStorekeywordOvrdForm", updateproductStorekeywordOvrdForm);
-context.put("createproductStorekeywordOvrdForm", createproductStorekeywordOvrdForm);
Modified: trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePaySetup.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
+ * Copyright (c) 2003-2005 The Open For Business Project - www.ofbiz.org
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -27,22 +27,9 @@
import org.ofbiz.entity.*;
import org.ofbiz.base.util.*;
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if (security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
-
-productStoreId = request.getParameter("productStoreId");
if (productStoreId != null) {
- productStore = delegator.findByPrimaryKey("ProductStore", UtilMisc.toMap("productStoreId", productStoreId));
paymentSettings = delegator.findByAnd("ProductStorePaymentSetting", UtilMisc.toMap("productStoreId", productStoreId), UtilMisc.toList("paymentMethodTypeId", "paymentServiceTypeEnumId"));
context.put("paymentSettings", paymentSettings);
- context.put("productStoreId", productStoreId);
- context.put("productStore", productStore);
}
// get the service types
@@ -60,4 +47,3 @@
editSetting = delegator.findByPrimaryKey("ProductStorePaymentSetting", UtilMisc.toMap("productStoreId", productStoreId, "paymentMethodTypeId", paymentMethodTypeId, "paymentServiceTypeEnumId", paymentServiceTypeEnumId));
}
context.put("editSetting", editSetting);
-
Modified: trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePromos.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePromos.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStorePromos.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2003 The Open For Business Project - www.ofbiz.org
+ * Copyright (c) 2003-2005 The Open For Business Project - www.ofbiz.org
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -32,24 +32,11 @@
import org.ofbiz.base.util.*;
import org.ofbiz.widget.html.*;
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CATALOG", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
-
activeOnly = !"false".equals(request.getParameter("activeOnly"));
userEntered = !"false".equals(request.getParameter("userEntered"));
nowTimestampString = UtilDateTime.nowTimestamp().toString();
-productStoreId = request.getParameter("productStoreId");
-
-productStore = delegator.findByPrimaryKey("ProductStore", UtilMisc.toMap("productStoreId", productStoreId));
-
productStorePromoAndAppls = null;
if (productStore != null) {
constraintMap = UtilMisc.toMap("productStoreId", productStoreId);
@@ -67,8 +54,6 @@
context.put("activeOnly", activeOnly);
context.put("userEntered", userEntered);
context.put("nowTimestampString", nowTimestampString);
-context.put("productStoreId", productStoreId);
-context.put("productStore", productStore);
context.put("productStorePromoAndAppls", productStorePromoAndAppls);
context.put("productPromos", productPromos);
@@ -79,13 +64,13 @@
int listSize = 0;
try {
- viewIndex = Integer.valueOf((String) context.getRequest().getParameter("VIEW_INDEX")).intValue();
+ viewIndex = Integer.valueOf((String) parameters.get("VIEW_INDEX")).intValue();
} catch (Exception e) {
viewIndex = 0;
}
try {
- viewSize = Integer.valueOf((String) context.getRequest().getParameter("VIEW_SIZE")).intValue();
+ viewSize = Integer.valueOf((String) parameters.get("VIEW_SIZE")).intValue();
} catch (Exception e) {
viewSize = 20;
}
Modified: trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreRoles.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreRoles.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreRoles.bsh 2005-04-12 08:37:49 UTC (rev 4806)
@@ -29,21 +29,6 @@
import org.ofbiz.entity.util.*;
import org.ofbiz.widget.html.*;
-security = request.getAttribute("security");
-delegator = request.getAttribute("delegator");
-
-if(security.hasEntityPermission("CONTENTMGR", "_VIEW", session)) {
- context.put("hasPermission", Boolean.TRUE);
-} else {
- context.put("hasPermission", Boolean.FALSE);
-}
-
-String productStoreId = request.getParameter("productStoreId");
-context.put("productStoreId", productStoreId);
-
-GenericValue productStore = delegator.findByPrimaryKey("ProductStore", UtilMisc.toMap("productStoreId", productStoreId));
-context.put("productStore", productStore);
-
List productStoreRoles = delegator.findByAnd("ProductStoreRole", UtilMisc.toMap("productStoreId", productStoreId), UtilMisc.toList("sequenceNum"));
if (request.getParameter("showAll") == null) {
productStoreRoles = EntityUtil.filterByDate(productStoreRoles);
Modified: trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreShipSetup.bsh
===================================================================
--- trunk/applications/product/webapp/catalog/WEB-INF/actions/store/EditProductStoreShipSetup.bsh 2005-04-12 06:56:02 UTC (rev 4805)
+++ trunk/applications/product/webapp/catalog/WEB