svn commit: r999327 [1/3] - in /ofbiz/branches/jquery: ./ applications/commonext/data/he
Locked
svn commit: r999327 [1/3] - in /ofbiz/branches/jquery: ./ applications/commonext/data/he
 
|
Author: jleroux
Date: Tue Sep 21 11:36:01 2010 New Revision: 999327 URL: http://svn.apache.org/viewvc?rev=999327&view=rev Log: Merges the trunk at r998747 number of conflicts resolved by hand. I did not test the inputField change in getDependentDropdownValues.js yet (I need to integrate the new Price Rules screen in trunk and merge it before...) Added: ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/PortalPageWorker.java - copied unchanged from r999128, ofbiz/trunk/framework/widget/src/org/ofbiz/widget/PortalPageWorker.java ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/PortalPageWorkerInterface.java - copied unchanged from r999128, ofbiz/trunk/framework/widget/src/org/ofbiz/widget/PortalPageWorkerInterface.java ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/WidgetPortalPageWorker.java - copied unchanged from r999128, ofbiz/trunk/framework/widget/src/org/ofbiz/widget/WidgetPortalPageWorker.java ofbiz/branches/jquery/tools/If-ant.py - copied unchanged from r999128, ofbiz/trunk/tools/If-ant.py Removed: ofbiz/branches/jquery/tools/src/org/ofbiz/tools/ant/IfTask.java Modified: ofbiz/branches/jquery/ (props changed) ofbiz/branches/jquery/ant ofbiz/branches/jquery/ant.bat ofbiz/branches/jquery/applications/commonext/data/helpdata/HELP_SETUP.xml ofbiz/branches/jquery/applications/content/widget/content/ContentForms.xml ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed) ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/OrderShippingInfo.js ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/geoAutoCompleter.js ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/return.js ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderViewScreens.xml ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed) ofbiz/branches/jquery/applications/party/widget/partymgr/PartyForms.xml ofbiz/branches/jquery/applications/party/widget/partymgr/SecurityForms.xml ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/price/PriceServices.xml ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed) ofbiz/branches/jquery/applications/product/servicedef/services_pricepromo.xml ofbiz/branches/jquery/applications/product/servicedef/services_shipment.xml ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/packing/PackingServices.java ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.groovy ofbiz/branches/jquery/applications/product/webapp/facility/shipment/PackOrder.ftl ofbiz/branches/jquery/applications/workeffort/entitydef/entitymodel.xml ofbiz/branches/jquery/build.xml ofbiz/branches/jquery/common.xml ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilDateTime.java ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilIO.java ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml ofbiz/branches/jquery/framework/common/servicedef/services.xml ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/portal-controller.xml ofbiz/branches/jquery/framework/common/webcommon/includes/setCountryStatesEventJs.ftl ofbiz/branches/jquery/framework/common/webcommon/portal/editPortalPage.ftl ofbiz/branches/jquery/framework/common/webcommon/portal/listPortalPortlets.ftl ofbiz/branches/jquery/framework/common/webcommon/portal/portalPageHeader.ftl ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml (props changed) ofbiz/branches/jquery/framework/common/widget/PortalPageForms.xml ofbiz/branches/jquery/framework/common/widget/PortalPageScreens.xml ofbiz/branches/jquery/framework/common/widget/PortletEditForms.xml ofbiz/branches/jquery/framework/example/config/ExampleUiLabels.xml ofbiz/branches/jquery/framework/example/data/ExamplePortalSeedData.xml ofbiz/branches/jquery/framework/example/webapp/example/WEB-INF/controller.xml ofbiz/branches/jquery/framework/example/widget/example/ExampleMenus.xml ofbiz/branches/jquery/framework/example/widget/example/ExampleScreens.xml ofbiz/branches/jquery/framework/example/widget/example/PortletEditForms.xml ofbiz/branches/jquery/framework/example/widget/example/PortletScreens.xml ofbiz/branches/jquery/framework/images/webapp/images/getDependentDropdownValues.js ofbiz/branches/jquery/framework/images/webapp/images/selectall.js ofbiz/branches/jquery/framework/webapp/src/org/ofbiz/webapp/ftl/FreeMarkerViewHandler.java ofbiz/branches/jquery/framework/webslinger/webapp/webslinger/WEB-INF/web.xml ofbiz/branches/jquery/framework/webtools/config/WebtoolsUiLabels.xml ofbiz/branches/jquery/framework/webtools/webapp/webtools/WEB-INF/controller.xml ofbiz/branches/jquery/framework/webtools/widget/PortalAdmForms.xml ofbiz/branches/jquery/framework/webtools/widget/PortalAdmScreens.xml ofbiz/branches/jquery/framework/widget/dtd/widget-screen.xsd ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/fo/FoScreenRenderer.java ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/MacroScreenRenderer.java ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/ModelScreenWidget.java ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/screen/ScreenStringRenderer.java ofbiz/branches/jquery/framework/widget/src/org/ofbiz/widget/text/TextScreenRenderer.java ofbiz/branches/jquery/framework/widget/templates/htmlFormMacroLibrary.ftl ofbiz/branches/jquery/framework/widget/templates/htmlScreenMacroLibrary.ftl ofbiz/branches/jquery/macros.xml ofbiz/branches/jquery/specialpurpose/ebaystore/lib/ (props changed) ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/images/checkoutProcess.js ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/images/productAdditionalView.js ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/images/profile.js ofbiz/branches/jquery/specialpurpose/ecommerce/webapp/ecommerce/images/quickAnonCustSettings.js ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed) ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed) ofbiz/branches/jquery/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed) ofbiz/branches/jquery/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml ofbiz/branches/jquery/specialpurpose/webpos/webapp/webpos/images/js/SearchProducts.js ofbiz/branches/jquery/themes/bizznesstime/includes/header.ftl ofbiz/branches/jquery/themes/bizznesstime/includes/messages.ftl ofbiz/branches/jquery/themes/bizznesstime/webapp/bizznesstime/css/style.css ofbiz/branches/jquery/themes/bluelight/includes/header.ftl ofbiz/branches/jquery/themes/bluelight/webapp/bluelight/style.css ofbiz/branches/jquery/themes/droppingcrumbs/includes/header.ftl ofbiz/branches/jquery/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css ofbiz/branches/jquery/themes/droppingcrumbs/webapp/droppingcrumbs/js/application.js ofbiz/branches/jquery/themes/flatgrey/includes/header.ftl ofbiz/branches/jquery/themes/flatgrey/webapp/flatgrey/maincss.css ofbiz/branches/jquery/themes/multiflex/includes/header.ftl ofbiz/branches/jquery/themes/multiflex/webapp/multiflex/style.css ofbiz/branches/jquery/themes/tomahawk/includes/appbarClose.ftl ofbiz/branches/jquery/themes/tomahawk/includes/header.ftl ofbiz/branches/jquery/themes/tomahawk/webapp/tomahawk/css/style.css Propchange: ofbiz/branches/jquery/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 21 11:36:01 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:951708-996840 +/ofbiz/trunk:951708-999128 Modified: ofbiz/branches/jquery/ant URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/ant?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/ant (original) +++ ofbiz/branches/jquery/ant Tue Sep 21 11:36:01 2010 @@ -25,8 +25,8 @@ else JAVA=java fi +top="$(cd "$(dirname "$0")"; echo "$PWD")" find_jar() { - top="$(cd "$(dirname "$0")"; echo "$PWD")" set -- "$top"/framework/base/lib/ant-launcher-*.jar if [ $# = 1 ] && [ -e "$1" ]; then echo "$1" @@ -35,5 +35,5 @@ find_jar() { exit 1 fi } -"$JAVA" -jar "$(find_jar)" "$@" +"$JAVA" -jar "$(find_jar)" -lib "$top/framework/base/lib/ant" "$@" Modified: ofbiz/branches/jquery/ant.bat URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/ant.bat?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/ant.bat (original) +++ ofbiz/branches/jquery/ant.bat Tue Sep 21 11:36:01 2010 @@ -19,5 +19,5 @@ REM # under the License. REM ##################################################################### ECHO ON -"%JAVA_HOME%\bin\java" -jar framework/base/lib/ant-launcher-1.7.1.jar %1 %2 %3 %4 %5 %6 +"%JAVA_HOME%\bin\java" -jar framework/base/lib/ant-launcher-1.7.1.jar -lib framework/base/lib/ant %1 %2 %3 %4 %5 %6 Modified: ofbiz/branches/jquery/applications/commonext/data/helpdata/HELP_SETUP.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/commonext/data/helpdata/HELP_SETUP.xml?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/commonext/data/helpdata/HELP_SETUP.xml (original) +++ ofbiz/branches/jquery/applications/commonext/data/helpdata/HELP_SETUP.xml Tue Sep 21 11:36:01 2010 @@ -29,6 +29,14 @@ </para> <section> <title>Why we have OFBiz Setup Application?</title> + <warning> + <para> + The OFBIZ Setup Application is broken! + </para> + <para> + For manual setup instructions, please see the <ulink url="https://cwiki.apache.org/confluence/x/dQB9">Business Setup Guide</ulink> on the wiki. + </para> + </warning> <para> If you are the company and also want to use OFBiz for running your business then you easily be able to setting your information for start running the system quickly via The OFBiz Setup Application. Modified: ofbiz/branches/jquery/applications/content/widget/content/ContentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/content/widget/content/ContentForms.xml?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/content/widget/content/ContentForms.xml (original) +++ ofbiz/branches/jquery/applications/content/widget/content/ContentForms.xml Tue Sep 21 11:36:01 2010 @@ -649,7 +649,7 @@ under the License. </field> </form> <form name="EditShowContentPortlet" extends="CommonPortletEdit" extends-resource="component://common/widget/PortletEditForms.xml"> - <field name="contentId" entry-name="attributeMap.contentId"> + <field name="contentId"> <drop-down> <entity-options description="${contentName}" entity-name="Content"> <entity-constraint name="contentTypeId" operator="equals" value="DOCUMENT"/> Propchange: ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 21 11:36:01 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264 -/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-996840 +/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-999128 Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy (original) +++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/WEB-INF/actions/entry/ShipSettings.groovy Tue Sep 21 11:36:01 2010 @@ -22,6 +22,9 @@ import org.ofbiz.base.util.*; import org.ofbiz.order.shoppingcart.*; import org.ofbiz.party.contact.*; import org.ofbiz.product.catalog.*; +import org.ofbiz.base.util.UtilValidate; +import org.ofbiz.entity.condition.EntityCondition; +import org.ofbiz.entity.util.EntityUtil; import javolution.util.FastMap; import javolution.util.FastList; @@ -83,6 +86,15 @@ if ("SALES_ORDER".equals(cart.getOrderTy if (companyId) { facilityMaps = FastList.newInstance(); facilities = delegator.findByAndCache("Facility", [ownerPartyId : companyId]); + + // if facilites is null then check the PartyRelationship where there is a relationship set for Parent & Child organization. Then also fetch the value of companyId from there. + if (UtilValidate.isEmpty(facilities)) { + partyRelationship = EntityUtil.getFirst(delegator.findList("PartyRelationship", EntityCondition.makeCondition(["roleTypeIdFrom": "PARENT_ORGANIZATION", "partyIdTo": companyId]), null, null, null, false)); + if (UtilValidate.isNotEmpty(partyRelationship)) { + companyId = partyRelationship.partyIdFrom; + facilities = delegator.findByAndCache("Facility", [ownerPartyId : companyId]); + } + } facilities.each { facility -> facilityMap = FastMap.newInstance(); facilityContactMechValueMaps = ContactMechWorker.getFacilityContactMechValueMaps(delegator, facility.facilityId, false, null); Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl (original) +++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl Tue Sep 21 11:36:01 2010 @@ -138,7 +138,7 @@ ${virtualJavaScript?if_exists} <script language="JavaScript" type="text/javascript"> <!-- -Event.observe(window, 'load', function() { +document.observe('dom:loaded', function() { Event.observe($('configFormId'),'change',getConfigDetails); }); Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/OrderShippingInfo.js URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/OrderShippingInfo.js?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/OrderShippingInfo.js (original) +++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/OrderShippingInfo.js Tue Sep 21 11:36:01 2010 @@ -18,7 +18,7 @@ under the License. */ var validateNewShippingAdd = null; -Event.observe(window, 'load', function() { +document.observe('dom:loaded', function() { if ($('addShippingAddress')) { validateNewShippingAdd = new Validation('addShippingAddress', {immediate: true, onSubmit: false}); Event.observe($('countryGeoId'), 'change', function() { Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/geoAutoCompleter.js URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/geoAutoCompleter.js?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/geoAutoCompleter.js (original) +++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/geoAutoCompleter.js Tue Sep 21 11:36:01 2010 @@ -17,7 +17,7 @@ * under the License. */ -Event.observe(window, 'load', function() { +document.observe('dom:loaded', function() { // Autocompleter for shipping panel // Preventing getCountryList() from calling and not removed all autocompleter functions so that we can reuse in future. //getCountryList(); Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/return.js URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/return.js?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/return.js (original) +++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/images/js/return.js Tue Sep 21 11:36:01 2010 @@ -17,7 +17,7 @@ specific language governing permissions under the License. */ -Event.observe(window, 'load', function() { +document.observe('dom:loaded', function() { Event.observe($('returnHeaderTypeId'), 'change', function() { changeStatusCorrespondingToHeaderType(); }); Modified: ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl (original) +++ ofbiz/branches/jquery/applications/order/webapp/ordermgr/order/ordershippinginfo.ftl Tue Sep 21 11:36:01 2010 @@ -315,9 +315,9 @@ under the License. <div class="form-field"><input type="text" class="required" name="shipToPostalCode" id="postalCode" value="" size="30" maxlength="10" /></div> </div> <div class="form-row"> - <label for="country">${uiLabelMap.PartyCountry}* <span id="advice-required-countryGeoId" style="display: none" class="custom-advice">(required)</span></label> + <label for="countryGeoId">${uiLabelMap.PartyCountry}* <span id="advice-required-countryGeoId" style="display: none" class="custom-advice">(required)</span></label> <div class="form-field"> - <select name="shipToCountryGeoId" id="country" class="required" style="width: 70%"> + <select name="shipToCountryGeoId" id="countryGeoId" class="required" style="width: 70%"> <#if countryGeoId?exists> <option value="${countryGeoId}">${countryGeoId}</option> </#if> @@ -326,9 +326,9 @@ under the License. </div> </div> <div class="form-row"> - <label for="state">${uiLabelMap.PartyState}* <span id="advice-required-stateProvinceGeoId" style="display: none" class="custom-advice">(required)</span></label> + <label for="stateProvinceGeoId">${uiLabelMap.PartyState}* <span id="advice-required-stateProvinceGeoId" style="display: none" class="custom-advice">(required)</span></label> <div class="form-field"> - <select name="shipToStateProvinceGeoId" id="state" style="width: 70%"> + <select name="shipToStateProvinceGeoId" id="stateProvinceGeoId" style="width: 70%"> <#if stateProvinceGeoId?has_content> <option value="${stateProvinceGeoId}">${stateProvinceGeoId}</option> <#else> @@ -346,7 +346,9 @@ under the License. </form> </div> <script language="JavaScript" type="text/javascript"> + document.observe('dom:loaded', function() { new Popup('newShippingAddressForm', 'newShippingAddress', {modal: true, position: 'center', trigger: 'click'}) + }); </script> <table width="100%" border="0" cellpadding="1" cellspacing="0"> <#if shipGroup.supplierPartyId?has_content> Modified: ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderViewScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderViewScreens.xml?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderViewScreens.xml (original) +++ ofbiz/branches/jquery/applications/order/widget/ordermgr/OrderViewScreens.xml Tue Sep 21 11:36:01 2010 @@ -87,15 +87,17 @@ under the License. <not><if-empty field="orderHeader"/></not> </condition> <widgets> - <container style="lefthalf"> - <include-screen name="orderinfo"/> - <include-screen name="orderterms"/> - <include-screen name="orderpaymentinfo"/> - <include-screen name="projectAssoOrder"/> - </container> - <container style="righthalf"> - <include-screen name="ordercontactinfo"/> - <include-screen name="ordershippinginfo"/> + <container id="split50"> + <container style="lefthalf"> + <include-screen name="orderinfo"/> + <include-screen name="orderterms"/> + <include-screen name="orderpaymentinfo"/> + <include-screen name="projectAssoOrder"/> + </container> + <container style="righthalf"> + <include-screen name="ordercontactinfo"/> + <include-screen name="ordershippinginfo"/> + </container> </container> </widgets> <fail-widgets> Modified: ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml (original) +++ ofbiz/branches/jquery/applications/party/config/PartyUiLabels.xml Tue Sep 21 11:36:01 2010 @@ -9358,21 +9358,6 @@ <value xml:lang="th">à¸à¸¥à¸¸à¹à¸¡à¸à¸§à¸²à¸¡à¸à¸¥à¸à¸à¸ ัย</value> <value xml:lang="zh">å®å ¨ç»</value> </property> - <property key="PartySecurityGroupId"> - <value xml:lang="de">Sicherheitsgruppe ID</value> - <value xml:lang="en">Security Group ID</value> - <value xml:lang="es">Grupo de seguridad</value> - <value xml:lang="fr">Groupe de sécurité </value> - <value xml:lang="hi_IN">सà¥à¤°à¤à¥à¤·à¤¾ समà¥à¤¹ à¤à¥à¤°à¤®à¤¾à¤à¤</value> - <value xml:lang="it">Codice gruppo sicurezza</value> - <value xml:lang="nl">ID beveiligingsgroep</value> - <value xml:lang="pt_BR">ID de grupo de segurança</value> - <value xml:lang="pt_PT">Identificação de Grupo de Segurança</value> - <value xml:lang="ro">Cod Grup De Siguranta</value> - <value xml:lang="ru">Ðод гÑÑÐ¿Ð¿Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑноÑÑи</value> - <value xml:lang="th">รหัสà¸à¸¥à¸¸à¹à¸¡à¸à¸§à¸²à¸¡à¸à¸¥à¸à¸à¸ ัย</value> - <value xml:lang="zh">å®å ¨ç»æ è¯</value> - </property> <property key="PartySecurityGroups"> <value xml:lang="de">Sicherheitsgruppen</value> <value xml:lang="en">Security Groups</value> Propchange: ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 21 11:36:01 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:418499-490456 /ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:921280-927264 -/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-996840 +/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-999128 Modified: ofbiz/branches/jquery/applications/party/widget/partymgr/PartyForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/widget/partymgr/PartyForms.xml?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/widget/partymgr/PartyForms.xml (original) +++ ofbiz/branches/jquery/applications/party/widget/partymgr/PartyForms.xml Tue Sep 21 11:36:01 2010 @@ -834,7 +834,7 @@ under the License. </field> <field name="fromDate"><date-time/></field> <field name="thruDate"><date-time/></field> - <field name="groupId" title="${uiLabelMap.PartySecurityGroupId}"> + <field name="groupId" title="${uiLabelMap.CommonSecurityGroupId}"> <drop-down allow-empty="true"> <entity-options entity-name="SecurityGroup" description="${description}"> <entity-order-by field-name="description"/> Modified: ofbiz/branches/jquery/applications/party/widget/partymgr/SecurityForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/party/widget/partymgr/SecurityForms.xml?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/party/widget/partymgr/SecurityForms.xml (original) +++ ofbiz/branches/jquery/applications/party/widget/partymgr/SecurityForms.xml Tue Sep 21 11:36:01 2010 @@ -28,7 +28,7 @@ under the License. <order-by field-name="groupId"/> </entity-condition> </actions> - <field name="groupId" title="${uiLabelMap.PartySecurityGroupId}" widget-style="buttontext"> + <field name="groupId" title="${uiLabelMap.CommonSecurityGroupId}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${groupId}" target="EditSecurityGroup"> <parameter param-name="groupId"/> </hyperlink> @@ -40,9 +40,9 @@ under the License. header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="securityGroup==null" target="createSecurityGroup"/> <auto-fields-service service-name="updateSecurityGroup" map-name="securityGroup"/> - <field use-when="securityGroup!=null" name="groupId" title="${uiLabelMap.PartySecurityGroupId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> - <field use-when="securityGroup==null&&groupId==null" name="groupId" title="${uiLabelMap.PartySecurityGroupId}"><text size="20" maxlength="20"/></field> - <field use-when="securityGroup==null&&groupId!=null" name="groupId" title="${uiLabelMap.PartySecurityGroupId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${groupId}]"><text size="20" maxlength="20"/></field> + <field use-when="securityGroup!=null" name="groupId" title="${uiLabelMap.CommonSecurityGroupId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> + <field use-when="securityGroup==null&&groupId==null" name="groupId" title="${uiLabelMap.CommonSecurityGroupId}"><text size="20" maxlength="20"/></field> + <field use-when="securityGroup==null&&groupId!=null" name="groupId" title="${uiLabelMap.CommonSecurityGroupId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${groupId}]"><text size="20" maxlength="20"/></field> <field name="description" title="${uiLabelMap.CommonDescription}"><text size="60" maxlength="250"/></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> </form> Modified: ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml (original) +++ ofbiz/branches/jquery/applications/product/config/ProductUiLabels.xml Tue Sep 21 11:36:01 2010 @@ -6591,6 +6591,17 @@ <value xml:lang="th">à¸à¸±à¸à¸à¸µ</value> <value xml:lang="zh">è´¦æ·</value> </property> + <property key="ProductActionType"> + <value xml:lang="de">Aktionstyp</value> + <value xml:lang="en">Action Type</value> + <value xml:lang="es">Tipo de Acción</value> + <value xml:lang="fr">Type d'action</value> + <value xml:lang="it">Tipo Azione</value> + <value xml:lang="ro">Tip Actiune</value> + <value xml:lang="ru">Тип дейÑÑвиÑ</value> + <value xml:lang="th">à¸à¸³à¸à¸§à¸à¸à¸£à¸°à¹à¸ à¸à¸à¸²à¸£à¸à¸³à¸à¸²à¸</value> + <value xml:lang="zh">æä½ç±»å</value> + </property> <property key="ProductActionTypeAmount"> <value xml:lang="de">Aktionstyp Betrag</value> <value xml:lang="en">Action Type Amount</value> @@ -8952,6 +8963,10 @@ <value xml:lang="th">à¹à¸à¸·à¹à¸à¸à¹à¸</value> <value xml:lang="zh">æ¡ä»¶</value> </property> + <property key="ProductConditionsThenActions"> + <value xml:lang="en">If all conditions are true, then actions will be executed (logical conjunction, ie conditions are 'ANDED' between them, so are actions))</value> + <value xml:lang="fr">Si toutes les conditions sont vérifiées, alors les actions seront exécutées (conjonction, autrement dit ET logique entre conditions, de même pour les actions)</value> + </property> <property key="ProductConfigItem"> <value xml:lang="de">Konfigurationsposition</value> <value xml:lang="en">Config Item</value> @@ -12104,6 +12119,17 @@ <value xml:lang="th">สà¸à¸²à¸à¸°à¸£à¸²à¸¢à¸à¸²à¸£à¸ªà¸´à¸à¸à¹à¸²à¸à¸à¹à¸«à¸¥à¸·à¸à¹à¸à¸·à¹à¸à¸à¸à¹à¸</value> <value xml:lang="zh">åå§åºåæç»ç¶æ</value> </property> + <property key="ProductInput"> + <value xml:lang="de">Eingang</value> + <value xml:lang="en">Input</value> + <value xml:lang="es">Entrada</value> + <value xml:lang="fr">Donnée</value> + <value xml:lang="it">Input</value> + <value xml:lang="ro">Input</value> + <value xml:lang="ru">ÐÑÑ Ð¾Ð´. паÑамеÑÑ</value> + <value xml:lang="th">à¸à¹à¸à¸¡à¸¹à¸¥</value> + <value xml:lang="zh">æ°æ®</value> + </property> <property key="ProductInputOperatorValue"> <value xml:lang="de">Eingang, Operator, Wert</value> <value xml:lang="en">Input, Operator Value</value> @@ -12115,6 +12141,28 @@ <value xml:lang="th">à¹à¸ªà¹, à¸à¸¹à¹à¸à¸§à¸à¸à¸¸à¸¡ à¹à¸¥à¸° à¸à¹à¸²</value> <value xml:lang="zh">è¾å ¥ãæä½ç¬¦åæ°å¼</value> </property> + <property key="ProductOperator"> + <value xml:lang="de">Operator</value> + <value xml:lang="en">Operator</value> + <value xml:lang="es">Operador</value> + <value xml:lang="fr">Opérateur</value> + <value xml:lang="it">Operatore</value> + <value xml:lang="ro">Operator si Valoare</value> + <value xml:lang="ru">опеÑаÑоÑ</value> + <value xml:lang="th">à¸à¸¹à¹à¸à¸£à¸°à¸à¸à¸à¸à¸²à¸£</value> + <value xml:lang="zh">å¼</value> + </property> + <property key="ProductValue"> + <value xml:lang="de">Wert</value> + <value xml:lang="en">Value</value> + <value xml:lang="es">Valor</value> + <value xml:lang="fr">Valeur</value> + <value xml:lang="it">Valore</value> + <value xml:lang="ro">Valoare</value> + <value xml:lang="ru">знаÑение</value> + <value xml:lang="th">มูลà¸à¹à¸²</value> + <value xml:lang="zh">ç®å</value> + </property> <property key="ProductInsertDefaultImageUrl"> <value xml:lang="de">Standart Bild URL einfügen</value> <value xml:lang="en">Insert Default Image URL</value> @@ -15929,6 +15977,18 @@ <value xml:lang="th">à¸à¸¸à¸à¹à¸¡à¹à¸¡à¸µà¸à¸²à¸£à¸à¸à¸¸à¸à¸²à¸à¸à¸¶à¸à¸à¹à¸à¸¡à¸¹à¸¥à¸£à¸²à¸à¸²à¸à¸µà¹à¸£à¸±à¸à¸©à¸²à¹à¸§à¹. ("CATALOG_PRICE_MAINT" à¸à¹à¸à¸à¸à¸²à¸£)</value> <value xml:lang="zh">ä½ æ²¡ææéç»´æ¤ä»·æ ¼ä¿¡æ¯ã (éè¦"CATALOG_PRICE_MAINT")</value> </property> + <property key="ProductPriceRuleId"> + <value xml:lang="de">Preisregel [ID]</value> + <value xml:lang="en">Edit Price Rule [ID]</value> + <value xml:lang="es">Regla de precio [CÃDIGO]</value> + <value xml:lang="fr">Modifier la règle de prix [Réf.]</value> + <value xml:lang="it">Regola Prezzo [Codice]</value> + <value xml:lang="nl">Prijsregel [ID]</value> + <value xml:lang="ro">Regula Pret [Cod]</value> + <value xml:lang="ru">пÑавила ÑенообÑÐ°Ð·Ð¾Ð²Ð°Ð½Ð¸Ñ [Ðод]</value> + <value xml:lang="th">à¸à¸·à¹à¸à¸à¹à¸à¸à¸³à¸«à¸à¸à¸£à¸²à¸à¸² [รหัส]</value> + <value xml:lang="zh">ä»·æ ¼è§å[åèã]</value> + </property> <property key="ProductPriceRuleNameId"> <value xml:lang="de">Preisregel Name [ID]</value> <value xml:lang="en">Price Rule Name [ID]</value> @@ -15953,6 +16013,14 @@ <value xml:lang="th">à¸à¹à¸à¸à¸³à¸«à¸à¸à¸£à¸²à¸à¸²</value> <value xml:lang="zh">ä»·æ ¼è§å</value> </property> + <property key="ProductPriceRulesNewAction"> + <value xml:lang="en">Add a New Action</value> + <value xml:lang="fr">Ajout d'une action</value> + </property> + <property key="ProductPriceRulesNewCond"> + <value xml:lang="en">Add a New Condition</value> + <value xml:lang="fr">Ajout d'une condition</value> + </property> <property key="ProductPriceTitle1"> <value xml:lang="en">Price charge</value> <value xml:lang="fr">Frais lié au prix</value> Modified: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/price/PriceServices.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/price/PriceServices.xml?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/price/PriceServices.xml (original) +++ ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/price/PriceServices.xml Tue Sep 21 11:36:01 2010 @@ -178,6 +178,9 @@ under the License. <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> <check-errors/> + <if-not-empty field="parameters.condValueInput"> + <set field="parameters.condValue" from-field="parameters.condValueInput"/> + </if-not-empty> <make-value value-field="newEntity" entity-name="ProductPriceCond"/> <set-nonpk-fields map="parameters" value-field="newEntity"/> <set-pk-fields map="parameters" value-field="newEntity"/> @@ -191,6 +194,9 @@ under the License. <check-permission permission="CATALOG_PRICE_MAINT"><fail-property resource="ProductUiLabels" property="ProductPriceMaintPermissionError"/></check-permission> <check-errors/> + <if-not-empty field="parameters.condValueInput"> + <set field="parameters.condValue" from-field="parameters.condValueInput"/> + </if-not-empty> <make-value entity-name="ProductPriceCond" value-field="lookupPKMap"/> <set-pk-fields map="parameters" value-field="lookupPKMap"/> <find-by-primary-key entity-name="ProductPriceCond" map="lookupPKMap" value-field="lookedUpValue"/> Propchange: ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 21 11:36:01 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-996840 +/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-999128 Modified: ofbiz/branches/jquery/applications/product/servicedef/services_pricepromo.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/servicedef/services_pricepromo.xml?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/servicedef/services_pricepromo.xml (original) +++ ofbiz/branches/jquery/applications/product/servicedef/services_pricepromo.xml Tue Sep 21 11:36:01 2010 @@ -89,6 +89,7 @@ under the License. <description>Create an ProductPriceCond</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> + <attribute name="condValueInput" type="String" mode="IN" optional="true"></attribute> <override name="productPriceCondSeqId" mode="OUT"/> </service> <service name="updateProductPriceCond" default-entity-name="ProductPriceCond" engine="simple" @@ -96,6 +97,7 @@ under the License. <description>Update an ProductPriceCond</description> <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> + <attribute name="condValueInput" type="String" mode="IN" optional="true"></attribute> </service> <service name="deleteProductPriceCond" default-entity-name="ProductPriceCond" engine="simple" location="component://product/script/org/ofbiz/product/price/PriceServices.xml" invoke="deleteProductPriceCond" auth="true"> Modified: ofbiz/branches/jquery/applications/product/servicedef/services_shipment.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/servicedef/services_shipment.xml?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/servicedef/services_shipment.xml (original) +++ ofbiz/branches/jquery/applications/product/servicedef/services_shipment.xml Tue Sep 21 11:36:01 2010 @@ -622,6 +622,7 @@ under the License. <attribute name="selInfo" type="Map" string-map-prefix="sel_" mode="IN" optional="true"/> <attribute name="iteInfo" type="Map" string-map-prefix="ite_" mode="IN" optional="true"/> <attribute name="wgtInfo" type="Map" string-map-prefix="wgt_" mode="IN" optional="true"/> + <attribute name="boxTypeInfo" type="Map" string-map-prefix="boxType_" mode="IN" optional="true"/> <attribute name="numPackagesInfo" type="Map" string-map-prefix="numPackages_" mode="IN" optional="true"/> </service> Modified: ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/packing/PackingServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/packing/PackingServices.java?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/packing/PackingServices.java (original) +++ ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/packing/PackingServices.java Tue Sep 21 11:36:01 2010 @@ -111,6 +111,7 @@ public class PackingServices { Map<String, String> pkgInfo = UtilGenerics.checkMap(context.get("pkgInfo")); Map<String, String> wgtInfo = UtilGenerics.checkMap(context.get("wgtInfo")); Map<String, String> numPackagesInfo = UtilGenerics.checkMap(context.get("numPackagesInfo")); + Map<String, String> boxTypeInfo = UtilGenerics.checkMap(context.get("boxTypeInfo")); if (selInfo != null) { for (String rowKey: selInfo.keySet()) { @@ -125,6 +126,8 @@ public class PackingServices { String pkgStr = pkgInfo.get(rowKey); String qtyStr = qtyInfo.get(rowKey); String wgtStr = wgtInfo.get(rowKey); + String boxType = boxTypeInfo.get(rowKey); + session.setShipmentBoxTypeId(boxType); Debug.log("Item: " + orderItemSeqId + " / Product: " + prdStr + " / Quantity: " + qtyStr + " / Package: " + pkgStr + " / Weight: " + wgtStr, module); Modified: ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java (original) +++ ofbiz/branches/jquery/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java Tue Sep 21 11:36:01 2010 @@ -62,6 +62,7 @@ public class PackingSession implements j protected String shipmentId = null; protected String instructions = null; protected String weightUomId = null; + protected String shipmentBoxTypeId = null; protected BigDecimal additionalShippingCharge = null; protected Map<Integer, BigDecimal> packageWeights = null; protected List<PackingEvent> packEvents = null; @@ -794,7 +795,7 @@ public class PackingSession implements j Map<String, Object> pkgCtx = FastMap.newInstance(); pkgCtx.put("shipmentId", shipmentId); pkgCtx.put("shipmentPackageSeqId", shipmentPackageSeqId); - //pkgCtx.put("shipmentBoxTypeId", ""); + pkgCtx.put("shipmentBoxTypeId", this.shipmentBoxTypeId); pkgCtx.put("weight", getPackageWeight(i+1)); pkgCtx.put("weightUomId", getWeightUomId()); pkgCtx.put("userLogin", userLogin); @@ -949,6 +950,10 @@ public class PackingSession implements j this.weightUomId = weightUomId; } + public void setShipmentBoxTypeId(String shipmentBoxTypeId) { + this.shipmentBoxTypeId = shipmentBoxTypeId; + } + public List<Integer> getPackageSeqIds() { Set<Integer> packageSeqIds = new TreeSet<Integer>(); if (! UtilValidate.isEmpty(this.getLines())) { Modified: ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.groovy URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.groovy?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.groovy (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/WEB-INF/actions/shipment/PackOrder.groovy Tue Sep 21 11:36:01 2010 @@ -132,6 +132,11 @@ if (orderId) { context.orderReadHelper = orh; orderItemShipGroup = orh.getOrderItemShipGroup(shipGroupSeqId); context.orderItemShipGroup = orderItemShipGroup; + carrierPartyId = orderItemShipGroup.carrierPartyId; + if ("USPS".equals(carrierPartyId)) { + carrierShipmentBoxTypes = delegator.findList("CarrierShipmentBoxType", EntityCondition.makeCondition([partyId : carrierPartyId]), null, null, null, false); + context.carrierShipmentBoxTypes = carrierShipmentBoxTypes; + } if ("ORDER_APPROVED".equals(orderHeader.statusId)) { if (shipGroupSeqId) { Modified: ofbiz/branches/jquery/applications/product/webapp/facility/shipment/PackOrder.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/product/webapp/facility/shipment/PackOrder.ftl?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/product/webapp/facility/shipment/PackOrder.ftl (original) +++ ofbiz/branches/jquery/applications/product/webapp/facility/shipment/PackOrder.ftl Tue Sep 21 11:36:01 2010 @@ -261,6 +261,9 @@ under the License. <td> </td> <td align="center">${uiLabelMap.ProductPackQty}</td> <td align="center">${uiLabelMap.ProductPackedWeight} (${("uiLabelMap.ProductShipmentUomAbbreviation_" + defaultWeightUomId)?eval})</td> + <#if carrierShipmentBoxTypes?has_content> + <td align="center">${uiLabelMap.ProductShipmentBoxType}</td> + </#if> <td align="center">${uiLabelMap.ProductPackage}</td> <td align="right"> <b>*</b> ${uiLabelMap.ProductPackages}</td> </tr> @@ -307,6 +310,17 @@ under the License. <td align="center"> <input type="text" size="7" name="wgt_${rowKey}" value="" /> </td> + <#if carrierShipmentBoxTypes?has_content> + <td align="center"> + <select name="boxType_${rowKey}"> + <option value=""></option> + <#list carrierShipmentBoxTypes as carrierShipmentBoxType> + <#assign shipmentBoxType = carrierShipmentBoxType.getRelatedOne("ShipmentBoxType") /> + <option value="${shipmentBoxType.shipmentBoxTypeId}">${shipmentBoxType.description?default(shipmentBoxType.shipmentBoxTypeId)}</option> + </#list> + </select> + </td> + </#if> <td align="center"> <select name="pkg_${rowKey}"> <#if packingSession.getPackageSeqIds()?exists> Modified: ofbiz/branches/jquery/applications/workeffort/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/applications/workeffort/entitydef/entitymodel.xml?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/applications/workeffort/entitydef/entitymodel.xml (original) +++ ofbiz/branches/jquery/applications/workeffort/entitydef/entitymodel.xml Tue Sep 21 11:36:01 2010 @@ -222,12 +222,12 @@ under the License. <field name="runtimeDataId" type="id"></field> <field name="noteId" type="id"></field> <field name="serviceLoaderName" type="name"></field> - <field name="quantityToProduce" type="floating-point"></field> - <field name="quantityProduced" type="floating-point"></field> - <field name="quantityRejected" type="floating-point"></field> - <field name="reservPersons" type="floating-point"><description>the number of persons renting the attached asset</description></field> - <field name="reserv2ndPPPerc" type="floating-point"><description>reservationSecondPersonPricePercentage: percentage of the end price for the 2nd person renting this asset connected to the workEffort</description></field> - <field name="reservNthPPPerc" type="floating-point"><description>reservationNthPersonPricePercentage: percentage of the end price for the Nth (2+) person renting this asset connected to the workEffort</description></field> + <field name="quantityToProduce" type="fixed-point"></field> + <field name="quantityProduced" type="fixed-point"></field> + <field name="quantityRejected" type="fixed-point"></field> + <field name="reservPersons" type="fixed-point"><description>the number of persons renting the attached asset</description></field> + <field name="reserv2ndPPPerc" type="fixed-point"><description>reservationSecondPersonPricePercentage: percentage of the end price for the 2nd person renting this asset connected to the workEffort</description></field> + <field name="reservNthPPPerc" type="fixed-point"><description>reservationNthPersonPricePercentage: percentage of the end price for the Nth (2+) person renting this asset connected to the workEffort</description></field> <field name="accommodationMapId" type="id"/> <field name="accommodationSpotId" type="id"/> <field name="revisionNumber" type="numeric"></field> Modified: ofbiz/branches/jquery/build.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/build.xml?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/build.xml (original) +++ ofbiz/branches/jquery/build.xml Tue Sep 21 11:36:01 2010 @@ -35,10 +35,6 @@ under the License. <target name="ofbiz-init"> <property environment="env"/> - <mkdir dir="tools/build/classes"/> - <javac srcdir="tools/src" debug="on" deprecation="off" destdir="tools/build/classes" compiler="javac1.5" target="1.5" source="1.5"/> - <mkdir dir="tools/build/lib"/> - <jar jarfile="tools/build/lib/ofbiz-tools.jar" basedir="tools/build/classes"/> </target> <!-- ================================================================== --> @@ -61,7 +57,6 @@ under the License. <antcall target="clean-cache"/> <antcall target="clean-tempfiles"/> <antcall target="clean"/> - <antcall target="clean-tools"/> </target> <target name="clean-data" @@ -157,10 +152,6 @@ under the License. <echo message="[clean] ========== Done Cleaning =========="/> </target> - <target name="clean-tools"> - <delete dir="tools/build"/> - </target> - <target name="svninfo" description="Update the Release-revision info in the footer. Note that you need a valid Internet connection and Subversion connected to the OFBiz repository for that "> <echo message="Creating svninfo..."/> Modified: ofbiz/branches/jquery/common.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/common.xml?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/common.xml (original) +++ ofbiz/branches/jquery/common.xml Tue Sep 21 11:36:01 2010 @@ -26,7 +26,6 @@ under the License. <property name="dtd.dir" value="dtd"/> <property name="lib.dir" value="lib"/> <property name="build.dir" value="build"/> - <taskdef name="if" classname="org.ofbiz.tools.ant.IfTask" classpath="${ofbiz.home.dir}/tools/build/classes"/> <path id="test.class.path"> <path refid="local.class.path"/> @@ -58,7 +57,9 @@ under the License. <target name="init"/> <if> - <available file="${src.dir}"/> + <condition> + <available file="${src.dir}"/> + </condition> <commands> <selector id="src-extra-set"> <or> Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilDateTime.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilDateTime.java?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilDateTime.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilDateTime.java Tue Sep 21 11:36:01 2010 @@ -76,7 +76,7 @@ public class UtilDateTime { } public static int getIntervalInDays(Timestamp from, Timestamp thru) { - return thru != null ? (int) (thru.getTime() - from.getTime()) / (24*60*60*1000) : 0; + return thru != null ? (int) ((thru.getTime() - from.getTime()) / (24*60*60*1000)) : 0; } public static Timestamp addDaysToTimestamp(Timestamp start, int days) { Modified: ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilIO.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilIO.java?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilIO.java (original) +++ ofbiz/branches/jquery/framework/base/src/org/ofbiz/base/util/UtilIO.java Tue Sep 21 11:36:01 2010 @@ -398,8 +398,7 @@ public final class UtilIO { sb.append(writer.toString()); return; } - } catch (Exception e) { - throw new IOException("Can't write (" + value + ")"); - } + } catch (Exception e) {} //Empty catch because writeObject() calls encodeObject(), which *always* returns true, unless an error occurs. + throw new IOException("Can't write (" + value + ")"); } } Modified: ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml (original) +++ ofbiz/branches/jquery/framework/common/config/CommonUiLabels.xml Tue Sep 21 11:36:01 2010 @@ -4599,6 +4599,10 @@ <value xml:lang="th">à¹à¸¡à¹à¸¡à¸µà¸£à¸«à¸±à¸ªà¹à¸à¸£à¸©à¸à¸µà¸¢à¹</value> <value xml:lang="zh">没æé®æ¿å°å</value> </property> + <property key="CommonNoOptions"> + <value xml:lang="en">No options: _NA_</value> + <value xml:lang="fr">Aucun option: _NA_</value> + </property> <property key="CommonNoStatesProvinces"> <value xml:lang="en">No States/Provinces exist: _NA_</value> <value xml:lang="fr">Aucun état ou province: _NA_</value> @@ -6321,6 +6325,21 @@ <value xml:lang="zh">å®å ¨</value> <value xml:lang="zh_CN">å®å ¨</value> </property> + <property key="CommonSecurityGroupId"> + <value xml:lang="de">Sicherheitsgruppe ID</value> + <value xml:lang="en">Security Group ID</value> + <value xml:lang="es">Grupo de seguridad</value> + <value xml:lang="fr">Groupe de sécurité </value> + <value xml:lang="hi_IN">सà¥à¤°à¤à¥à¤·à¤¾ समà¥à¤¹ à¤à¥à¤°à¤®à¤¾à¤à¤</value> + <value xml:lang="it">Codice gruppo sicurezza</value> + <value xml:lang="nl">ID beveiligingsgroep</value> + <value xml:lang="pt_BR">ID de grupo de segurança</value> + <value xml:lang="pt_PT">Identificação de Grupo de Segurança</value> + <value xml:lang="ro">Cod Grup De Siguranta</value> + <value xml:lang="ru">Ðод гÑÑÐ¿Ð¿Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑноÑÑи</value> + <value xml:lang="th">รหัสà¸à¸¥à¸¸à¹à¸¡à¸à¸§à¸²à¸¡à¸à¸¥à¸à¸à¸ ัย</value> + <value xml:lang="zh">å®å ¨ç»æ è¯</value> + </property> <property key="CommonSecurityGroups"> <value xml:lang="en">Security Groups</value> <value xml:lang="fr">Groupes de sécurité</value> @@ -8964,6 +8983,18 @@ <value xml:lang="it">Modificato dall'utente</value> <value xml:lang="zh">ç±ç¨æ·ç»å½æ è¯ä¿®æ¹</value> </property> + <property key="FormFieldTitle_originalPortalPageId"> + <value xml:lang="en">Original Portal Page Id</value> + <value xml:lang="it">Codice pagina portale originale</value> + </property> + <property key="FormFieldTitle_parentPortalPageId"> + <value xml:lang="en">Parent Portal Page Id</value> + <value xml:lang="it">Codice pagina portale padre</value> + </property> + <property key="FormFieldTitle_ownerUserLoginId"> + <value xml:lang="en">Owner User Login ID</value> + <value xml:lang="it">Codice login proprietario</value> + </property> <property key="FormFieldTitle_price"> <value xml:lang="ar">اÙسعر</value> <value xml:lang="de">Preis</value> Modified: ofbiz/branches/jquery/framework/common/servicedef/services.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/servicedef/services.xml?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/servicedef/services.xml (original) +++ ofbiz/branches/jquery/framework/common/servicedef/services.xml Tue Sep 21 11:36:01 2010 @@ -97,7 +97,7 @@ under the License. <auto-attributes include="pk" mode="OUT" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> <override name="enumTypeId" optional="false"/> - <override name="description" optional="false"/> + <override name="description" optional="false" allow-html="safe"/> </service> <service name="updateEnumeration" default-entity-name="Enumeration" engine="simple" location="component://common/script/org/ofbiz/common/EnumerationServices.xml" invoke="updateEnumeration" auth="true"> @@ -106,9 +106,14 @@ under the License. <auto-attributes include="pk" mode="IN" optional="false"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> <override name="enumTypeId" optional="false"/> - <override name="description" optional="false"/> + <override name="description" optional="false" allow-html="safe"/> </service> - + <service name="deleteEnumeration" default-entity-name="Enumeration" engine="entity-auto" invoke="delete" auth="true"> + <description>Delete a Enumeration</description> + <permission-service service-name="commonGenericPermission" main-action="DELETE"/> + <auto-attributes include="pk" mode="IN" optional="false"/> + </service> + <!-- DataSource Services --> <service name="interfaceDataSource" engine="interface" location="" invoke=""> <attribute name="dataSourceId" type="String" mode="IN" optional="false"/> @@ -694,6 +699,8 @@ under the License. <permission-service service-name="commonGenericPermission" main-action="UPDATE"/> <auto-attributes include="pk" mode="IN"/> <auto-attributes include="nonpk" mode="IN" optional="true"/> + <override name="geoName" optional="false"/> + <override name="geoTypeId" optional="false"/> </service> <service name="deleteGeo" default-entity-name="Geo" engine="entity-auto" invoke="delete" auth="true"> <description>Delete a Geo</description> Modified: ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/portal-controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/portal-controller.xml?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/portal-controller.xml (original) +++ ofbiz/branches/jquery/framework/common/webcommon/WEB-INF/portal-controller.xml Tue Sep 21 11:36:01 2010 @@ -39,6 +39,17 @@ under the License. <security https="true" auth="true"/> <response name="success" type="view" value="showPortletSimpleDecorator"/> </request-map> + <!-- Portlet editing requests --> + <request-map uri="editPortalPortletAttributes"> + <security https="true" auth="true"/> + <response name="success" type="view" value="editPortalPortletAttributes" save-last-view="true"/> + </request-map> + <request-map uri="setPortalPortletAttributes"> + <security https="true" auth="true"/> + <event type="simple" invoke="setPortalPortletAttributes" path="component://common/script/org/ofbiz/common/PortalPageMethods.xml"/> + <response name="success" type="view-last" value="main"/> + <response name="error" type="request" value="main"/> + </request-map> <!-- Portal page show requests --> <request-map uri="showPortalPage"> <security https="true" auth="true"/> @@ -50,39 +61,39 @@ under the License. <event type="simple" invoke="copyIfRequiredSystemPage" path="component://common/script/org/ofbiz/common/PortalPageMethods.xml"/> <response name="success" type="view" value="ManagePortalPages"/> </request-map> - <request-map uri="AddPortlet"> + <request-map uri="addPortlet"> <security https="true" auth="true"/> - <response name="success" type="view" value="AddPortlet"/> + <response name="success" type="view" value="addPortlet" save-last-view="true"/> </request-map> <request-map uri="createPortalPagePortlet"> <security https="true" auth="true"/> <event type="service" invoke="createPortalPagePortlet"/> - <response name="success" type="request" value="ManagePortalPages"/> - <response name="error" type="request" value="ManagePortalPages"/> + <response name="success" type="view-last" value="main"/> + <response name="error" type="request" value="main"/> </request-map> <request-map uri="updatePortalPagePortlet"> <security https="true" auth="true"/> <event type="service" invoke="updatePortalPagePortlet"/> - <response name="success" type="request" value="ManagePortalPages"/> - <response name="error" type="request" value="ManagePortalPages"/> + <response name="success" type="view-last" value="main" save-last-view="true"/> + <response name="error" type="request" value="main"/> </request-map> <request-map uri="updatePortalPagePortletSeq"> <security https="true" auth="true"/> <event type="service" invoke="updatePortalPagePortletSeq"/> - <response name="success" type="request" value="ManagePortalPages"/> - <response name="error" type="request" value="ManagePortalPages"/> + <response name="success" type="view-last" value="main" save-last-view="true"/> + <response name="error" type="request" value="main"/> </request-map> <request-map uri="deletePortalPagePortlet"> <security https="true" auth="true"/> <event type="service" invoke="deletePortalPagePortlet"/> - <response name="success" type="request" value="ManagePortalPages"/> - <response name="error" type="request" value="ManagePortalPages"/> + <response name="success" type="view-last" value="main" save-last-view="true"/> + <response name="error" type="request" value="main"/> </request-map> <request-map uri="movePortletToPortalPage"> <security https="true" auth="true"/> <event type="service" invoke="movePortletToPortalPage"/> - <response name="success" type="request" value="ManagePortalPages"/> - <response name="error" type="request" value="ManagePortalPages"/> + <response name="success" type="view-last" value="main" save-last-view="true"/> + <response name="error" type="request" value="main"/> </request-map> <request-map uri="updatePortalPagePortletSeqAjax"> <security https="true" auth="true"/> @@ -107,29 +118,32 @@ under the License. <response name="success" type="request" value="ManagePortalPages"/> <response name="error" type="request" value="ManagePortalPages"/> </request-map> - <request-map uri="setPortalPortletAttributes"> - <security https="true" auth="true"/> - <event type="simple" invoke="setPortalPortletAttributes" path="component://common/script/org/ofbiz/common/PortalPageMethods.xml"/> - <response name="success" type="request" value="ManagePortalPages"/> - <response name="error" type="request" value="ManagePortalPages"/> - </request-map> <request-map uri="addPortalPageColumn"> <security https="true" auth="true"/> <event type="service" invoke="addPortalPageColumn"/> - <response name="success" type="request" value="ManagePortalPages"/> - <response name="error" type="request" value="ManagePortalPages"/> + <response name="success" type="view-last" value="main" save-last-view="true"/> + <response name="error" type="request" value="main"/> </request-map> <request-map uri="updatePortalPageColumn"> <security https="true" auth="true"/> <event type="service" invoke="updatePortalPageColumn"/> - <response name="success" type="request" value="ManagePortalPages"/> - <response name="error" type="request" value="ManagePortalPages"/> + <response name="success" type="view-last" value="main" save-last-view="true"/> + <response name="error" type="request" value="main"/> </request-map> - <request-map uri="deletePortalPageColumn"> + <!-- This request is the same as the above. It only does not save the last view. + This is necessary because in the new PortalPage widget the column size is set with a dedicated sceen and not with a combo. + When all PortalPages will be using the widget we could remove the above request. --> + <request-map uri="updatePortalPageColumnWidth"> <security https="true" auth="true"/> + <event type="service" invoke="updatePortalPageColumn"/> + <response name="success" type="view-last" value="main"/> + <response name="error" type="request" value="main"/> + </request-map> + <request-map uri="deletePortalPageColumn"> + <security https="true" auth="false"/> <event type="service" invoke="deletePortalPageColumn"/> - <response name="success" type="request" value="ManagePortalPages"/> - <response name="error" type="request" value="ManagePortalPages"/> + <response name="success" type="view-last" value="main" save-last-view="true"/> + <response name="error" type="request" value="main"/> </request-map> <request-map uri="updatePortalPageSeq"> <security https="true" auth="true"/> @@ -137,6 +151,10 @@ under the License. <response name="success" type="request" value="ManagePortalPages"/> <response name="error" type="request" value="ManagePortalPages"/> </request-map> + <request-map uri="editPortalPageColumnWidth"> + <security https="true" auth="false"/> + <response name="success" type="view" value="editPortalPageColumnWidth" save-last-view="true"/> + </request-map> <!-- View Mappings --> <view-map name="showPortalPage" type="screen" page="component://common/widget/PortalPageScreens.xml#showPortalPage"/> <view-map name="showPortlet" type="screen" page="component://common/widget/PortalPageScreens.xml#showPortlet"/> @@ -144,5 +162,7 @@ under the License. <view-map name="showPortletMainDecorator" type="screen" page="component://common/widget/PortalPageScreens.xml#showPortletMainDecorator"/> <view-map name="showPortletSimpleDecorator" type="screen" page="component://common/widget/PortalPageScreens.xml#showPortletSimpleDecorator"/> <view-map name="ManagePortalPages" type="screen" page="component://common/widget/PortalPageScreens.xml#ManagePortalPages"/> - <view-map name="AddPortlet" type="screen" page="component://common/widget/PortalPageScreens.xml#AddPortlet"/> + <view-map name="addPortlet" type="screen" page="component://common/widget/PortalPageScreens.xml#AddPortlet"/> + <view-map name="editPortalPortletAttributes" type="screen" page="component://common/widget/PortalPageScreens.xml#EditPortalPortletAttributes"/> + <view-map name="editPortalPageColumnWidth" type="screen" page="component://common/widget/PortalPageScreens.xml#EditPortalPageColumnWidth"/> </site-conf> Modified: ofbiz/branches/jquery/framework/common/webcommon/includes/setCountryStatesEventJs.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/webcommon/includes/setCountryStatesEventJs.ftl?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/webcommon/includes/setCountryStatesEventJs.ftl (original) +++ ofbiz/branches/jquery/framework/common/webcommon/includes/setCountryStatesEventJs.ftl Tue Sep 21 11:36:01 2010 @@ -17,7 +17,7 @@ specific language governing permissions under the License. --> <script type="text/javascript"> -Event.observe(window, 'load', function() { +document.observe('dom:loaded', function() { if ($('${dependentForm}')) { Event.observe($('${dependentForm}_countryGeoId'), 'change', function() { getDependentDropdownValues('getAssociatedStateList', 'countryGeoId', '${dependentForm}_countryGeoId', '${dependentForm}_stateProvinceGeoId', 'stateList', 'geoId', 'geoName', '', ''); Modified: ofbiz/branches/jquery/framework/common/webcommon/portal/editPortalPage.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/webcommon/portal/editPortalPage.ftl?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/webcommon/portal/editPortalPage.ftl (original) +++ ofbiz/branches/jquery/framework/common/webcommon/portal/editPortalPage.ftl Tue Sep 21 11:36:01 2010 @@ -24,10 +24,10 @@ under the License. <td class="manage-portal-column-toolbar" style="vertical-align: top; <#if portalPageColumn.columnWidthPercentage?has_content> width:${portalPageColumn.columnWidthPercentage}%;</#if>"> <hr /> <ul> - <li id="delete-column_${line}"><form method="post" action="<@ofbizUrl>deletePortalPageColumn${Adm?if_exists}</@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="delPortalPageId_${portalPageColumn_index}"><input name="portalPageId" value="${portalPage.portalPageId}" type="hidden"/><input name="columnSeqId" value="${portalPageColumn.columnSeqId}" type="hidden"/><input name="parentPortalPageId" value="${parameters.parentPortalPageId?if_exists}" type="hidden"/></form><a class="buttontext" href="javascript:document.delPortalPageId_${portalPageColumn_index}.submit()">${uiLabelMap.CommonRemove}</a></li> - <li id="add-portlet_${line}"><form method="post" action="<@ofbizUrl>AddPortlet${Adm?if_exists}</@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="addPortlet_${portalPageColumn_index}"><input name="portalPageId" value="${portalPage.portalPageId}" type="hidden"/><input name="columnSeqId" value="${portalPageColumn.columnSeqId}" type="hidden"/><input name="parentPortalPageId" value="${parameters.parentPortalPageId?if_exists}" type="hidden"/></form><a class="buttontext" href="javascript:document.addPortlet_${portalPageColumn_index}.submit()">${uiLabelMap.CommonAddAPortlet}</a></li> + <li id="delete-column_${line}"><form method="post" action="<@ofbizUrl>deletePortalPageColumn</@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="delPortalPageId_${portalPageColumn_index}"><input name="portalPageId" value="${portalPage.portalPageId}" type="hidden"/><input name="columnSeqId" value="${portalPageColumn.columnSeqId}" type="hidden"/><input name="parentPortalPageId" value="${parameters.parentPortalPageId?if_exists}" type="hidden"/></form><a class="buttontext" href="javascript:document.delPortalPageId_${portalPageColumn_index}.submit()">${uiLabelMap.CommonRemove}</a></li> + <li id="add-portlet_${line}"><form method="post" action="<@ofbizUrl>addPortlet</@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="addPortlet_${portalPageColumn_index}"><input name="portalPageId" value="${portalPage.portalPageId}" type="hidden"/><input name="columnSeqId" value="${portalPageColumn.columnSeqId}" type="hidden"/><input name="parentPortalPageId" value="${parameters.parentPortalPageId?if_exists}" type="hidden"/></form><a class="buttontext" href="javascript:document.addPortlet_${portalPageColumn_index}.submit()">${uiLabelMap.CommonAddAPortlet}</a></li> <li id="column-width_${line}"> - <form method="post" action="<@ofbizUrl>updatePortalPageColumn${Adm?if_exists}</@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="updatePortalPageColum_${portalPageColumn_index}"> + <form method="post" action="<@ofbizUrl>updatePortalPageColumn</@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="updatePortalPageColum_${portalPageColumn_index}"> <input name="portalPageId" value="${portalPage.portalPageId}" type="hidden"/> <input name="columnSeqId" value="${portalPageColumn.columnSeqId}" type="hidden"/> <input name="parentPortalPageId" value="${parameters.parentPortalPageId?if_exists}" type="hidden"/> @@ -66,7 +66,7 @@ under the License. <div class="portlet-config-title-bar"> <#list portalPages as portalPageList> <#if portalPage.portalPageId != portalPageList.portalPageId> - <form method="post" action="<@ofbizUrl>movePortletToPortalPage${Adm?if_exists}</@ofbizUrl>" name="movePP_${portlet_index}_${portalPageList_index}"> + <form method="post" action="<@ofbizUrl>movePortletToPortalPage</@ofbizUrl>" name="movePP_${portlet_index}_${portalPageList_index}"> ${portletFields} <input name="newPortalPageId" value="${portalPageList.portalPageId}" type="hidden"/> </form> @@ -74,29 +74,29 @@ under the License. </#list> <ul> <li class="title">Portlet : ${portlet.portletName?if_exists} [${portlet.portalPortletId}]</li> - <li class="remove"><form method="post" action="<@ofbizUrl>deletePortalPagePortlet${Adm?if_exists}</@ofbizUrl>" name="removePP_${portlet_index}">${portletFields}</form><a href="javascript:document.removePP_${portlet_index}.submit()"> </a></li> + <li class="remove"><form method="post" action="<@ofbizUrl>deletePortalPagePortlet</@ofbizUrl>" name="removePP_${portlet_index}">${portletFields}</form><a href="javascript:document.removePP_${portlet_index}.submit()"> </a></li> <#if (portlet.editFormName?has_content && portlet.editFormLocation?has_content)> - <li class="edit"><form method="post" action="<@ofbizUrl>ManagePortalPages${Adm?if_exists}</@ofbizUrl>" name="editPP_${portlet_index}">${portletFields}<input name="editAttributes" value="Y" type="hidden"/></form><a href="javascript:document.editPP_${portlet_index}.submit()"> </a></li> + <li class="edit"><form method="post" action="<@ofbizUrl>editPortalPortletAttributes</@ofbizUrl>" name="editPP_${portlet_index}">${portletFields}</form><a href="javascript:document.editPP_${portlet_index}.submit()"> </a></li> </#if> <#if !firstInColumn> - <li class="move-up"><form method="post" action="<@ofbizUrl>updatePortalPagePortletSeq${Adm?if_exists}</@ofbizUrl>" name="moveUpPP_${portlet_index}">${portletFields}<input name="mode" value="UP" type="hidden"/></form><a href="javascript:document.moveUpPP_${portlet_index}.submit()"> </a></li> + <li class="move-up"><form method="post" action="<@ofbizUrl>updatePortalPagePortletSeq</@ofbizUrl>" name="moveUpPP_${portlet_index}">${portletFields}<input name="mode" value="UP" type="hidden"/></form><a href="javascript:document.moveUpPP_${portlet_index}.submit()"> </a></li> </#if> <#if portlet_has_next> - <li class="move-down"><form method="post" action="<@ofbizUrl>updatePortalPagePortletSeq${Adm?if_exists}</@ofbizUrl>" name="moveDownPP_${portlet_index}">${portletFields}<input name="mode" value="DOWN" type="hidden"/></form><a href="javascript:document.moveDownPP_${portlet_index}.submit()"> </a></li> + <li class="move-down"><form method="post" action="<@ofbizUrl>updatePortalPagePortletSeq</@ofbizUrl>" name="moveDownPP_${portlet_index}">${portletFields}<input name="mode" value="DOWN" type="hidden"/></form><a href="javascript:document.moveDownPP_${portlet_index}.submit()"> </a></li> </#if> <#if portalPageColumn_has_next> - <li class="move-right"><form method="post" action="<@ofbizUrl>updatePortalPagePortlet${Adm?if_exists}</@ofbizUrl>" name="moveRightPP_${portlet_index}">${portletFields}<input name="columnSeqId" value="${portalPageColumnList[portalPageColumn_index+1].columnSeqId}" type="hidden"/><input name="mode" value="RIGHT" type="hidden"/></form><a href="javascript:document.moveRightPP_${portlet_index}.submit()"> </a></li> + <li class="move-right"><form method="post" action="<@ofbizUrl>updatePortalPagePortlet</@ofbizUrl>" name="moveRightPP_${portlet_index}">${portletFields}<input name="columnSeqId" value="${portalPageColumnList[portalPageColumn_index+1].columnSeqId}" type="hidden"/><input name="mode" value="RIGHT" type="hidden"/></form><a href="javascript:document.moveRightPP_${portlet_index}.submit()"> </a></li> </#if> <#if (portalPageColumn_index > 0)> - <li class="move-left"><form method="post" action="<@ofbizUrl>updatePortalPagePortlet${Adm?if_exists}</@ofbizUrl>" name="moveLeftPP_${portlet_index}">${portletFields}<input name="columnSeqId" value="${portalPageColumnList[portalPageColumn_index-1].columnSeqId}" type="hidden"/><input name="mode" value="LEFT" type="hidden"/></form><a href="javascript:document.moveLeftPP_${portlet_index}.submit()"> </a></li> + <li class="move-left"><form method="post" action="<@ofbizUrl>updatePortalPagePortlet</@ofbizUrl>" name="moveLeftPP_${portlet_index}">${portletFields}<input name="columnSeqId" value="${portalPageColumnList[portalPageColumn_index-1].columnSeqId}" type="hidden"/><input name="mode" value="LEFT" type="hidden"/></form><a href="javascript:document.moveLeftPP_${portlet_index}.submit()"> </a></li> </#if> <#if !firstInColumn> - <li class="move-top"><form method="post" action="<@ofbizUrl>updatePortalPagePortletSeq${Adm?if_exists}</@ofbizUrl>" name="moveTopPP_${portlet_index}">${portletFields}<input name="mode" value="TOP" type="hidden"/></form><a href="javascript:document.moveTopPP_${portlet_index}.submit()"> </a></li> + <li class="move-top"><form method="post" action="<@ofbizUrl>updatePortalPagePortletSeq</@ofbizUrl>" name="moveTopPP_${portlet_index}">${portletFields}<input name="mode" value="TOP" type="hidden"/></form><a href="javascript:document.moveTopPP_${portlet_index}.submit()"> </a></li> </#if> <#if portlet_has_next> - <li class="move-bottom"><form method="post" action="<@ofbizUrl>updatePortalPagePortletSeq${Adm?if_exists}</@ofbizUrl>" name="moveBottomPP_${portlet_index}">${portletFields}<input name="mode" value="BOTTOM" type="hidden"/></form><a href="javascript:document.moveBottomPP_${portlet_index}.submit()"> </a></li> + <li class="move-bottom"><form method="post" action="<@ofbizUrl>updatePortalPagePortletSeq</@ofbizUrl>" name="moveBottomPP_${portlet_index}">${portletFields}<input name="mode" value="BOTTOM" type="hidden"/></form><a href="javascript:document.moveBottomPP_${portlet_index}.submit()"> </a></li> </#if> <#if (portalPages.size() > 1)> <li> Modified: ofbiz/branches/jquery/framework/common/webcommon/portal/listPortalPortlets.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/webcommon/portal/listPortalPortlets.ftl?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/webcommon/portal/listPortalPortlets.ftl (original) +++ ofbiz/branches/jquery/framework/common/webcommon/portal/listPortalPortlets.ftl Tue Sep 21 11:36:01 2010 @@ -40,7 +40,7 @@ under the License. <tr> <td> <div class="h2"> - <form method="post" action="<@ofbizUrl>createPortalPagePortlet${Adm?if_exists}</@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="createPortalPortlet_${portalPortlet.portalPortletId}"><input name="portalPortletId" value="${portalPortlet.portalPortletId}" type="hidden"/><input name="portalPageId" value="${parameters.portalPageId}" type="hidden"/><input name="columnSeqId" value="${parameters.columnSeqId}" type="hidden"/></form><a class="buttontext" href="javascript:document.createPortalPortlet_${portalPortlet.portalPortletId}.submit()">${uiLabelMap.CommonAdd}: ${portalPortlet.portletName}</a> + <form method="post" action="<@ofbizUrl>createPortalPagePortlet</@ofbizUrl>" onsubmit="javascript:submitFormDisableSubmits(this)" name="createPortalPortlet_${portalPortlet.portalPortletId}"><input name="portalPortletId" value="${portalPortlet.portalPortletId}" type="hidden"/><input name="portalPageId" value="${parameters.portalPageId}" type="hidden"/><input name="columnSeqId" value="${parameters.columnSeqId}" type="hidden"/></form><a class="buttontext" href="javascript:document.createPortalPortlet_${portalPortlet.portalPortletId}.submit()">${uiLabelMap.CommonAdd}: ${portalPortlet.portletName}</a> </div> <div class="tabletext"> ${portalPortlet.description?if_exists} Modified: ofbiz/branches/jquery/framework/common/webcommon/portal/portalPageHeader.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/webcommon/portal/portalPageHeader.ftl?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/webcommon/portal/portalPageHeader.ftl (original) +++ ofbiz/branches/jquery/framework/common/webcommon/portal/portalPageHeader.ftl Tue Sep 21 11:36:01 2010 @@ -40,7 +40,7 @@ under the License. <#if configurePortalPage?has_content> <li id="add-portlet"> - <a href="<@ofbizUrl>AddPortlet?portalPageId=${currentPortalPage.portalPageId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonAddAPortlet}</a> + <a href="<@ofbizUrl>addPortlet?portalPageId=${currentPortalPage.portalPageId}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonAddAPortlet}</a> </li> </#if> Propchange: ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Sep 21 11:36:01 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/applications/commonext/widget/HelpScreens.xml:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264 -/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-996840 +/ofbiz/trunk/framework/common/widget/HelpScreens.xml:951708-999128 Modified: ofbiz/branches/jquery/framework/common/widget/PortalPageForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jquery/framework/common/widget/PortalPageForms.xml?rev=999327&r1=999326&r2=999327&view=diff ============================================================================== --- ofbiz/branches/jquery/framework/common/widget/PortalPageForms.xml (original) +++ ofbiz/branches/jquery/framework/common/widget/PortalPageForms.xml Tue Sep 21 11:36:01 2010 @@ -102,10 +102,10 @@ under the License. <field name="createButton"><submit button-type="button"/></field> </form> - <form name="PortletCategoryAndPortlet" type="list" list-name="portletCat" paginate-target="AddPortlet${Adm}" separate-columns="true" + <form name="PortletCategoryAndPortlet" type="list" list-name="portletCat" paginate-target="addPortlet" separate-columns="true" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <field name="portletCategoryId" title="Category"> - <hyperlink description="${portletCategoryId}" target="AddPortlet${Adm}"> + <hyperlink description="${portletCategoryId}" target="addPortlet"> <parameter param-name="portletCategoryId"/> <parameter param-name="portalPortletId"/> <parameter param-name="portalPageId" from-field="parameters.portalPageId"/> @@ -140,4 +140,12 @@ under the License. <hyperlink target="javascript:ajaxUpdateArea('List${entity}Area', 'list${entity}', $(FindGenericEntity).serialize());" target-type="plain" description="${uiLabelMap.CommonSearch}"/> </field> </form> + + <form name="EditPortalPageColumnWidth" type="single" target="updatePortalPageColumnWidth" default-map-name="portalPageColumn"> + <field name="portalPageId"><hidden/></field> + <field name="columnSeqId"><hidden/></field> + <field name="columnWidthPixels"><text/></field> + <field name="columnWidthPercentage"><text/></field> + <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> + </form> </forms> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |