You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by er...@apache.org on 2012/08/04 20:11:22 UTC
svn commit: r1369382 [4/19] - in /ofbiz/branches/20120329_portletWidget: ./
applications/accounting/script/org/ofbiz/accounting/payment/
applications/accounting/src/org/ofbiz/accounting/payment/
applications/accounting/webapp/accounting/WEB-INF/ applic...
Modified: ofbiz/branches/20120329_portletWidget/applications/product/script/org/ofbiz/product/product/ProductServices.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/script/org/ofbiz/product/product/ProductServices.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/script/org/ofbiz/product/product/ProductServices.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/script/org/ofbiz/product/product/ProductServices.xml Sat Aug 4 18:11:00 2012
@@ -1064,17 +1064,26 @@ under the License.
<entity-one entity-name="ProductGroupOrder" value-field="productGroupOrder"/>
<set-nonpk-fields value-field="productGroupOrder" map="parameters"/>
<store-value value-field="productGroupOrder"/>
-
- <entity-one entity-name="JobSandbox" value-field="jobSandbox">
- <field-map field-name="jobId" from-field="productGroupOrder.jobId"/>
- </entity-one>
- <if-not-empty field="jobSandbox">
- <set field="jobSandbox.runTime" from-field="parameters.thruDate"/>
- <store-value value-field="jobSandbox"/>
- </if-not-empty>
+
+ <if-compare field="productGroupOrder.statusId" operator="equals" value="GO_CREATED">
+ <entity-one entity-name="JobSandbox" value-field="jobSandbox">
+ <field-map field-name="jobId" from-field="productGroupOrder.jobId"/>
+ </entity-one>
+ <if-not-empty field="jobSandbox">
+ <set field="jobSandbox.runTime" from-field="parameters.thruDate"/>
+ <store-value value-field="jobSandbox"/>
+ </if-not-empty>
+ </if-compare>
</simple-method>
<simple-method method-name="deleteProductGroupOrder" short-description="Delete ProductGroupOrder">
+ <entity-and entity-name="OrderItemGroupOrder" list="orderItemGroupOrders">
+ <field-map field-name="groupOrderId" from-field="parameters.groupOrderId"/>
+ </entity-and>
+ <iterate entry="orderItemGroupOrder" list="orderItemGroupOrders">
+ <remove-value value-field="orderItemGroupOrder"/>
+ </iterate>
+
<entity-one entity-name="ProductGroupOrder" value-field="productGroupOrder"/>
<remove-value value-field="productGroupOrder"/>
@@ -1114,7 +1123,7 @@ under the License.
<make-value entity-name="JobSandbox" value-field="jobSandbox"/>
<sequenced-id sequence-name="JobSandbox" field="jobSandbox.jobId"/>
<set field="jobId" from-field="jobSandbox.jobId"/>
- <set field="jobSandbox.jobName" value="Check Product GroupOrder Expired"/>
+ <set field="jobSandbox.jobName" value="Check ProductGroupOrder Expired"/>
<set field="jobSandbox.runTime" from-field="parameters.thruDate"/>
<set field="jobSandbox.poolId" value="pool"/>
<set field="jobSandbox.statusId" value="SERVICE_PENDING"/>
@@ -1130,7 +1139,6 @@ under the License.
</simple-method>
<simple-method method-name="checkOrderItemForProductGroupOrder" short-description="Check OrderItem For ProductGroupOrder">
- <entity-one entity-name="OrderHeader" value-field="orderHeader"/>
<entity-and entity-name="OrderItem" list="orderItems">
<field-map field-name="orderId" from-field="parameters.orderId"/>
</entity-and>
@@ -1151,89 +1159,122 @@ under the License.
<entity-and entity-name="ProductGroupOrder" list="productGroupOrders" filter-by-date="true">
<field-map field-name="productId" from-field="productId"/>
</entity-and>
- <iterate entry="productGroupOrder" list="productGroupOrders">
- <if-compare field="orderHeader.statusId" operator="equals" value="ORDER_CREATED">
- <calculate field="productGroupOrder.soldOrderQty">
- <calcop field="productGroupOrder.soldOrderQty" operator="add">
- <calcop field="orderItem.quantity" operator="get"/>
- </calcop>
- </calculate>
- </if-compare>
- <if-compare field="orderHeader.statusId" operator="equals" value="ORDER_CANCELLED">
- <calculate field="productGroupOrder.soldOrderQty">
- <calcop field="productGroupOrder.soldOrderQty" operator="subtract">
- <calcop field="orderItem.quantity" operator="get"/>
- </calcop>
- </calculate>
- </if-compare>
+ <if-not-empty field="productGroupOrders">
+ <first-from-list entry="productGroupOrder" list="productGroupOrders"/>
+ <calculate field="productGroupOrder.soldOrderQty">
+ <calcop field="productGroupOrder.soldOrderQty" operator="add">
+ <calcop field="orderItem.quantity" operator="get"/>
+ </calcop>
+ </calculate>
<store-value value-field="productGroupOrder"/>
- </iterate>
+
+ <set field="createOrderItemGroupOrderMap.orderId" from-field="orderItem.orderId"/>
+ <set field="createOrderItemGroupOrderMap.orderItemSeqId" from-field="orderItem.orderItemSeqId"/>
+ <set field="createOrderItemGroupOrderMap.groupOrderId" from-field="productGroupOrder.groupOrderId"/>
+ <call-service service-name="createOrderItemGroupOrder" in-map-name="createOrderItemGroupOrderMap"/>
+ </if-not-empty>
</iterate>
</simple-method>
-
- <simple-method method-name="checkProductGroupOrderExpired" short-description="Check ProductGroupOrder Expired">
- <entity-one entity-name="ProductGroupOrder" value-field="productGroupOrder"/>
- <if-compare field="productGroupOrder.soldOrderQty" operator="greater-equals" value="${productGroupOrder.reqOrderQty}">
- <set field="newItemStatusId" value="ITEM_APPROVED"/>
- <else>
- <set field="newItemStatusId" value="ITEM_CANCELLED"/>
- </else>
- </if-compare>
-
- <entity-one entity-name="Product" value-field="product">
- <field-map field-name="productId" from-field="productGroupOrder.productId"/>
- </entity-one>
- <if-compare field="product.isVirtual" operator="equals" value="Y">
- <entity-and entity-name="ProductAssoc" list="variantProductAssocs" filter-by-date="true">
- <field-map field-name="productId" from-field="productGroupOrder.productId"/>
- <field-map field-name="productAssocTypeId" value="PRODUCT_VARIANT"/>
+
+ <simple-method method-name="cancleOrderItemGroupOrder" short-description="Cancle OrderItemGroupOrder">
+ <if-not-empty field="parameters.orderItemSeqId">
+ <entity-and entity-name="OrderItem" list="orderItems">
+ <field-map field-name="orderId" from-field="parameters.orderId"/>
+ <field-map field-name="orderItemSeqId" from-field="parameters.orderItemSeqId" />
</entity-and>
- <iterate entry="variantProductAssoc" list="variantProductAssocs">
- <set field="findOrderItemMap.productId" from-field="variantProductAssoc.productIdTo"/>
- <set field="findOrderItemMap.newItemStatusId" from-field="newItemStatusId"/>
- <set field="findOrderItemMap.fromDate" from-field="productGroupOrder.fromDate"/>
- <set field="findOrderItemMap.thruDate" from-field="productGroupOrder.thruDate"/>
- <call-service service-name="findOrderItemForProductGroupOrder" in-map-name="findOrderItemMap"/>
- </iterate>
<else>
- <set field="findOrderItemMap.productId" from-field="productGroupOrder.productId"/>
- <set field="findOrderItemMap.newItemStatusId" from-field="newItemStatusId"/>
- <set field="findOrderItemMap.fromDate" from-field="productGroupOrder.fromDate"/>
- <set field="findOrderItemMap.thruDate" from-field="productGroupOrder.thruDate"/>
- <call-service service-name="findOrderItemForProductGroupOrder" in-map-name="findOrderItemMap"/>
+ <entity-and entity-name="OrderItem" list="orderItems">
+ <field-map field-name="orderId" from-field="parameters.orderId"/>
+ </entity-and>
</else>
- </if-compare>
- </simple-method>
-
- <simple-method method-name="findOrderItemForProductGroupOrder" short-description="Find OrderItem For ProductGroupOrder">
- <entity-condition entity-name="OrderItem" list="orderItems">
- <condition-list combine="and">
- <condition-expr field-name="productId" operator="equals" from-field="parameters.productId"/>
- <condition-list combine="or">
- <condition-expr field-name="statusId" operator="equals" value="ITEM_CREATED"/>
- <condition-expr field-name="statusId" operator="equals" value="ITEM_APPROVED"/>
- </condition-list>
- </condition-list>
- </entity-condition>
+ </if-not-empty>
<iterate entry="orderItem" list="orderItems">
- <entity-one value-field="orderHeader" entity-name="OrderHeader">
+ <entity-and entity-name="OrderItemGroupOrder" list="orderItemGroupOrders">
<field-map field-name="orderId" from-field="orderItem.orderId"/>
- </entity-one>
- <if>
- <condition>
- <and>
- <if-compare field="orderHeader.orderTypeId" operator="equals" value="SALES_ORDER"/>
- <if-compare field="orderHeader.orderDate" operator="greater-equals" value="${parameters.fromDate}"/>
- <if-compare field="orderHeader.orderDate" operator="less" value="${parameters.thruDate}"/>
- </and>
- </condition>
- <then>
- <set field="changeOrderItemStatusMap.orderId" from-field="orderItem.orderId"/>
- <set field="changeOrderItemStatusMap.orderItemSeqId" from-field="orderItem.orderItemSeqId"/>
- <set field="changeOrderItemStatusMap.statusId" from-field="parameters.newItemStatusId"/>
- <call-service service-name="changeOrderItemStatus" in-map-name="changeOrderItemStatusMap"/>
- </then>
- </if>
+ <field-map field-name="orderItemSeqId" from-field="orderItem.orderItemSeqId"/>
+ </entity-and>
+ <if-not-empty field="orderItemGroupOrders">
+ <first-from-list entry="orderItemGroupOrder" list="orderItemGroupOrders"/>
+ <entity-one entity-name="ProductGroupOrder" value-field="productGroupOrder">
+ <field-map field-name="groupOrderId" from-field="orderItemGroupOrder.groupOrderId"/>
+ </entity-one>
+ <if-not-empty field="productGroupOrder">
+ <if-compare field="productGroupOrder.statusId" operator="equals" value="GO_CREATED">
+ <if-compare field="orderItem.statusId" operator="equals" value="ITEM_CANCELLED">
+ <if-not-empty field="orderItem.cancelQuantity">
+ <set field="cancelQuantity" from-field="orderItem.cancelQuantity"/>
+ <else>
+ <set field="cancelQuantity" from-field="orderItem.quantity"/>
+ </else>
+ </if-not-empty>
+ <calculate field="productGroupOrder.soldOrderQty">
+ <calcop field="productGroupOrder.soldOrderQty" operator="subtract">
+ <calcop field="cancelQuantity" operator="get"/>
+ </calcop>
+ </calculate>
+ </if-compare>
+ <store-value value-field="productGroupOrder"/>
+ <remove-value value-field="orderItemGroupOrder"/>
+ </if-compare>
+ </if-not-empty>
+ </if-not-empty>
</iterate>
</simple-method>
+
+ <simple-method method-name="checkProductGroupOrderExpired" short-description="Check ProductGroupOrder Expired">
+ <entity-one entity-name="ProductGroupOrder" value-field="productGroupOrder"/>
+ <if-not-empty field="productGroupOrder">
+ <if-compare field="productGroupOrder.soldOrderQty" operator="greater-equals" value="${productGroupOrder.reqOrderQty}">
+ <set field="newItemStatusId" value="ITEM_APPROVED"/>
+ <set field="groupOrderStatusId" value="GO_SUCCESS"/>
+ <else>
+ <set field="newItemStatusId" value="ITEM_CANCELLED"/>
+ <set field="groupOrderStatusId" value="GO_CANCELLED"/>
+ </else>
+ </if-compare>
+
+ <set field="updateProductGroupOrderMap.groupOrderId" from-field="productGroupOrder.groupOrderId"/>
+ <set field="updateProductGroupOrderMap.statusId" from-field="groupOrderStatusId"/>
+ <call-service service-name="updateProductGroupOrder" in-map-name="updateProductGroupOrderMap"/>
+
+ <entity-and entity-name="OrderItemGroupOrder" list="orderItemGroupOrders">
+ <field-map field-name="groupOrderId" from-field="productGroupOrder.groupOrderId"/>
+ </entity-and>
+ <iterate entry="orderItemGroupOrder" list="orderItemGroupOrders">
+ <set field="changeOrderItemStatusMap.orderId" from-field="orderItemGroupOrder.orderId"/>
+ <set field="changeOrderItemStatusMap.orderItemSeqId" from-field="orderItemGroupOrder.orderItemSeqId"/>
+ <set field="changeOrderItemStatusMap.statusId" from-field="newItemStatusId"/>
+ <call-service service-name="changeOrderItemStatus" in-map-name="changeOrderItemStatusMap"/>
+ </iterate>
+ </if-not-empty>
+ </simple-method>
+
+ <simple-method method-name="setProductReviewStatus" short-description="change the product review Status">
+ <set value="setProductReviewStatus" field="callingMethodName"/>
+ <set value="UPDATE" field="checkAction"/>
+ <call-simple-method method-name="checkProductRelatedPermission"/>
+ <check-errors/>
+
+ <entity-one value-field="productReview" entity-name="ProductReview"/>
+ <if-not-empty field="productReview">
+ <if-compare-field field="productReview.statusId" to-field="parameters.statusId" operator="not-equals">
+ <entity-one entity-name="StatusValidChange" value-field="statusChange">
+ <field-map field-name="statusId" from-field="productReview.statusId"/>
+ <field-map field-name="statusIdTo" from-field="parameters.statusId"/>
+ </entity-one>
+ <if-empty field="statusChange">
+ <set field="msg" value="Status is not a valid change: from ${productReview.statusId} to ${parameters.statusId}"/>
+ <log level="error" message="${msg}"/>
+ <add-error>
+ <fail-property resource="ProductErrorUiLabels" property="ProductReviewErrorCouldNotChangeOrderStatusFromTo"/>
+ </add-error>
+ </if-empty>
+ </if-compare-field>
+ </if-not-empty>
+ <check-errors/>
+
+ <set field="productReview.statusId" from-field="parameters.statusId"/>
+ <store-value value-field="productReview"/>
+ <field-to-result field="productReview.productReviewId" result-name="productReviewId"/>
+ </simple-method>
</simple-methods>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/script/org/ofbiz/product/test/GroupOrderTest.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/script/org/ofbiz/product/test/GroupOrderTest.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/script/org/ofbiz/product/test/GroupOrderTest.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/script/org/ofbiz/product/test/GroupOrderTest.xml Sat Aug 4 18:11:00 2012
@@ -43,6 +43,7 @@ under the License.
<set field="createProductGroupOrderMap.productId" value="GZ-1000"/>
<set field="createProductGroupOrderMap.fromDate" from-field="nowTimestamp"/>
<set field="createProductGroupOrderMap.thruDate" from-field="thruDate"/>
+ <set field="createProductGroupOrderMap.statusId" value="GO_CREATED"/>
<set field="createProductGroupOrderMap.reqOrderQty" value="1" type="BigDecimal"/>
<set field="createProductGroupOrderMap.soldOrderQty" value="0" type="BigDecimal"/>
<call-service service-name="createProductGroupOrder" in-map-name="createProductGroupOrderMap">
@@ -125,23 +126,20 @@ under the License.
</assert>
<!-- Step 4 -->
<set field="checkProductGroupOrderExpiredMap.userLogin" from-field="systemUserLogin"/>
- <set field="checkProductGroupOrderExpiredMap.groupOrderId" from-field="productGroupOrder.groupOrderId"/>
+ <set field="checkProductGroupOrderExpiredMap.groupOrderId" from-field="groupOrderId"/>
<call-service service-name="checkProductGroupOrderExpired" in-map-name="checkProductGroupOrderExpiredMap"/>
<!-- Step 5 -->
- <entity-condition entity-name="OrderHeader" list="orderHeaders">
- <condition-expr field-name="orderTypeId" value="SALES_ORDER"/>
- <order-by field-name="-orderDate"/>
- </entity-condition>
- <first-from-list entry="orderHeader" list="orderHeaders"/>
- <entity-and entity-name="OrderItem" list="orderItems">
- <field-map field-name="orderId" from-field="orderHeader.orderId"/>
- <field-map field-name="productId" value="GZ-1000"/>
+ <entity-and entity-name="OrderItemGroupOrder" list="orderItemGroupOrders">
+ <field-map field-name="groupOrderId" from-field="groupOrderId"/>
</entity-and>
- <first-from-list entry="orderItem" list="orderItems"/>
+ <first-from-list entry="orderItemGroupOrder" list="orderItemGroupOrders"/>
+ <entity-one entity-name="OrderItem" value-field="orderItem">
+ <field-map field-name="orderId" from-field="orderItemGroupOrder.orderId"/>
+ <field-map field-name="orderItemSeqId" from-field="orderItemGroupOrder.orderItemSeqId"/>
+ </entity-one>
<assert>
<if-compare field="orderItem.statusId" operator="equals" value="ITEM_APPROVED"/>
</assert>
-
<check-errors/>
</simple-method>
@@ -164,9 +162,10 @@ under the License.
<field-map field-name="userLoginId" value="system"/>
</entity-one>
<set field="createProductGroupOrderMap.userLogin" from-field="systemUserLogin"/>
- <set field="createProductGroupOrderMap.productId" value="GZ-1000"/>
+ <set field="createProductGroupOrderMap.productId" value="GZ-1001"/>
<set field="createProductGroupOrderMap.fromDate" from-field="nowTimestamp"/>
<set field="createProductGroupOrderMap.thruDate" from-field="thruDate"/>
+ <set field="createProductGroupOrderMap.statusId" value="GO_CREATED"/>
<set field="createProductGroupOrderMap.reqOrderQty" value="2" type="BigDecimal"/>
<set field="createProductGroupOrderMap.soldOrderQty" value="0" type="BigDecimal"/>
<call-service service-name="createProductGroupOrder" in-map-name="createProductGroupOrderMap">
@@ -203,7 +202,7 @@ under the License.
</call-class-method>
<log level="info" message="===== >>> Event : setOrderCurrencyAgreementShipDates, Response : ${result}"/>
<call-bsh><![CDATA[
- request.setParameter("add_product_id", "GZ-1000");
+ request.setParameter("add_product_id", "GZ-1001");
]]></call-bsh>
<call-class-method method-name="addToCart" class-name="org.ofbiz.order.shoppingcart.ShoppingCartEvents" ret-field="result">
<field field="request" type="javax.servlet.http.HttpServletRequest"/>
@@ -249,23 +248,20 @@ under the License.
</assert>
<!-- Step 4 -->
<set field="checkProductGroupOrderExpiredMap.userLogin" from-field="systemUserLogin"/>
- <set field="checkProductGroupOrderExpiredMap.groupOrderId" from-field="productGroupOrder.groupOrderId"/>
+ <set field="checkProductGroupOrderExpiredMap.groupOrderId" from-field="groupOrderId"/>
<call-service service-name="checkProductGroupOrderExpired" in-map-name="checkProductGroupOrderExpiredMap"/>
<!-- Step 5 -->
- <entity-condition entity-name="OrderHeader" list="orderHeaders">
- <condition-expr field-name="orderTypeId" value="SALES_ORDER"/>
- <order-by field-name="-orderDate"/>
- </entity-condition>
- <first-from-list entry="orderHeader" list="orderHeaders"/>
- <entity-and entity-name="OrderItem" list="orderItems">
- <field-map field-name="orderId" from-field="orderHeader.orderId"/>
- <field-map field-name="productId" value="GZ-1000"/>
+ <entity-and entity-name="OrderItemGroupOrder" list="orderItemGroupOrders">
+ <field-map field-name="groupOrderId" from-field="groupOrderId"/>
</entity-and>
- <first-from-list entry="orderItem" list="orderItems"/>
+ <first-from-list entry="orderItemGroupOrder" list="orderItemGroupOrders"/>
+ <entity-one entity-name="OrderItem" value-field="orderItem">
+ <field-map field-name="orderId" from-field="orderItemGroupOrder.orderId"/>
+ <field-map field-name="orderItemSeqId" from-field="orderItemGroupOrder.orderItemSeqId"/>
+ </entity-one>
<assert>
<if-compare field="orderItem.statusId" operator="equals" value="ITEM_CANCELLED"/>
</assert>
-
<check-errors/>
</simple-method>
</simple-methods>
Propchange: ofbiz/branches/20120329_portletWidget/applications/product/script/org/ofbiz/product/test/InventoryTests.xml
------------------------------------------------------------------------------
Merged /ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:r1307080-1307082,1340380-1340445,1340638-1340641,1347751-1347754,1351866,1356000-1369352
Modified: ofbiz/branches/20120329_portletWidget/applications/product/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/servicedef/services.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/servicedef/services.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/servicedef/services.xml Sat Aug 4 18:11:00 2012
@@ -204,6 +204,16 @@ under the License.
<auto-attributes mode="IN" include="pk" optional="false"/>
<auto-attributes mode="IN" include="nonpk" optional="true"/>
</service>
+ <service name="setProductReviewStatus" engine="simple"
+ location="component://product/script/org/ofbiz/product/product/ProductServices.xml" invoke="setProductReviewStatus" auth="true">
+ <description>Updates a product review record</description>
+ <required-permissions join-type="OR">
+ <check-permission permission="CATALOG_UPDATE"/>
+ <check-permission permission="CATALOG_ADMIN"/>
+ </required-permissions>
+ <attribute name="productReviewId" type="String" mode="INOUT" optional="false"/>
+ <attribute name="statusId" type="String" mode="IN" optional="false"/>
+ </service>
<service name="findProductById" engine="java" auth="true" export="true"
location="org.ofbiz.product.product.ProductServices" invoke="findProductById">
@@ -1675,21 +1685,15 @@ under the License.
<service name="createProductGroupOrder" default-entity-name="ProductGroupOrder" engine="simple"
location="component://product/script/org/ofbiz/product/product/ProductServices.xml" invoke="createProductGroupOrder" auth="true">
<description>Create ProductGroupOrder</description>
- <attribute name="productId" mode="IN" type="String" optional="false"/>
- <attribute name="soldOrderQty" mode="IN" type="BigDecimal" optional="false"/>
- <attribute name="reqOrderQty" mode="IN" type="BigDecimal" optional="false"/>
- <attribute name="fromDate" mode="IN" type="Timestamp" optional="false"/>
- <attribute name="thruDate" mode="IN" type="Timestamp" optional="false"/>
- <attribute name="groupOrderId" mode="OUT" type="String" optional="true"/>
+ <auto-attributes include="pk" mode="OUT" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
<service name="updateProductGroupOrder" default-entity-name="ProductGroupOrder" engine="simple"
location="component://product/script/org/ofbiz/product/product/ProductServices.xml" invoke="updateProductGroupOrder" auth="true">
<description>Update ProductGroupOrder</description>
- <attribute name="groupOrderId" mode="IN" type="String" optional="false"/>
- <attribute name="reqOrderQty" mode="IN" type="BigDecimal" optional="false"/>
- <attribute name="fromDate" mode="IN" type="Timestamp" optional="false"/>
- <attribute name="thruDate" mode="IN" type="Timestamp" optional="false"/>
+ <auto-attributes include="pk" mode="IN" optional="false"/>
+ <auto-attributes include="nonpk" mode="IN" optional="true"/>
</service>
<service name="deleteProductGroupOrder" default-entity-name="ProductGroupOrder" engine="simple"
@@ -1711,19 +1715,17 @@ under the License.
<attribute name="orderId" mode="IN" type="String" optional="false"/>
</service>
+ <service name="cancleOrderItemGroupOrder" engine="simple"
+ location="component://product/script/org/ofbiz/product/product/ProductServices.xml" invoke="cancleOrderItemGroupOrder" auth="true">
+ <description>Cancle OrderItemGroupOrder</description>
+ <attribute name="orderId" mode="IN" type="String" optional="false"/>
+ <attribute name="orderItemSeqId" type="String" mode="IN" optional="true"/>
+ </service>
+
<service name="checkProductGroupOrderExpired" engine="simple"
location="component://product/script/org/ofbiz/product/product/ProductServices.xml" invoke="checkProductGroupOrderExpired" auth="true">
<description>Check ProductGroupOrder Expired</description>
<attribute name="groupOrderId" mode="IN" type="String" optional="false"/>
</service>
- <service name="findOrderItemForProductGroupOrder" engine="simple"
- location="component://product/script/org/ofbiz/product/product/ProductServices.xml" invoke="findOrderItemForProductGroupOrder" auth="true">
- <description>Find OrderItem For ProductGroupOrder</description>
- <attribute name="productId" mode="IN" type="String" optional="false"/>
- <attribute name="newItemStatusId" mode="IN" type="String" optional="false"/>
- <attribute name="fromDate" mode="IN" type="Timestamp" optional="false"/>
- <attribute name="thruDate" mode="IN" type="Timestamp" optional="false"/>
- </service>
-
</services>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/config/ProductConfigItemContentWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/config/ProductConfigItemContentWrapper.java?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/config/ProductConfigItemContentWrapper.java (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/config/ProductConfigItemContentWrapper.java Sat Aug 4 18:11:00 2012
@@ -41,8 +41,8 @@ import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.model.ModelEntity;
import org.ofbiz.entity.model.ModelUtil;
import org.ofbiz.entity.util.EntityUtil;
-import org.ofbiz.service.GenericDispatcher;
import org.ofbiz.service.LocalDispatcher;
+import org.ofbiz.service.ServiceContainer;
/**
* Product Config Item Content Worker: gets product content to display
@@ -98,7 +98,7 @@ public class ProductConfigItemContentWra
public LocalDispatcher getDispatcher() {
if (dispatcher == null) {
- dispatcher = GenericDispatcher.getLocalDispatcher(dispatcherName, this.getDelegator());
+ dispatcher = ServiceContainer.getLocalDispatcher(dispatcherName, this.getDelegator());
}
return dispatcher;
}
Modified: ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/config/ProductConfigWrapper.java Sat Aug 4 18:11:00 2012
@@ -39,8 +39,8 @@ import org.ofbiz.entity.DelegatorFactory
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.util.EntityUtil;
-import org.ofbiz.service.GenericDispatcher;
import org.ofbiz.service.LocalDispatcher;
+import org.ofbiz.service.ServiceContainer;
/**
@@ -219,7 +219,7 @@ public class ProductConfigWrapper implem
public LocalDispatcher getDispatcher() {
if (dispatcher == null) {
- dispatcher = GenericDispatcher.getLocalDispatcher(dispatcherName, this.getDelegator());
+ dispatcher = ServiceContainer.getLocalDispatcher(dispatcherName, this.getDelegator());
}
return dispatcher;
}
Modified: ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/product/ProductEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/product/ProductEvents.java?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/product/ProductEvents.java (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/product/product/ProductEvents.java Sat Aug 4 18:11:00 2012
@@ -57,6 +57,7 @@ import org.ofbiz.product.store.ProductSt
import org.ofbiz.security.Security;
import org.ofbiz.service.GenericServiceException;
import org.ofbiz.service.LocalDispatcher;
+import org.ofbiz.webapp.website.WebSiteWorker;
/**
* Product Information Related Events
@@ -1018,6 +1019,10 @@ public class ProductEvents {
}
Map<String, Object> paramMap = UtilHttp.getParameterMap(request);
+ String websiteId = (String) paramMap.get("websiteId");
+ if (UtilValidate.isEmpty(websiteId)) {
+ websiteId = WebSiteWorker.getWebSiteId(request);
+ }
paramMap.put("locale", UtilHttp.getLocale(request));
paramMap.put("userLogin", session.getAttribute("userLogin"));
@@ -1030,6 +1035,7 @@ public class ProductEvents {
context.put("sendCc", productStoreEmail.get("ccAddress"));
context.put("sendBcc", productStoreEmail.get("bccAddress"));
context.put("subject", productStoreEmail.getString("subject"));
+ context.put("webSiteId", websiteId);
try {
dispatcher.runAsync("sendMailFromScreen", context);
Modified: ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java Sat Aug 4 18:11:00 2012
@@ -41,9 +41,9 @@ import org.ofbiz.entity.GenericEntityExc
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.util.EntityUtil;
import org.ofbiz.product.product.ProductWorker;
-import org.ofbiz.service.GenericDispatcher;
import org.ofbiz.service.GenericServiceException;
import org.ofbiz.service.LocalDispatcher;
+import org.ofbiz.service.ServiceContainer;
import org.ofbiz.service.ServiceUtil;
@SuppressWarnings("serial")
@@ -496,7 +496,7 @@ public class PackingSession implements j
public LocalDispatcher getDispatcher() {
if (_dispatcher == null) {
- _dispatcher = GenericDispatcher.getLocalDispatcher(dispatcherName, this.getDelegator());
+ _dispatcher = ServiceContainer.getLocalDispatcher(dispatcherName, this.getDelegator());
}
return _dispatcher;
}
Modified: ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/shipment/verify/VerifyPickSession.java Sat Aug 4 18:11:00 2012
@@ -37,8 +37,8 @@ import org.ofbiz.entity.DelegatorFactory
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
import org.ofbiz.entity.util.EntityUtil;
-import org.ofbiz.service.GenericDispatcher;
import org.ofbiz.service.LocalDispatcher;
+import org.ofbiz.service.ServiceContainer;
import org.ofbiz.service.ServiceUtil;
@SuppressWarnings("serial")
@@ -71,7 +71,7 @@ public class VerifyPickSession implement
public LocalDispatcher getDispatcher() {
if (_dispatcher == null) {
- _dispatcher = GenericDispatcher.getLocalDispatcher(dispatcherName, this.getDelegator());
+ _dispatcher = ServiceContainer.getLocalDispatcher(dispatcherName, this.getDelegator());
}
return _dispatcher;
}
Modified: ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/src/org/ofbiz/shipment/weightPackage/WeightPackageSession.java Sat Aug 4 18:11:00 2012
@@ -38,8 +38,8 @@ import org.ofbiz.entity.Delegator;
import org.ofbiz.entity.DelegatorFactory;
import org.ofbiz.entity.GenericEntityException;
import org.ofbiz.entity.GenericValue;
-import org.ofbiz.service.GenericDispatcher;
import org.ofbiz.service.LocalDispatcher;
+import org.ofbiz.service.ServiceContainer;
import org.ofbiz.service.ServiceUtil;
@SuppressWarnings("serial")
@@ -97,7 +97,7 @@ public class WeightPackageSession implem
public LocalDispatcher getDispatcher() {
if (_dispatcher == null) {
- _dispatcher = GenericDispatcher.getLocalDispatcher(dispatcherName, this.getDelegator());
+ _dispatcher = ServiceContainer.getLocalDispatcher(dispatcherName, this.getDelegator());
}
return _dispatcher;
}
Modified: ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/WEB-INF/controller.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/WEB-INF/controller.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/WEB-INF/controller.xml Sat Aug 4 18:11:00 2012
@@ -2377,15 +2377,21 @@ under the License.
</request-map>
<!-- ================ Product Review Requests ================= -->
- <request-map uri="pendingReviews">
+ <request-map uri="updateProductReview">
<security https="true" auth="true"/>
- <response name="success" type="view" value="pendingReviews"/>
+ <event type="service" path="" invoke="updateProductReview"/>
+ <response name="success" type="request-redirect-noparam" value="FindReviews"/>
+ <response name="error" type="view" value="FindReviews"/>
</request-map>
- <request-map uri="updateProductReview">
+ <request-map uri="FindReviews">
+ <security https="true" auth="true"/>
+ <response name="success" type="view" value="FindReviews"/>
+ </request-map>
+ <request-map uri="updateProductReviewStatus">
<security https="true" auth="true"/>
- <event type="service-multi" path="" invoke="updateProductReview"/>
- <response name="success" type="view" value="pendingReviews"/>
- <response name="error" type="view" value="pendingReviews"/>
+ <event type="service" path="" invoke="setProductReviewStatus"/>
+ <response name="success" type="view" value="FindReviews"/>
+ <response name="error" type="view" value="FindReviews"/>
</request-map>
<!-- ================ Supplier Product Requests ================= -->
@@ -3133,7 +3139,6 @@ under the License.
<view-map name="ListFeaturePrice" type="screen" page="component://product/widget/catalog/FeatureScreens.xml#ListFeaturePrice"/>
<view-map name="CreateFeature" type="screen" page="component://product/widget/catalog/FeatureScreens.xml#CreateFeature"/>
- <view-map name="FindProdCatalog" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#FindProdCatalog"/>
<view-map name="EditProdCatalog" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalog"/>
<view-map name="EditProdCatalogCategories" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalogCategories"/>
<view-map name="EditProdCatalogStores" type="screen" page="component://product/widget/catalog/CatalogScreens.xml#EditProdCatalogStores"/>
@@ -3174,7 +3179,7 @@ under the License.
<view-map name="EditVendorProduct" type="screen" page="component://product/widget/catalog/ProductScreens.xml#EditVendorProduct"/>
<view-map name="EditKeywordThesaurus" type="screen" page="component://product/widget/catalog/ThesaurusScreens.xml#EditKeywordThesaurus"/>
- <view-map name="pendingReviews" type="screen" page="component://product/widget/catalog/ReviewScreens.xml#pendingReviews"/>
+ <view-map name="FindReviews" type="screen" page="component://product/widget/catalog/ReviewScreens.xml#FindReviews"/>
<view-map name="ViewProductOrder" type="screen" page="component://product/widget/catalog/ProductScreens.xml#ViewProductOrder"/>
<view-map name="EditProductCommunicationEvents" type="screen" page="component://product/widget/catalog/ProductScreens.xml#EditProductCommunicationEvents"/>
@@ -3243,8 +3248,6 @@ under the License.
<view-map name="ListImageRecentlyApproved" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ListImageRecentlyApproved"/>
<view-map name="ListPeopleApproved" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ListPeopleApproved"/>
<view-map name="ListPeopleRejected" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ListPeopleRejected"/>
- <view-map name="AutomaticResize" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#AutomaticResize"/>
- <view-map name="ListAutomaticResize" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ListAutomaticResize"/>
<view-map name="LookupImageFrame" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#LookupImageFrame"/>
<view-map name="ImageResize" type="screen" page="component://product/widget/catalog/ImageManagementScreens.xml#ImageResize"/>
<!-- end of view mappings -->
Modified: ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/WEB-INF/web.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/WEB-INF/web.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/WEB-INF/web.xml Sat Aug 4 18:11:00 2012
@@ -35,11 +35,6 @@ under the License.
<description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
</context-param>
<context-param>
- <param-name>serviceReaderUrls</param-name>
- <param-value>/WEB-INF/services.xml</param-value>
- <description>Configuration File(s) For The Service Dispatcher</description>
- </context-param>
- <context-param>
<param-name>mainDecoratorLocation</param-name>
<param-value>component://product/widget/catalog/CommonScreens.xml</param-value>
<description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/find/sidecatalogs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/find/sidecatalogs.ftl?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/find/sidecatalogs.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/find/sidecatalogs.ftl Sat Aug 4 18:11:00 2012
@@ -16,7 +16,6 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<div><a href='<@o...@ofbizUrl>' class='buttontext'>${uiLabelMap.ProductCatalogDetailList}</a></div>
<div class="browsecategorylist">
<#assign sortList = Static["org.ofbiz.base.util.UtilMisc"].toList("prodCatalogCategoryTypeId", "sequenceNum", "productCategoryId")>
<#list prodCatalogs as prodCatalog>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/price/setPriceRulesCondEventJs.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/price/setPriceRulesCondEventJs.ftl?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/price/setPriceRulesCondEventJs.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/price/setPriceRulesCondEventJs.ftl Sat Aug 4 18:11:00 2012
@@ -23,9 +23,9 @@ jQuery(document).ready( function() {
if (document.getElementById('EditProductPriceRulesCond_o_${i}')) {
jQuery('#EditProductPriceRulesCond_condValueInput_o_${i}').hide();
jQuery('#EditProductPriceRulesCond_inputParamEnumId_o_${i}').change( function() {
- getDependentDropdownValues('getAssociatedPriceRulesConds', 'inputParamEnumId', 'EditProductPriceRulesCond_inputParamEnumId_o_${i}', 'EditProductPriceRulesCond_condValue_o_${i}', 'productPriceRulesCondValues', 'condValue_o_${i}', 'description', '', '', '', '', 'EditProductPriceRulesCond_condValueInput_o_${i}');
+ getDependentDropdownValues('getAssociatedPriceRulesConds', 'inputParamEnumId', 'EditProductPriceRulesCond_inputParamEnumId_o_${i}', 'EditProductPriceRulesCond_condValue_o_${i}', 'productPriceRulesCondValues', 'condValue_o_${i}', 'description', '${productPriceConds[i].condValue}', '', '', '', 'EditProductPriceRulesCond_condValueInput_o_${i}');
});
- getDependentDropdownValues('getAssociatedPriceRulesConds', 'inputParamEnumId', 'EditProductPriceRulesCond_inputParamEnumId_o_${i}', 'EditProductPriceRulesCond_condValue_o_${i}', 'productPriceRulesCondValues', 'condValue_o_${i}', 'description', '', '', '', '', 'EditProductPriceRulesCond_condValueInput_o_${i}');
+ getDependentDropdownValues('getAssociatedPriceRulesConds', 'inputParamEnumId', 'EditProductPriceRulesCond_inputParamEnumId_o_${i}', 'EditProductPriceRulesCond_condValue_o_${i}', 'productPriceRulesCondValues', 'condValue_o_${i}', 'description', '${productPriceConds[i].condValue}', '', '', '', 'EditProductPriceRulesCond_condValueInput_o_${i}');
}
</#list>
</#if>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/reviews/pendingReviews.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/reviews/pendingReviews.ftl?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/reviews/pendingReviews.ftl (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/webapp/catalog/reviews/pendingReviews.ftl Sat Aug 4 18:11:00 2012
@@ -1,122 +0,0 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<script language="JavaScript" type="text/javascript">
- function changeReviewStatus(statusId) {
- document.selectAllForm.statusId.value = statusId;
- document.selectAllForm.submit();
- }
-</script>
-<div class="screenlet">
- <div class="screenlet-title-bar">
- <h3>${uiLabelMap.ProductReviewsPendingApproval}</h3>
- </div>
- <div class="screenlet-body">
- <#if !pendingReviews?has_content>
- <h3>${uiLabelMap.ProductReviewsNoPendingApproval}</h3>
- <#else>
- <form method='post' action='<@o...@ofbizUrl>' name="selectAllForm">
- <input type="hidden" name="_useRowSubmit" value="Y" />
- <input type="hidden" name="_checkGlobalScope" value="Y" />
- <input type="hidden" name="statusId" value="" />
- <div align="right">
- <input type="button" value="${uiLabelMap.CommonUpdate}" onclick="javascript:changeReviewStatus('PRR_PENDING')" />
- <input type="button" value="${uiLabelMap.ProductPendingReviewUpdateAndApprove}" onclick="javascript:changeReviewStatus('PRR_APPROVED')" />
- <input type="button" value="${uiLabelMap.CommonDelete}" onclick="javascript:changeReviewStatus('PRR_DELETED')" />
- </div>
- <table cellspacing="0" class="basic-table">
- <tr class="header-row">
- <td><b>${uiLabelMap.ProductPendingReviewDate}</b></td>
- <td><b>${uiLabelMap.ProductPendingReviewBy}</b></td>
- <td><b>${uiLabelMap.CommonIsAnonymous}</b></td>
- <td><b>${uiLabelMap.ProductProductId}</b></td>
- <td><b>${uiLabelMap.ProductRating}</b></td>
- <td><b>${uiLabelMap.CommonStatus}</b></td>
- <td><b>${uiLabelMap.ProductReviews}</b></td>
- <td align="right">
- <span class="label">${uiLabelMap.CommonAll}</span>
- <input type="checkbox" name="selectAll" value="${uiLabelMap.CommonY}" onclick="javascript:toggleAll(this, 'selectAllForm');highlightAllRows(this, 'review_tableRow_', 'selectAllForm');" />
- </td>
- </tr>
- <#assign rowCount = 0>
- <#assign rowClass = "2">
- <#list pendingReviews as review>
- <#if review.userLoginId?has_content>
- <#assign postedUserLogin = review.getRelatedOne("UserLogin", false)>
- <#if postedUserLogin.partyId?has_content>
- <#assign party = postedUserLogin.getRelatedOne("Party", false)>
- <#assign partyTypeId = party.get("partyTypeId")>
- <#if partyTypeId == "PERSON">
- <#assign postedPerson = postedUserLogin.getRelatedOne("Person", false)>
- <#else>
- <#assign postedPerson = postedUserLogin.getRelatedOne("PartyGroup", false)>
- </#if>
- </#if>
- </#if>
- <tr id="review_tableRow_${rowCount}" valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
- <td>
- <input type="hidden" name="productReviewId_o_${rowCount}" value="${review.productReviewId}" />
- ${review.postedDateTime?if_exists}
- </td>
- <td>
- <#if review.userLoginId?has_content && postedPerson?has_content>
- <td>
- <#if postedPerson.firstName?has_content && postedPerson.lastName?has_content>
- ${postedPerson.firstName} ${postedPerson.lastName}
- <#else>
- ${postedPerson.groupName}
- </#if>
- </td>
- <#else>
- <td></td>
- </#if>
- </td>
- <td>
- <select name='postedAnonymous_o_${rowCount}'>
- <option value="${review.postedAnonymous?default("N")}">${review.postedAnonymous?default("N")}</option>
- <option value="${review.postedAnonymous?default("N")}">----</option>
- <option value="N">${uiLabelMap.CommonN}</option>
- <option value="Y">${uiLabelMap.CommonY}</option>
- </select>
- </td>
- <td>${review.getRelatedOne("Product", false).internalName?if_exists}<br /><a class="buttontext" href="<@o...@ofbizUrl>">${review.productId}</a></td>
- <td>
- <input type="text" size='3' name="productRating_o_${rowCount}" value="${review.productRating?if_exists?string}" />
- </td>
- <td>${review.getRelatedOne("StatusItem", false).get("description", locale)}</td>
- <td>
- <textarea name="productReview_o_${rowCount}" rows="5" cols="30" wrap="hard">${review.productReview?if_exists}</textarea>
- </td>
- <td align="right">
- <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');highlightRow(this,'review_tableRow_${rowCount}');" />
- </td>
- </tr>
- <#assign rowCount = rowCount + 1>
- <#-- toggle the row color -->
- <#if rowClass == "2">
- <#assign rowClass = "1">
- <#else>
- <#assign rowClass = "2">
- </#if>
- </#list>
- <input type="hidden" name="_rowCount" value="${rowCount}" />
- </table>
- </form>
- </#if>
- </div>
-</div>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/controller.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/controller.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/controller.xml Sat Aug 4 18:11:00 2012
@@ -149,35 +149,6 @@ under the License.
<security https="true" auth="true"/>
<response name="success" type="view" value="ViewFacilityInventoryByProductExport"/>
</request-map>
- <request-map uri="ViewFacilityInventoryHistoryReport">
- <security https="true" auth="true"/>
- <response name="success" type="view" value="ViewFacilityInventoryHistoryReport"/>
- </request-map>
- <request-map uri="RenderInventoryReportHtml">
- <security https="true" auth="true"/>
- <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy"/>
- <response name="success" type="view" value="RenderInventoryReportHtml"/>
- </request-map>
- <request-map uri="RenderInventoryReportPDF">
- <security https="true" auth="true"/>
- <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy"/>
- <response name="success" type="view" value="RenderInventoryReportPDF"/>
- </request-map>
- <request-map uri="RenderInventoryReportExcel">
- <security https="true" auth="true"/>
- <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy"/>
- <response name="success" type="view" value="RenderInventoryReportExcel"/>
- </request-map>
- <request-map uri="RenderInventoryReportMSWord">
- <security https="true" auth="true"/>
- <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy"/>
- <response name="success" type="view" value="RenderInventoryReportMSWord"/>
- </request-map>
- <request-map uri="RenderInventoryReportPPT">
- <security https="true" auth="true"/>
- <event type="groovy" path="component://product/webapp/facility/WEB-INF/actions/inventory/InventoryItemReport.groovy"/>
- <response name="success" type="view" value="RenderInventoryReportPPT"/>
- </request-map>
<request-map uri="FindFacilityTransfers">
<security https="true" auth="true"/>
@@ -1385,7 +1356,6 @@ under the License.
<view-map name="ViewFacilityInventoryByProductSimple" type="screen" page="component://product/widget/facility/FacilityScreens.xml#ViewFacilityInventoryByProductSimple"/>
<view-map name="ViewFacilityInventoryByProductReport" type="screenfop" page="component://product/widget/facility/FacilityScreens.xml#ViewFacilityInventoryByProductReport" content-type="application/pdf" encoding="none"/>
<view-map name="ViewFacilityInventoryByProductExport" type="screenxml" page="component://product/widget/facility/FacilityScreens.xml#ViewFacilityInventoryByProductReport" content-type="text/xml"/>
- <view-map name="ViewFacilityInventoryHistoryReport" type="screen" page="component://product/widget/facility/FacilityScreens.xml#ViewFacilityInventoryHistoryReport"/>
<view-map name="EditFacilityGroups" type="screen" page="component://product/widget/facility/FacilityScreens.xml#EditFacilityGroups"/>
<view-map name="EditFacilityParties" type="screen" page="component://product/widget/facility/FacilityScreens.xml#EditFacilityParties"/>
<view-map name="ViewContactMechs" type="screen" page="component://product/widget/facility/FacilityScreens.xml#ViewContactMechs"/>
@@ -1474,13 +1444,6 @@ under the License.
<view-map name="EditShipmentGatewayConfig" page="component://product//widget/facility/ShipmentGatewayConfigScreens.xml#EditShipmentGatewayConfig" type="screen"/>
<view-map name="FindShipmentGatewayConfigTypes" page="component://product//widget/facility/ShipmentGatewayConfigScreens.xml#FindShipmentGatewayConfigTypes" type="screen"/>
<view-map name="EditShipmentGatewayConfigType" page="component://product//widget/facility/ShipmentGatewayConfigScreens.xml#EditShipmentGatewayConfigType" type="screen"/>
-
- <!-- Export Report -->
- <view-map name="RenderInventoryReportHtml" type="birt" page="component://product/webapp/facility/inventory/report/InventoryReport.rptdesign" content-type="text/html"/>
- <view-map name="RenderInventoryReportPDF" type="birt" page="component://product/webapp/facility/inventory/report/InventoryReport.rptdesign" content-type="application/pdf"/>
- <view-map name="RenderInventoryReportExcel" type="birt" page="component://product/webapp/facility/inventory/report/InventoryReport.rptdesign" content-type="application/vnd.ms-excel"/>
- <view-map name="RenderInventoryReportMSWord" type="birt" page="component://product/webapp/facility/inventory/report/InventoryReport.rptdesign" content-type="application/vnd.ms-word"/>
- <view-map name="RenderInventoryReportPPT" type="birt" page="component://product/webapp/facility/inventory/report/InventoryReport.rptdesign" content-type="application/vnd.ms-powerpoint"/>
-
+
<!-- end of view mappings -->
</site-conf>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/web.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/web.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/webapp/facility/WEB-INF/web.xml Sat Aug 4 18:11:00 2012
@@ -44,11 +44,6 @@ under the License.
<param-value>component://product/widget/facility/CommonScreens.xml</param-value>
<description>The location of the CommonFacilityDecorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
</context-param>
- <context-param>
- <param-name>serviceReaderUrls</param-name>
- <param-value>/WEB-INF/services.xml</param-value>
- <description>Configuration File(s) For The Service Dispatcher</description>
- </context-param>
<filter>
<filter-name>ContextFilter</filter-name>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/CatalogMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/CatalogMenus.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/CatalogMenus.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/CatalogMenus.xml Sat Aug 4 18:11:00 2012
@@ -27,7 +27,7 @@ under the License.
<menu-item name="pricerules" title="${uiLabelMap.ProductPriceRules}"><link target="FindProductPriceRules"/></menu-item>
<menu-item name="store" title="${uiLabelMap.ProductStores}"><link target="FindProductStore"/></menu-item>
<menu-item name="thesaurus" title="${uiLabelMap.ProductThesaurus}"><link target="editKeywordThesaurus"/></menu-item>
- <menu-item name="reviews" title="${uiLabelMap.ProductReviews}"><link target="pendingReviews"/></menu-item>
+ <menu-item name="reviews" title="${uiLabelMap.ProductReviews}"><link target="FindReviews"/></menu-item>
<menu-item name="configs" title="${uiLabelMap.ProductConfigItems}"><link target="FindProductConfigItems"/></menu-item>
<menu-item name="Subscription" title="${uiLabelMap.ProductSubscriptions}"><link target="FindSubscription"/></menu-item>
<menu-item name="shipping" title="${uiLabelMap.ProductShipping}"><link target="ListShipmentMethodTypes"/></menu-item>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/CommonScreens.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/CommonScreens.xml Sat Aug 4 18:11:00 2012
@@ -376,36 +376,6 @@ under the License.
</widgets>
</section>
</screen>
- <!--#Bam# uiLabelDecorator : decorator for portlet, it's uiLabelDecorator of portlet Components which is call by portlet -->
- <screen name="portletUiLabelDecorator">
- <section><!-- Decorator use by portlet define in their preference label -->
- <actions>
- <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
- </actions>
- <widgets>
- <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <decorator-section-include name="body"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="uiLabelDecorator"><!-- Main decorator -->
- <section> <!-- labels define here are loading before portlet label (use for surcharge label definition)-->
- <actions>
- <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
- </actions>
- <widgets>
- <include-screen name="uiLabelDecorator" location="component://common/widget/CommonScreens.xml"/>
- <decorator-section-include name="body"/>
- </widgets>
- </section>
- </screen>
- <!--#Eam# uiLabelDecorator -->
<screen name="listMiniproduct">
<section>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/PriceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/PriceForms.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/PriceForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/PriceForms.xml Sat Aug 4 18:11:00 2012
@@ -94,11 +94,11 @@
</field>
<field name="condValueInput" title="${uiLabelMap.ProductValue}" entry-name="condValue"><text size="10"/></field>
<field name="condValue" title=" ">
- <drop-down allow-empty="false">
- <list-options list-name="productPriceRulesCondValues" key-name="condValue"/>
+ <drop-down allow-empty="false" current="selected">
+ <list-options list-name="productPriceRulesCondValues" key-name="condValue"/>
</drop-down>
</field>
- <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit/></field>
<field name="deleteLink" title=" " widget-style="buttontext" widget-area-style="align-text">
<hyperlink target="deleteProductPriceCond" description="${uiLabelMap.CommonRemove}">
<parameter param-name="productPriceRuleId" from-field="productPriceCond.productPriceRuleId"/>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/ProdCatalogForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/ProdCatalogForms.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/ProdCatalogForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/ProdCatalogForms.xml Sat Aug 4 18:11:00 2012
@@ -55,22 +55,6 @@ under the License.
<field name="catalogName" sort-field="true"><display/></field>
<field name="useQuickAdd" title="${uiLabelMap.ProductUseQuickAdd}" sort-field="true"><display/></field>
</form>
- <!-- form name="ListProdCatalog" list-name="listIt" target="" title="" type="list" paginate-target="FindProdCatalog"
- odd-row-style="alternate-row" default-table-style="basic-table hover-bar" header-row-style="header-row-2">
- <actions>
- <set field="parameters.sortField" from-field="parameters.sortField" default-value="prodCatalogId"/>
- <entity-and entity-name="ProdCatalog" use-cache="true" list="listIt">
- <order-by field-name="${parameters.sortField}"/>
- </entity-and>
- </actions>
- <field name="prodCatalogId" title="${uiLabelMap.ProductCatalogNameId}" widget-style="buttontext" sort-field="true">
- <hyperlink also-hidden="false" description="${prodCatalogId}" target="EditProdCatalog">
- <parameter param-name="prodCatalogId"/>
- </hyperlink>
- </field>
- <field name="catalogName" title="${uiLabelMap.ProductCatalogName}" sort-field="true"><display/></field>
- <field name="useQuickAdd" title="${uiLabelMap.ProductUseQuickAdd}" sort-field="true"><display/></field>
- </form-->
<form name="EditProdCatalog" type="single" target="updateProdCatalog" title="" default-map-name="prodCatalog"
header-row-style="header-row" default-table-style="basic-table" default-entity-name="ProdCatalog">
Modified: ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/ProductForms.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/ProductForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/ProductForms.xml Sat Aug 4 18:11:00 2012
@@ -2166,6 +2166,7 @@ under the License.
<field name="soldOrderQty" title="${uiLabelMap.ProductSoldQuantity}"><display/></field>
<field name="fromDate" title="${uiLabelMap.ProductDealStartDate}"><display/></field>
<field name="thruDate" title="${uiLabelMap.ProductDealEndDate}"><display/></field>
+ <field name="statusId" title="${uiLabelMap.CommonStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field>
<field name="editLink" use-when="${groovy: return reqOrderQty.compareTo(soldOrderQty)!= 0;}&&${groovy: return thruDate.compareTo(org.ofbiz.base.util.UtilDateTime.nowTimestamp()) == 1}" title=" " widget-style="buttontext">
<hyperlink target="EditProductGroupOrder" description="${uiLabelMap.CommonEdit}" also-hidden="false">
<parameter param-name="productId"/>
@@ -2183,6 +2184,7 @@ under the License.
<form name="CreateProductGroupOrder" type="single" target="createProductGroupOrder" title=""
header-row-style="header-row" default-table-style="basic-table">
<field name="productId"><hidden/></field>
+ <field name="statusId"><hidden value="GO_CREATED"/></field>
<field name="soldOrderQty"><hidden value="0"/></field>
<field name="reqOrderQty" title="${uiLabelMap.ProductDealQuantity}*"><text/></field>
<field name="fromDate" title="${uiLabelMap.ProductDealStartDate}*"><date-time/></field>
@@ -2194,6 +2196,7 @@ under the License.
header-row-style="header-row" default-table-style="basic-table">
<field name="groupOrderId"><hidden/></field>
<field name="productId"><hidden/></field>
+ <field name="statusId"><hidden/></field>
<field name="reqOrderQty" title="${uiLabelMap.ProductDealQuantity}*"><text/></field>
<field name="fromDate" title="${uiLabelMap.ProductDealStartDate}*"><date-time/></field>
<field name="thruDate" title="${uiLabelMap.ProductDealEndDate}*"><date-time/></field>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/ReviewScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/ReviewScreens.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/ReviewScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/widget/catalog/ReviewScreens.xml Sat Aug 4 18:11:00 2012
@@ -45,23 +45,24 @@ under the License.
</widgets>
</section>
</screen>
- <screen name="pendingReviews">
+
+ <screen name="FindReviews">
<section>
<actions>
- <set field="titleProperty" value="ProductReviewsPendingApproval"/>
+ <set field="titleProperty" value="ProductReviews"/>
<set field="headerItem" value="reviews"/>
-
- <entity-condition entity-name="ProductReview" list="pendingReviews">
- <condition-expr field-name="statusId" value="PRR_PENDING"/>
- <order-by field-name="+postedDateTime"/>
- </entity-condition>
</actions>
<widgets>
<decorator-screen name="CommonReviewDecorator">
<decorator-section name="body">
- <platform-specific>
- <html><html-template location="component://product/webapp/catalog/reviews/pendingReviews.ftl"/></html>
- </platform-specific>
+ <decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
+ <decorator-section name="search-options">
+ <include-form name="FindReviews" location="component://product/widget/catalog/ReviewForms.xml"/>
+ </decorator-section>
+ <decorator-section name="search-results">
+ <include-form name="ListReviews" location="component://product/widget/catalog/ReviewForms.xml"/>
+ </decorator-section>
+ </decorator-screen>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/widget/facility/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/widget/facility/CommonScreens.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/widget/facility/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/widget/facility/CommonScreens.xml Sat Aug 4 18:11:00 2012
@@ -184,36 +184,6 @@ under the License.
</widgets>
</section>
</screen>
- <!--#Bam# uiLabelDecorator : decorator for portlet, it's uiLabelDecorator of portlet Components which is call by portlet -->
- <screen name="portletUiLabelDecorator">
- <section><!-- Decorator use by portlet define in their preference label -->
- <actions>
- <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
- </actions>
- <widgets>
- <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <decorator-section-include name="body"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="uiLabelDecorator"><!-- Main decorator -->
- <section> <!-- labels define here are loading before portlet label (use for surcharge label definition)-->
- <actions>
- <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
- </actions>
- <widgets>
- <include-screen name="uiLabelDecorator" location="component://common/widget/CommonScreens.xml"/>
- <decorator-section-include name="body"/>
- </widgets>
- </section>
- </screen>
- <!--#Eam# uiLabelDecorator -->
</screens>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/widget/facility/FacilityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/widget/facility/FacilityForms.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/widget/facility/FacilityForms.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/widget/facility/FacilityForms.xml Sat Aug 4 18:11:00 2012
@@ -853,35 +853,6 @@ under the License.
<submit/>
</field>
</form>
-
- <form name="ViewFacilityInventoryHistoryReportForm" extends="FindFacilityInventoryByProduct" target="RenderInventoryReportHtml" target-window="_BLANK">
- <field name="facilityId"><hidden/></field>
- <field name="productId"><hidden/></field>
- <field name="internalName"><hidden/></field>
- <field name="productTypeId"><hidden/></field>
- <field name="searchInProductCategoryId"><hidden/></field>
- <field name="productSupplierId"><hidden/></field>
- <field name="statusId"><hidden/></field>
- <field name="productsSoldThruTimestamp"><hidden/></field>
- <field name="VIEW_SIZE"><hidden/></field>
- <field name="monthsInPastLimit"><hidden/></field>
- <field name="fromDateSellThrough"><hidden/></field>
- <field name="thruDateSellThrough"><hidden/></field>
- <field name="offsetQOHQty"><hidden/></field>
- <field name="offsetATPQty"><hidden/></field>
- <field name="lastIntMonth" title="Number of last month to sold out"><text size="15" default-value="0"></text></field>
- <field name="contentType" action="document.ViewFacilityInventoryHistoryReportForm.action=this.value" event="onchange">
- <drop-down allow-empty="false" >
- <option key="RenderInventoryReportHtml" description="HTML"/>
- <option key="RenderInventoryReportPDF" description="PDF"/>
- <!--option key="RenderInventoryReportExcel" description="MS-Excel"/>
- <option key="RenderInventoryReportMSWord" description="MS-Word"/>
- <option key="RenderInventoryReportPPT" description="MS-Powerpoint"/-->
- </drop-down>
- </field>
- <field name="submitButton"><hidden/></field>
- <field name="report" title="Export Report" widget-style="smallSubmit"><submit button-type="button"/></field>
- </form>
<!--Facility Content-->
<form name="AddFacilityContent" type="upload" focus-field-name="contentId"
Modified: ofbiz/branches/20120329_portletWidget/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/widget/facility/FacilityScreens.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/widget/facility/FacilityScreens.xml Sat Aug 4 18:11:00 2012
@@ -1473,33 +1473,6 @@ under the License.
</widgets>
</section>
</screen>
-
- <screen name="ViewFacilityInventoryHistoryReport">
- <section>
- <actions>
- <set field="headerItem" value="reports"/>
- <set field="facilityId" from-field="parameters.facilityId"/>
- <entity-one entity-name="Facility" value-field="facility" use-cache="true"/>
- </actions>
- <widgets>
- <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <container>
- <label style="h1" text="${uiLabelMap.ProductInventoryByProduct} ${uiLabelMap.CommonFor} ${facility.facilityName}"/>
- </container>
- <container>
- <link target="ViewFacilityInventoryByProductReport?facilityId=${parameters.facilityId}" text="${uiLabelMap.CommonPrint}" style="buttontext"/>
- <link target="ViewFacilityInventoryByProductExport?facilityId=${parameters.facilityId}" text="${uiLabelMap.CommonExport}" style="buttontext"/>
- <link target="ViewFacilityInventoryHistoryReport?facilityId=${parameters.facilityId}" text="${uiLabelMap.FacilityInventoryHistoryReport}" style="buttontext"/>
- </container>
- <screenlet title="${uiLabelMap.FacilityInventoryHistoryReport}">
- <include-form name="ViewFacilityInventoryHistoryReportForm" location="component://product/widget/facility/FacilityForms.xml"/>
- </screenlet>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
<screen name="EditFacilityContent">
<section>
Modified: ofbiz/branches/20120329_portletWidget/applications/product/widget/facility/ReportScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/product/widget/facility/ReportScreens.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/product/widget/facility/ReportScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/product/widget/facility/ReportScreens.xml Sat Aug 4 18:11:00 2012
@@ -56,7 +56,6 @@ under the License.
<container>
<link target="ViewFacilityInventoryByProductReport?${searchParameterString}" text="${uiLabelMap.CommonPrint}" style="buttontext"/>
<link target="ViewFacilityInventoryByProductExport?${searchParameterString}" text="${uiLabelMap.CommonExport}" style="buttontext"/>
- <link target="ViewFacilityInventoryHistoryReport?${searchParameterString}" text="${uiLabelMap.FacilityInventoryHistoryReport}" style="buttontext"/>
</container>
<screenlet title="${uiLabelMap.PageTitleFindFacilityInventoryItemsByProduct}">
<include-form name="FindFacilityInventoryByProduct" location="component://product/widget/facility/FacilityForms.xml"/>
Modified: ofbiz/branches/20120329_portletWidget/applications/securityext/ofbiz-component.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/securityext/ofbiz-component.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/securityext/ofbiz-component.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/securityext/ofbiz-component.xml Sat Aug 4 18:11:00 2012
@@ -26,5 +26,4 @@ under the License.
<classpath type="dir" location="config"/>
<entity-resource type="data" reader-name="demo" loader="main" location="data/UserDemoData.xml"/>
<service-resource type="model" loader="main" location="servicedef/services.xml"/>
- <test-suite loader="main" location="testdef/securitytests.xml"/>
</ofbiz-component>
Modified: ofbiz/branches/20120329_portletWidget/applications/securityext/servicedef/services.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/securityext/servicedef/services.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/securityext/servicedef/services.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/securityext/servicedef/services.xml Sat Aug 4 18:11:00 2012
@@ -36,23 +36,4 @@ under the License.
<attribute name="alias" type="String" mode="IN" optional="false"/>
</service>
- <!-- authorization dynamic access implementation API -->
- <service name="dynamicAccessInterface" engine="interface">
- <description>Service interface for implementing Dynamic Access as a service</description>
- <attribute name="userId" type="String" mode="IN" optional="false"/>
- <attribute name="permission" type="String" mode="IN" optional="false"/>
- <attribute name="accessString" type="String" mode="IN" optional="false"/>
- <attribute name="permissionContext" type="Map" mode="IN" optional="true"/>
- <attribute name="permissionGranted" type="Boolean" mode="OUT" optional="false"/>
- </service>
-
- <!-- dynamic access test service -->
- <service name="dynamicAccessTestService" engine="simple" auth="false"
- location="component://securityext/testdef/da/DynamicAccessTest.xml" invoke="testDa">
- <implements service="dynamicAccessInterface"/>
- </service>
- <service name="dynamicAccessRecursiveTest" engine="simple" auth="false"
- location="component://securityext/testdef/da/DynamicAccessTest.xml" invoke="testDaRecursion">
- <implements service="dynamicAccessInterface"/>
- </service>
</services>
Modified: ofbiz/branches/20120329_portletWidget/applications/workeffort/webapp/workeffort/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/workeffort/webapp/workeffort/WEB-INF/web.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/workeffort/webapp/workeffort/WEB-INF/web.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/workeffort/webapp/workeffort/WEB-INF/web.xml Sat Aug 4 18:11:00 2012
@@ -35,11 +35,6 @@ under the License.
<description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
</context-param>
<context-param>
- <param-name>serviceReaderUrls</param-name>
- <param-value>/WEB-INF/services.xml</param-value>
- <description>Configuration File(s) For The Service Dispatcher</description>
- </context-param>
- <context-param>
<param-name>scriptLocationPath</param-name>
<param-value>/WEB-INF/bsh</param-value>
<description>BeanShell Script Location</description>
Modified: ofbiz/branches/20120329_portletWidget/applications/workeffort/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/applications/workeffort/widget/CommonScreens.xml?rev=1369382&r1=1369381&r2=1369382&view=diff
==============================================================================
--- ofbiz/branches/20120329_portletWidget/applications/workeffort/widget/CommonScreens.xml (original)
+++ ofbiz/branches/20120329_portletWidget/applications/workeffort/widget/CommonScreens.xml Sat Aug 4 18:11:00 2012
@@ -193,38 +193,4 @@ under the License.
</widgets>
</section>
</screen>
- <!--#Bam# uiLabelDecorator : decorator for portlet, it's uiLabelDecorator of portlet Components which is call by portlet -->
- <screen name="portletUiLabelDecorator">
- <section><!-- Decorator use by portlet define in their preference label -->
- <actions>
- <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="ManufacturingUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
- <property-map resource="TemporalExpressionUiLabels" map-name="uiLabelMap" global="true"/>
- </actions>
- <widgets>
- <decorator-screen name="uiLabelDecorator" location="${parameters.mainDecoratorLocation}">
- <decorator-section name="body">
- <decorator-section-include name="body"/>
- </decorator-section>
- </decorator-screen>
- </widgets>
- </section>
- </screen>
- <screen name="uiLabelDecorator"><!-- Main decorator -->
- <section> <!-- labels define here are loading before portlet label (use for surcharge label definition)-->
- <actions>
- <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
- </actions>
- <widgets>
- <include-screen name="uiLabelDecorator" location="component://common/widget/CommonScreens.xml"/>
- <decorator-section-include name="body"/>
- </widgets>
- </section>
- </screen>
- <!--#Eam# uiLabelDecorator -->
</screens>