You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2010/10/28 14:11:25 UTC
svn commit: r1028269 [2/4] - in /ofbiz/branches/jquery: ./
applications/accounting/config/ applications/accounting/data/
applications/accounting/src/org/ofbiz/accounting/tax/
applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/
applicati...
Propchange: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 28 12:11:23 2010
@@ -1,3 +1,3 @@
/ofbiz/branches/addbirt/applications/product/script/org/ofbiz/shipment/test/FacilityTests.xml:831210-885099,885686-886087
/ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:921280-927264
-/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-1024561
+/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-1028265
Modified: ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/product/ProductContentWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/product/ProductContentWrapper.java?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/product/ProductContentWrapper.java (original)
+++ ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/product/ProductContentWrapper.java Thu Oct 28 12:11:23 2010
@@ -184,7 +184,7 @@ public class ProductContentWrapper imple
Map<String, Object> inContext = FastMap.newInstance();
inContext.put("product", product);
inContext.put("productContent", productContent);
- ContentWorker.renderContentAsText(dispatcher, delegator, productContent.getString("contentId"), outWriter, inContext, locale, mimeTypeId, partyId, roleTypeId, false);
+ ContentWorker.renderContentAsText(dispatcher, delegator, productContent.getString("contentId"), outWriter, inContext, locale, mimeTypeId, partyId, roleTypeId, true);
}
}
}
Modified: ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/product/ProductPromoContentWrapper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/product/ProductPromoContentWrapper.java?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/product/ProductPromoContentWrapper.java (original)
+++ ofbiz/branches/jquery/applications/product/src/org/ofbiz/product/product/ProductPromoContentWrapper.java Thu Oct 28 12:11:23 2010
@@ -175,7 +175,7 @@ public class ProductPromoContentWrapper
exprs.add(EntityCondition.makeCondition("productPromoContentTypeId", EntityOperator.EQUALS, productPromoContentTypeId));
List<String> orderBy = UtilMisc.toList("-fromDate");
- List<GenericValue> productPromoContentList = delegator.findList("ProductPromoContent", EntityCondition.makeCondition(exprs, EntityOperator.AND), null, orderBy, null, false);
+ List<GenericValue> productPromoContentList = delegator.findList("ProductPromoContent", EntityCondition.makeCondition(exprs, EntityOperator.AND), null, orderBy, null, true);
GenericValue productPromoContent = null;
if (UtilValidate.isNotEmpty(productPromoContentList)) {
productPromoContent = EntityUtil.getFirst(EntityUtil.filterByDate(productPromoContentList));
@@ -186,7 +186,7 @@ public class ProductPromoContentWrapper
Map<String, Object> inContext = FastMap.newInstance();
inContext.put("productPromo", productPromo);
inContext.put("productPromoContent", productPromoContent);
- ContentWorker.renderContentAsText(dispatcher, delegator, productPromoContent.getString("contentId"), outWriter, inContext, locale, mimeTypeId, partyId, roleTypeId, false);
+ ContentWorker.renderContentAsText(dispatcher, delegator, productPromoContent.getString("contentId"), outWriter, inContext, locale, mimeTypeId, partyId, roleTypeId, true);
}
}
}
Modified: ofbiz/branches/jquery/applications/product/webapp/facility/facility/FindFacilityLocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/facility/FindFacilityLocation.ftl?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/facility/facility/FindFacilityLocation.ftl (original)
+++ ofbiz/branches/jquery/applications/product/webapp/facility/facility/FindFacilityLocation.ftl Thu Oct 28 12:11:23 2010
@@ -18,8 +18,8 @@ under the License.
-->
<div class="button-bar">
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacility}</a>
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacilityLocation}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext create">${uiLabelMap.ProductNewFacility}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext create">${uiLabelMap.ProductNewFacilityLocation}</a>
</div>
<form action="<@o...@ofbizUrl>" method="get" name="findFacilityLocation">
Modified: ofbiz/branches/jquery/applications/product/webapp/facility/inventory/receiveInventory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/inventory/receiveInventory.ftl?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/webapp/facility/inventory/receiveInventory.ftl (original)
+++ ofbiz/branches/jquery/applications/product/webapp/facility/inventory/receiveInventory.ftl Thu Oct 28 12:11:23 2010
@@ -24,7 +24,7 @@ under the License.
<div class="errorMessage">${invalidProductId}</div>
</#if>
<div class="button-bar">
- <a href="<@o...@ofbizUrl>" class="buttontext">${uiLabelMap.ProductNewFacility}</a>
+ <a href="<@o...@ofbizUrl>" class="buttontext create">${uiLabelMap.ProductNewFacility}</a>
</div>
<#-- Receiving Results -->
<#if receivedItems?has_content>
Modified: ofbiz/branches/jquery/applications/product/widget/facility/FacilityGroupScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/facility/FacilityGroupScreens.xml?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/widget/facility/FacilityGroupScreens.xml (original)
+++ ofbiz/branches/jquery/applications/product/widget/facility/FacilityGroupScreens.xml Thu Oct 28 12:11:23 2010
@@ -31,8 +31,8 @@ under the License.
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleFindFacilityGroup}">
- <container>
- <link target="EditFacilityGroup" text="${uiLabelMap.ProductNewGroup}" style="buttontext"/>
+ <container style="button-bar">
+ <link target="EditFacilityGroup" text="${uiLabelMap.ProductNewGroup}" style="buttontext create"/>
</container>
<include-form name="FindFacilityGroup" location="component://product/widget/facility/FacilityGroupForms.xml"/>
</screenlet>
@@ -50,16 +50,22 @@ under the License.
</actions>
<widgets>
<decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+ <decorator-section name="pre-body">
+ <section>
+ <condition>
+ <if-has-permission permission="FACILITY" action="_VIEW"/>
+ </condition>
+ <widgets>
+ <include-menu name="FacilityGroupTabBar" location="component://product/widget/facility/FacilityMenus.xml"/>
+ </widgets>
+ </section>
+ </decorator-section>
<decorator-section name="body">
<section>
<condition>
<if-has-permission permission="FACILITY" action="_VIEW"/>
</condition>
<widgets>
- <platform-specific>
- <html><html-template location="component://product/webapp/facility/group/FacilityGroupTabBar.ftl"/></html>
- </platform-specific>
-
<decorator-section-include name="body"/>
</widgets>
<fail-widgets>
@@ -83,8 +89,8 @@ under the License.
<decorator-screen name="CommonFacilityGroupDecorator">
<decorator-section name="body">
<screenlet title="${uiLabelMap.PageTitleEditFacilityGroup}">
- <container>
- <link target="EditFacilityGroup" text="${uiLabelMap.CommonNew}" style="buttontext"/>
+ <container style="button-bar">
+ <link target="EditFacilityGroup" text="${uiLabelMap.CommonNew}" style="buttontext create"/>
</container>
<include-form name="EditFacilityGroup" location="component://product/widget/facility/FacilityGroupForms.xml"/>
</screenlet>
@@ -110,7 +116,9 @@ under the License.
<label style="h1">${uiLabelMap.ProductFacilities} ${uiLabelMap.CommonFor} ${facilityGroup.facilityGroupName} [${facilityGroup.facilityGroupId}]</label>
</container>
<screenlet id="AddFacilityGroupMemberPanel" title="${uiLabelMap.ProductAddFacilityGroupMember}" collapsible="true">
- <link target="EditFacilityGroup" text="${uiLabelMap.ProductNewGroup}" style="buttontext"/>
+ <container style="button-bar">
+ <link target="EditFacilityGroup" text="${uiLabelMap.ProductNewGroup}" style="buttontext create"/>
+ </container>
<include-form name="AddFacilityGroupMember" location="component://product/widget/facility/FacilityGroupForms.xml"/>
</screenlet>
<include-form name="UpdateFacilityGroupMembers" location="component://product/widget/facility/FacilityGroupForms.xml"/>
@@ -133,7 +141,9 @@ under the License.
<decorator-section name="body">
<label style="h1">${uiLabelMap.PartyRoles} ${uiLabelMap.CommonFor} ${facilityGroup.facilityGroupName} [${facilityGroup.facilityGroupId}]</label>
<screenlet id="AddFacilityGroupRolePanel" title="${uiLabelMap.ProductAddFacilityGroupPartyRole}" collapsible="true">
- <link target="EditFacilityGroup" text="${uiLabelMap.ProductNewGroup}" style="buttontext"/>
+ <container style="button-bar">
+ <link target="EditFacilityGroup" text="${uiLabelMap.ProductNewGroup}" style="buttontext create"/>
+ </container>
<include-form name="AddFacilityGroupRole" location="component://product/widget/facility/FacilityGroupForms.xml"/>
</screenlet>
<include-form name="UpdateFacilityGroupRoles" location="component://product/widget/facility/FacilityGroupForms.xml"/>
@@ -160,7 +170,9 @@ under the License.
<decorator-section name="body">
<container><label style="h1">${uiLabelMap.ProductRollups} ${uiLabelMap.CommonFor} ${facilityGroup.facilityGroupName} [${facilityGroup.facilityGroupId}]</label></container>
<screenlet id="AddFacilityGroupRollupFromPanel" title="${uiLabelMap.PageTitleAddFacilityGroupRollup}" collapsible="true">
- <link target="EditFacilityGroup" text="${uiLabelMap.ProductNewGroup}" style="buttontext"/>
+ <container style="button-bar">
+ <link target="EditFacilityGroup" text="${uiLabelMap.ProductNewGroup}" style="buttontext create"/>
+ </container>
<include-form name="AddFacilityGroupRollupFrom" location="component://product/widget/facility/FacilityGroupForms.xml"/>
</screenlet>
<include-form name="UpdateFacilityGroupRollupTo" location="component://product/widget/facility/FacilityGroupForms.xml"/>
Modified: ofbiz/branches/jquery/applications/product/widget/facility/FacilityMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/facility/FacilityMenus.xml?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/widget/facility/FacilityMenus.xml (original)
+++ ofbiz/branches/jquery/applications/product/widget/facility/FacilityMenus.xml Thu Oct 28 12:11:23 2010
@@ -252,4 +252,27 @@ under the License.
</link>
</menu-item>
</menu>
+
+ <menu name="FacilityGroupTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+ <menu-item name="EditFacilityGroup" title="${uiLabelMap.ProductFacilityGroup}">
+ <link target="EditFacilityGroup">
+ <parameter param-name="facilityGroupId" from-field="facilityGroupId"/>
+ </link>
+ </menu-item>
+ <menu-item name="EditFacilityGroupRollup" title="${uiLabelMap.ProductRollups}">
+ <link target="EditFacilityGroupRollup">
+ <parameter param-name="facilityGroupId" from-field="facilityGroupId"/>
+ </link>
+ </menu-item>
+ <menu-item name="EditFacilityGroupMembers" title="${uiLabelMap.ProductFacilities}">
+ <link target="EditFacilityGroupMembers">
+ <parameter param-name="facilityGroupId" from-field="facilityGroupId"/>
+ </link>
+ </menu-item>
+ <menu-item name="EditFacilityGroupRoles" title="${uiLabelMap.PartyRoles}">
+ <link target="EditFacilityGroupRoles">
+ <parameter param-name="facilityGroupId" from-field="facilityGroupId"/>
+ </link>
+ </menu-item>
+ </menu>
</menus>
Modified: ofbiz/branches/jquery/applications/product/widget/facility/FacilityScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/facility/FacilityScreens.xml?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/widget/facility/FacilityScreens.xml (original)
+++ ofbiz/branches/jquery/applications/product/widget/facility/FacilityScreens.xml Thu Oct 28 12:11:23 2010
@@ -177,7 +177,7 @@ under the License.
</condition>
<widgets>
<container style="button-bar">
- <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext"/>
+ <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext create"/>
<link target="/workeffort/control/calendar" text="${uiLabelMap.CommonViewCalendar}" style="buttontext" url-mode="inter-app">
<parameter param-name="facilityId"/>
<parameter param-name="externalLoginKey" from-field="parameters.externalLoginKey"/>
@@ -360,11 +360,11 @@ under the License.
<decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="menu-bar">
<container style="button-bar">
- <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext"/>
- <link target="EditInventoryItem" text="${uiLabelMap.ProductNewInventoryItem}" style="buttontext">
+ <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext create"/>
+ <link target="EditInventoryItem" text="${uiLabelMap.ProductNewInventoryItem}" style="buttontext create">
<parameter param-name="facilityId" from-field="parameters.facilityId"/>
</link>
- <link target="SearchInventoryItemsByLabels" text="${uiLabelMap.ProductSearchInventoryItemsByLabels}" style="buttontext">
+ <link target="SearchInventoryItemsByLabels" text="${uiLabelMap.ProductSearchInventoryItemsByLabels}" style="buttontext search">
<parameter param-name="facilityId" from-field="parameters.facilityId"/>
</link>
</container>
@@ -565,8 +565,8 @@ under the License.
<container>
<label style="h1">${uiLabelMap.ProductInventoryItemsDetailsFor} ${facility.facilityName} [${uiLabelMap.CommonId}:${facility.facilityId}]</label>
</container>
- <container>
- <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext"/>
+ <container style="button-bar">
+ <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext create"/>
</container>
<screenlet title="${uiLabelMap.PageTitleViewFacilityInventoryItemsDetails}">
<include-form name="SearchInventoryItemsDetailsParams" location="component://product/widget/facility/FacilityForms.xml"/>
@@ -729,7 +729,7 @@ under the License.
<label>${title}</label>
</container>
<container style="button-bar">
- <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext"/>
+ <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext create"/>
</container>
<screenlet id="add-facility-group-member" title="${uiLabelMap.ProductAddFacilityGroupMember}" collapsible="true">
<include-form name="addGroupToFacility" location="component://product/widget/facility/FacilityForms.xml"/>
@@ -763,7 +763,7 @@ under the License.
<label>${title}</label>
</container>
<container style="button-bar">
- <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext"/>
+ <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext create"/>
</container>
<screenlet id="add-facility-party-role" title="${uiLabelMap.ProductAddFacilityPartyRole}" collapsible="true">
<include-form name="AddPartyToFacility" location="component://product/widget/facility/FacilityForms.xml"/>
@@ -789,8 +789,8 @@ under the License.
<decorator-screen name="CommonFacilityDecorator" location="${parameters.commonFacilityDecoratorLocation}">
<decorator-section name="body">
<label style="h1">${title}</label>
- <container>
- <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext"/>
+ <container style="button-bar">
+ <link target="EditFacility" text="${uiLabelMap.ProductNewFacility}" style="buttontext create"/>
<section>
<condition>
<not><if-empty field="facilityId"/></not>
@@ -806,7 +806,7 @@ under the License.
<if-service-permission service-name="facilityGenericPermission" main-action="CREATE"/>
</condition>
<widgets>
- <link target="EditContactMech" text="${uiLabelMap.ProductNewContactMech}" style="buttontext">
+ <link target="EditContactMech" text="${uiLabelMap.ProductNewContactMech}" style="buttontext create">
<parameter param-name="facilityId"/>
</link>
</widgets>
Modified: ofbiz/branches/jquery/applications/product/widget/facility/InventoryItemLabelScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/facility/InventoryItemLabelScreens.xml?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/widget/facility/InventoryItemLabelScreens.xml (original)
+++ ofbiz/branches/jquery/applications/product/widget/facility/InventoryItemLabelScreens.xml Thu Oct 28 12:11:23 2010
@@ -32,8 +32,8 @@ under the License.
<widgets>
<decorator-screen name="CommonInventoryItemLabelsDecorator" location="${parameters.commonFacilityDecoratorLocation}">
<decorator-section name="body">
- <container>
- <link target="EditInventoryItemLabel" text="${uiLabelMap.CommonNew}" style="buttontext"/>
+ <container style="button-bar">
+ <link target="EditInventoryItemLabel" text="${uiLabelMap.CommonNew}" style="buttontext create"/>
</container>
<screenlet title="${uiLabelMap.PageTitleFindInventoryItemLabels}">
<include-form name="ListInventoryItemLabels" location="component://product/widget/facility/InventoryItemLabelForms.xml"/>
Modified: ofbiz/branches/jquery/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml?rev=1028269&r1=1028268&r2=1028269&view=diff
==============================================================================
--- ofbiz/branches/jquery/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml (original)
+++ ofbiz/branches/jquery/applications/product/widget/facility/ShipmentGatewayConfigScreens.xml Thu Oct 28 12:11:23 2010
@@ -24,7 +24,7 @@ under the License.
<screen name="GenericShipmentGatewayConfigDecorator">
<section>
<actions>
- <set field="headerItem" value="shipmentGatewayConfig"/>
+ <set field="headerItem" value="ShipmentGatewayConfig"/>
</actions>
<widgets>
<!-- main defines the regions of the HTML page -->