svn commit: r1096705 [2/3] - in /ofbiz/branches/jackrabbit2010
Locked
svn commit: r1096705 [2/3] - in /ofbiz/branches/jackrabbit2010
 
|
Propchange: ofbiz/branches/jackrabbit20100709/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 26 09:39:01 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4:951708-952957 /ofbiz/branches/jquery:952958-1044489 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:962442-1094239 +/ofbiz/trunk:962442-1096699 Modified: ofbiz/branches/jackrabbit20100709/LICENSE URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/LICENSE?rev=1096705&r1=1096704&r2=1096705&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/LICENSE (original) +++ ofbiz/branches/jackrabbit20100709/LICENSE Tue Apr 26 09:39:01 2011 @@ -2736,3 +2736,220 @@ GNU Free Documentation License It was allowed by the author to use the docbook files within the Apache OFBiz system in an email to H.Bakker from N.Walsh dd Tue, 25 Aug 2009 07:27:51 -0400 (18:27 ICT) +========================================================================= +Apache Ofbiz includes images in the ofbiz/framework/images/webapp/images/icons +directory with the following licence: Creative Commons Attribution 2.5 License +and condition : + + +========================================================================= +Creative Commons Attribution 2.5 License. +http://creativecommons.org/licenses/by/2.5/ + +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE +COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY +COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS +AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE +TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS +CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. + +1. Definitions + 1. "Collective Work" means a work, such as a periodical issue, + anthology or encyclopedia, in which the Work in its + entirety in unmodified form, along with a number of + other contributions, constituting separate and independent + works in themselves, are assembled into a collective whole. + A work that constitutes a Collective Work will not be + considered a Derivative Work (as defined below) for the + purposes of this License. + 2. "Derivative Work" means a work based upon the Work or upon + the Work and other pre-existing works, such as a + translation, musical arrangement, dramatization, + fictionalization, motion picture version, sound recording, + art reproduction, abridgment, condensation, or any other + form in which the Work may be recast, transformed, + or adapted, except that a work that constitutes + a Collective Work will not be considered a Derivative + Work for the purpose of this License. + For the avoidance of doubt, where the Work is a musical + composition or sound recording, the synchronization of + the Work in timed-relation with a moving image ("synching") + will be considered a Derivative Work for the purpose + of this License. + 3. "Licensor" means the individual or entity that offers + the Work under the terms of this License. + 4. "Original Author" means the individual or entity who + created the Work. + 5. "Work" means the copyrightable work of authorship offered + under the terms of this License. + 6. "You" means an individual or entity exercising rights under + this License who has not previously violated the terms of + this License with respect to the Work, or who has received + express permission from the Licensor to exercise rights + under this License despite a previous violation. + +2. Fair Use Rights. Nothing in this license is intended to reduce, + limit, or restrict any rights arising from fair use, first + sale or other limitations on the exclusive rights of the + copyright owner under copyright law or other applicable laws. + +3. License Grant. Subject to the terms and conditions of + this License, Licensor hereby grants You a worldwide, + royalty-free, non-exclusive, perpetual (for the + duration of the applicable copyright) license to + exercise the rights in the Work as stated below: + + 1. to reproduce the Work, to incorporate the Work into + one or more Collective Works, and to reproduce the + Work as incorporated in the Collective Works; + 2. to create and reproduce Derivative Works; + 3. to distribute copies or phonorecords of, display + publicly, perform publicly, and perform publicly + by means of a digital audio transmission the Work + including as incorporated in Collective Works; + 4. to distribute copies or phonorecords of, display publicly, + perform publicly, and perform publicly by means of a + digital audio transmission Derivative Works. + 5. For the avoidance of doubt, where the work is + a musical composition: + 1. Performance Royalties Under Blanket Licenses. + Licensor waives the exclusive right to collect, + whether individually or via a performance rights + society (e.g. ASCAP, BMI, SESAC), royalties for the + public performance or public digital performance + (e.g. webcast) of the Work. + 2. Mechanical Rights and Statutory Royalties. + Licensor waives the exclusive right to collect, + whether individually or via a music rights agency + or designated agent (e.g. Harry Fox Agency), + royalties for any phonorecord You create from + the Work ("cover version") and distribute, + subject to the compulsory license created by + 17 USC Section 115 of the US Copyright Act + (or the equivalent in other jurisdictions). + 6. Webcasting Rights and Statutory Royalties. + For the avoidance of doubt, where the Work is a sound + recording, Licensor waives the exclusive right to collect, + whether individually or via a performance-rights society + (e.g. SoundExchange), royalties for the public digital + performance (e.g. webcast) of the Work, subject to the + compulsory license created by 17 USC Section 114 of the + US Copyright Act (or the equivalent in other jurisdictions). + +The above rights may be exercised in all media and formats whether +now known or hereafter devised. The above rights include the right +to make such modifications as are technically necessary to exercise +the rights in other media and formats. All rights not expressly +granted by Licensor are hereby reserved. + +4. Restrictions.The license granted in Section 3 above is expressly + made subject to and limited by the following restrictions: + 1. You may distribute, publicly display, publicly perform, + or publicly digitally perform the Work only under the terms + of this License, and You must include a copy of, or the + Uniform Resource Identifier for, this License with every + copy or phonorecord of the Work You distribute, publicly + display, publicly perform, or publicly digitally perform. + You may not offer or impose any terms on the Work that alter + or restrict the terms of this License or the recipients' + exercise of the rights granted hereunder. You may not + sublicense the Work. You must keep intact all notices + that refer to this License and to the disclaimer of warranties. + You may not distribute, publicly display, publicly perform, + or publicly digitally perform the Work with any technological + measures that control access or use of the Work in a manner + inconsistent with the terms of this License Agreement. + The above applies to the Work as incorporated in a Collective + Work, but this does not require the Collective Work apart from + the Work itself to be made subject to the terms of this License. + If You create a Collective Work, upon notice from any Licensor + You must, to the extent practicable, remove from the Collective + Work any credit as required by clause 4(b), as requested. + If You create a Derivative Work, upon notice from any Licensor + You must, to the extent practicable, remove from the Derivative + Work any credit as required by clause 4(b), as requested. + 2. If you distribute, publicly display, publicly perform, + or publicly digitally perform the Work or any Derivative + Works or Collective Works, You must keep intact all copyright + notices for the Work and provide, reasonable to the medium + or means You are utilizing: (i) the name of the Original Author + (or pseudonym, if applicable) if supplied, and/or (ii) if the + Original Author and/or Licensor designate another party or + parties (e.g. a sponsor institute, publishing entity, journal) + for attribution in Licensor's copyright notice, terms of + service or by other reasonable means, the name of such party + or parties; the title of the Work if supplied; to the extent + reasonably practicable, the Uniform Resource Identifier, + if any, that Licensor specifies to be associated with the Work, + unless such URI does not refer to the copyright notice or + licensing information for the Work; and in the case of a + Derivative Work, a credit identifying the use of the Work + in the Derivative Work (e.g., "French translation of the Work + by Original Author," or "Screenplay based on original Work by + Original Author"). Such credit may be implemented in any + reasonable manner; provided, however, that in the case of a + Derivative Work or Collective Work, at a minimum such credit + will appear where any other comparable authorship credit appears + and in a manner at least as prominent as such other comparable + authorship credit. + +5. Representations, Warranties and Disclaimer +UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR +OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY +KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, +INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, +FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF +LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, +WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE +EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. + +6. Limitation on Liability. +EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR +BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, +CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE +OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY +OF SUCH DAMAGES. + +7. Termination + 1. This License and the rights granted hereunder will terminate + automatically upon any breach by You of the terms of this License. + Individuals or entities who have received Derivative Works or + Collective Works from You under this License, however, will not + have their licenses terminated provided such individuals or entities + remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, + and 8 will survive any termination of this License. + 2. Subject to the above terms and conditions, the license granted + here is perpetual (for the duration of the applicable copyright + in the Work). Notwithstanding the above, Licensor reserves the + right to release the Work under different license terms or to + stop distributing the Work at any time; provided, however that + any such election will not serve to withdraw this License + (or any other license that has been, or is required to be, granted + under the terms of this License), and this License will continue in + full force and effect unless terminated as stated above. + +8. Miscellaneous + 1. Each time You distribute or publicly digitally perform the Work or + a Collective Work, the Licensor offers to the recipient a license to + the Work on the same terms and conditions as the license granted to + You under this License. + 2. Each time You distribute or publicly digitally perform a Derivative Work, + Licensor offers to the recipient a license to the original Work on the + same terms and conditions as the license granted to You under this License. + 3. If any provision of this License is invalid or unenforceable under + applicable law, it shall not affect the validity or enforceability of the + remainder of the terms of this License, and without further action by the + parties to this agreement, such provision shall be reformed to the minimum + extent necessary to make such provision valid and enforceable. + 4. No term or provision of this License shall be deemed waived and no breach + consented to unless such waiver or consent shall be in writing and signed + by the party to be charged with such waiver or consent. + 5. This License constitutes the entire agreement between the parties with + respect to the Work licensed here. There are no understandings, agreements + or representations with respect to the Work not specified here. + Licensor shall not be bound by any additional provisions that may appear + in any communication from You. This License may not be modified without + the mutual written agreement of the Licensor and You. + Modified: ofbiz/branches/jackrabbit20100709/NOTICE URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/NOTICE?rev=1096705&r1=1096704&r2=1096705&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/NOTICE (original) +++ ofbiz/branches/jackrabbit20100709/NOTICE Tue Apr 26 09:39:01 2011 @@ -325,7 +325,7 @@ waived to the extent necessary for this enforceable in such jurisdiction. ========================================================================= -== CoolTips Notice == +== CoolTips Notice == ========================================================================= This product includes software developed by Andrej Okonetschnikow (http://code.google.com/p/tooltips/). @@ -358,3 +358,32 @@ Extreme! Lab (http://www.extreme.indiana This product includes software developed by Marc Prud'hommeaux <[hidden email]> +========================================================================= +== FamFamFam Notice == +========================================================================= + +This product includes images delevoped by Mark James <[hidden email]> +Birmingham, UK. www.famfamfam.com + +Creative Commons Attribution 2.5 License. +http://creativecommons.org/licenses/by/2.5/ + +You are free: + + * to Share ââ¬â to copy, distribute and transmit the work + * to Remix ââ¬â to adapt the work + +Under the following conditions: + + * Attribution. You must attribute the work in the manner specified + by the author or licensor (but not in any way that suggests that + they endorse you or your use of the work). + * For any reuse or distribution, you must make clear to + others the license terms of this work. The best way to do + this is with a link to this web page. + * Any of the above conditions can be waived if you get + * For any reuse or distribution, you must make clear to + permission from the copyright holder. + * Nothing in this license impairs or restricts the + * For any reuse or distribution, you must make clear to + author's moral rights. Propchange: ofbiz/branches/jackrabbit20100709/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 26 09:39:01 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:951708-952957 /ofbiz/branches/jquery/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:952958-1044489 /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:962442-1094239 +/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:962442-1096699 Modified: ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=1096705&r1=1096704&r2=1096705&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderServices.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/order/src/org/ofbiz/order/order/OrderServices.java Tue Apr 26 09:39:01 2011 @@ -1104,6 +1104,9 @@ public class OrderServices { while (orderTermIter.hasNext()) { GenericValue orderTerm = orderTermIter.next(); orderTerm.set("orderId", orderId); + if (orderTerm.get("orderItemSeqId") == null) { + orderTerm.set("orderItemSeqId", "_NA_"); + } toBeStored.add(orderTerm); } } Modified: ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/party/PartyServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/party/PartyServices.java?rev=1096705&r1=1096704&r2=1096705&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/party/PartyServices.java (original) +++ ofbiz/branches/jackrabbit20100709/applications/party/src/org/ofbiz/party/party/PartyServices.java Tue Apr 26 09:39:01 2011 @@ -1652,7 +1652,23 @@ public class PartyServices { return ServiceUtil.returnError(e.getMessage()); } - // TODO: there are a number of other places which may need to be updated + // update the Product Store Role records + try { + delegator.storeByCondition("ProductStoreRole", UtilMisc.<String, Object>toMap("partyId", partyIdTo, "thruDate", now), + EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, partyId)); + } catch (GenericEntityException e) { + Debug.logError(e, module); + return ServiceUtil.returnError(e.getMessage()); + } + + // update the Communication Event Role records + try { + delegator.storeByCondition("CommunicationEventRole", UtilMisc.toMap("partyId", partyIdTo), + EntityCondition.makeCondition("partyId", EntityOperator.EQUALS, partyId)); + } catch (GenericEntityException e) { + Debug.logError(e, module); + return ServiceUtil.returnError(e.getMessage()); + } // remove all previous party roles try { Propchange: ofbiz/branches/jackrabbit20100709/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 26 09:39:01 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:951708-952957 /ofbiz/branches/jquery/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:952958-1044489 /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:962442-1094239 +/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:962442-1096699 Modified: ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml?rev=1096705&r1=1096704&r2=1096705&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/config/ProductUiLabels.xml Tue Apr 26 09:39:01 2011 @@ -17678,7 +17678,7 @@ </property> <property key="ProductOrderDecimalQuantityExistsToOverride"> <value xml:lang="en">Allow decimal quantity to order can be define by product</value> - <value xml:lang="fr">La possibilité de commandé une quantité décimal peut être définie par produit</value> + <value xml:lang="fr">La possibilité de commander une quantité décimale peut être définie par produit</value> </property> <property key="ProductOrderId"> <value xml:lang="de">Auftrag ID</value> Propchange: ofbiz/branches/jackrabbit20100709/applications/product/script/org/ofbiz/product/test/InventoryTests.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 26 09:39:01 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:951708-952957 /ofbiz/branches/jquery/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:952958-1044489 /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:962442-1094239 +/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:962442-1096699 Modified: ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductForms.xml?rev=1096705&r1=1096704&r2=1096705&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/applications/product/widget/catalog/ProductForms.xml Tue Apr 26 09:39:01 2011 @@ -47,7 +47,7 @@ under the License. <parameter param-name="productId"/> </hyperlink> </field> - + <field name="internalName" sort-field="true"><display/></field> <field name="brandName" sort-field="true"><display/></field> <field name="productName" sort-field="true"><display/></field> @@ -96,7 +96,7 @@ under the License. </drop-down> </field> - <field position="1" name="internalName" title="${uiLabelMap.ProductInternalName}"><text size="30" maxlength="255"/></field> + <field position="1" name="internalName" title="${uiLabelMap.ProductInternalName}" required-field="true"><text size="30" maxlength="255"/></field> <field position="2" name="brandName" title="${uiLabelMap.ProductBrandName}" ><text size="30" maxlength="60"/></field> <field name="manufacturerPartyId" title="${uiLabelMap.ProductOemPartyId}" ><text size="20" maxlength="20"/></field> <field name="comments" title="${uiLabelMap.CommonComments}"><text size="60" maxlength="250"/></field> @@ -2032,7 +2032,7 @@ under the License. </field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - + <form name="ListBestProduct" type="list" paginate="false" list-name="bestSellingProducts" view-size="5" header-row-style="header-row" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <field name="productName" title="${uiLabelMap.ProductName}"><display description="${productName}"/></field> @@ -2066,7 +2066,7 @@ under the License. header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="addPartyToProduct"/> <field name="productId"><hidden/></field> - <field name="partyId"><lookup target-form-name="LookupPartyName"/></field> + <field name="partyId"><lookup target-form-name="LookupPartyName"/></field> <field name="roleTypeId"> <drop-down allow-empty="false"> <entity-options entity-name="RoleType" description="${description}" key-field-name="roleTypeId"> Modified: ofbiz/branches/jackrabbit20100709/framework/common/data/GeoData_CN.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/data/GeoData_CN.xml?rev=1096705&r1=1096704&r2=1096705&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/data/GeoData_CN.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/data/GeoData_CN.xml Tue Apr 26 09:39:01 2011 @@ -51,13 +51,13 @@ under the License. <Geo abbreviation="粤" geoCode="44" geoId="CN-44" geoName="广ä¸" geoTypeId="PROVINCE" wellKnownText="Guangdong"/> <Geo abbreviation="é½" geoCode="35" geoId="CN-35" geoName="ç¦å»º" geoTypeId="PROVINCE" wellKnownText="Fujian"/> <Geo abbreviation="å°" geoCode="71" geoId="CN-71" geoName="å°æ¹¾" geoTypeId="PROVINCE" wellKnownText="Taiwan"/> - <Geo abbreviation="æ¡" geoCode="45" geoId="CN-45" geoName="广西" geoTypeId="REGION" wellKnownText="Guangxi"/> - <Geo abbreviation="å èå¤" geoCode="15" geoId="CN-15" geoName="å èå¤" geoTypeId="REGION" wellKnownText="Inner Mongolia"/> - <Geo abbreviation="å®" geoCode="64" geoId="CN-64" geoName="å®å¤" geoTypeId="REGION" wellKnownText="Ningxia"/> - <Geo abbreviation="æ°" geoCode="65" geoId="CN-65" geoName="æ°ç" geoTypeId="REGION" wellKnownText="Xinjiang"/> - <Geo abbreviation="è" geoCode="54" geoId="CN-54" geoName="西è" geoTypeId="REGION" wellKnownText="Tibet"/> - <Geo abbreviation="é¦æ¸¯" geoCode="91" geoId="CN-91" geoName="é¦æ¸¯" geoTypeId="REGION" wellKnownText="Hong Kong"/> - <Geo abbreviation="æ¾³é¨" geoCode="92" geoId="CN-92" geoName="æ¾³é¨" geoTypeId="REGION" wellKnownText="Macau"/> + <Geo abbreviation="æ¡" geoCode="45" geoId="CN-45" geoName="广西" geoTypeId="MUNICIPALITY" wellKnownText="Guangxi"/> + <Geo abbreviation="å èå¤" geoCode="15" geoId="CN-15" geoName="å èå¤" geoTypeId="MUNICIPALITY" wellKnownText="Inner Mongolia"/> + <Geo abbreviation="å®" geoCode="64" geoId="CN-64" geoName="å®å¤" geoTypeId="MUNICIPALITY" wellKnownText="Ningxia"/> + <Geo abbreviation="æ°" geoCode="65" geoId="CN-65" geoName="æ°ç" geoTypeId="MUNICIPALITY" wellKnownText="Xinjiang"/> + <Geo abbreviation="è" geoCode="54" geoId="CN-54" geoName="西è" geoTypeId="MUNICIPALITY" wellKnownText="Tibet"/> + <Geo abbreviation="é¦æ¸¯" geoCode="91" geoId="CN-91" geoName="é¦æ¸¯" geoTypeId="MUNICIPALITY" wellKnownText="Hong Kong"/> + <Geo abbreviation="æ¾³é¨" geoCode="92" geoId="CN-92" geoName="æ¾³é¨" geoTypeId="MUNICIPALITY" wellKnownText="Macau"/> <GeoAssoc geoId="CHN" geoIdTo="CN-11" geoAssocTypeId="REGIONS"/> <GeoAssoc geoId="CHN" geoIdTo="CN-50" geoAssocTypeId="REGIONS"/> @@ -86,6 +86,8 @@ under the License. <GeoAssoc geoId="CHN" geoIdTo="CN-44" geoAssocTypeId="REGIONS"/> <GeoAssoc geoId="CHN" geoIdTo="CN-35" geoAssocTypeId="REGIONS"/> <GeoAssoc geoId="CHN" geoIdTo="CN-71" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="CHN" geoIdTo="CN-45" geoAssocTypeId="REGIONS"/> + <GeoAssoc geoId="CHN" geoIdTo="CN-15" geoAssocTypeId="REGIONS"/> <GeoAssoc geoId="CHN" geoIdTo="CN-64" geoAssocTypeId="REGIONS"/> <GeoAssoc geoId="CHN" geoIdTo="CN-65" geoAssocTypeId="REGIONS"/> <GeoAssoc geoId="CHN" geoIdTo="CN-54" geoAssocTypeId="REGIONS"/> Modified: ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/CommonWorkers.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/CommonWorkers.java?rev=1096705&r1=1096704&r2=1096705&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/CommonWorkers.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/src/org/ofbiz/common/CommonWorkers.java Tue Apr 26 09:39:01 2011 @@ -91,7 +91,7 @@ public class CommonWorkers { List<GenericValue> geoList = FastList.newInstance(); EntityCondition condition = EntityCondition.makeCondition(EntityOperator.OR, EntityCondition.makeCondition("geoTypeId", "STATE"), EntityCondition.makeCondition("geoTypeId", "PROVINCE"), - EntityCondition.makeCondition("geoTypeId", "TERRITORY")); + EntityCondition.makeCondition("geoTypeId", "TERRITORY"), EntityCondition.makeCondition("geoTypeId", "MUNICIPALITY")); List<String> sortList = UtilMisc.toList("geoName"); try { geoList = delegator.findList("Geo", condition, null, sortList, null, true); @@ -119,6 +119,7 @@ public class CommonWorkers { EntityCondition.makeCondition(EntityOperator.OR, EntityCondition.makeCondition("geoTypeId", "STATE"), EntityCondition.makeCondition("geoTypeId", "PROVINCE"), + EntityCondition.makeCondition("geoTypeId", "MUNICIPALITY"), EntityCondition.makeCondition("geoTypeId", "COUNTY"))); if (UtilValidate.isEmpty(listOrderBy)) { Modified: ofbiz/branches/jackrabbit20100709/framework/common/webcommon/WEB-INF/portal-controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/webcommon/WEB-INF/portal-controller.xml?rev=1096705&r1=1096704&r2=1096705&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/webcommon/WEB-INF/portal-controller.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/webcommon/WEB-INF/portal-controller.xml Tue Apr 26 09:39:01 2011 @@ -166,6 +166,7 @@ under the License. <security https="true" auth="false"/> <response name="success" type="view" value="editPortalPageColumnWidth" save-last-view="true"/> </request-map> + <request-map uri="LookupPortalPage"><security https="true" auth="true"/><response name="success" type="view" value="LookupPortalPage"/></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"/> @@ -177,4 +178,5 @@ under the License. <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"/> + <view-map name="LookupPortalPage" type="screen" page="component://common/widget/LookupScreens.xml#LookupPortalPage"/> </site-conf> Modified: ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml?rev=1096705&r1=1096704&r2=1096705&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/widget/CommonScreens.xml Tue Apr 26 09:39:01 2011 @@ -138,6 +138,7 @@ under the License. <field-map field-name="themeResources" from-field="layoutSettings"/> </service> <set field="layoutSettings" from-field="themeResources" default-value="${layoutSettings}" global="true"/> + <set field="iconsLocation" from-field="layoutSettings.VT_ICONS_LOC[0]" default-value="/images/icons/famfamfam" global="true"/> <set field="headerTemplateLocation" from-field="layoutSettings.VT_HDR_TMPLT_LOC[0]"/> <set field="footerTemplateLocation" from-field="layoutSettings.VT_FTR_TMPLT_LOC[0]"/> <set field="appbarTemplateLocation" from-field="layoutSettings.VT_NAV_TMPLT_LOC[0]"/> Propchange: ofbiz/branches/jackrabbit20100709/framework/common/widget/HelpScreens.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 26 09:39:01 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/framework/common/widget/HelpScreens.xml:951708-952957 /ofbiz/branches/jquery/framework/common/widget/HelpScreens.xml:952958-1044489 /ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264 -/ofbiz/trunk/framework/common/widget/HelpScreens.xml:962442-1094239 +/ofbiz/trunk/framework/common/widget/HelpScreens.xml:962442-1096699 Modified: ofbiz/branches/jackrabbit20100709/framework/common/widget/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/widget/LookupForms.xml?rev=1096705&r1=1096704&r2=1096705&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/widget/LookupForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/widget/LookupForms.xml Tue Apr 26 09:39:01 2011 @@ -92,4 +92,26 @@ under the License. <field name="disabledDateTime"><display/></field> </form> + <form name="LookupPortalPage" type="single" target="LookupPortalPage"> + <auto-fields-entity entity-name="PortalPage" default-field-type="find"/> + <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> + <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field> + </form> + + <form name="ListPortalPages" type="list" list-name="listIt" paginate-target="LookupPortalPage" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + <actions> + <service service-name="performFind" result-map="result" result-map-list="listIt"> + <field-map field-name="inputFields" from-field="parameters"/> + <field-map field-name="orderBy" value="portalPageId"/> + <field-map field-name="entityName" value="PortalPage"/> + <field-map field-name="viewIndex" from-field="viewIndex"/> + <field-map field-name="viewSize" from-field="viewSize"/> + </service> + </actions> + <auto-fields-entity entity-name="PortalPage" default-field-type="display"/> + <field name="portalPageId" widget-style="smallSubmit"> + <hyperlink also-hidden="false" target-type="plain" description="${portalPageId}" target="javascript:set_value('${portalPageId}')"/> + </field> + </form> </forms> Modified: ofbiz/branches/jackrabbit20100709/framework/common/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/common/widget/LookupScreens.xml?rev=1096705&r1=1096704&r2=1096705&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/common/widget/LookupScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/common/widget/LookupScreens.xml Tue Apr 26 09:39:01 2011 @@ -207,4 +207,22 @@ under the License. </widgets> </section> </screen> + + <screen name="LookupPortalPage"> + <section> + <actions> + <set field="title" value="${uiLabelMap.CommonPortalPage}"/> + </actions> + <widgets> + <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> + <decorator-section name="search-options"> + <include-form name="LookupPortalPage" location="component://common/widget/LookupForms.xml"/> + </decorator-section> + <decorator-section name="search-results"> + <include-form name="ListPortalPages" location="component://common/widget/LookupForms.xml"/> + </decorator-section> + </decorator-screen> + </widgets> + </section> + </screen> </screens> Modified: ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/model/ModelInfo.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/model/ModelInfo.java?rev=1096705&r1=1096704&r2=1096705&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/model/ModelInfo.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/model/ModelInfo.java Tue Apr 26 09:39:01 2011 @@ -24,6 +24,7 @@ import java.util.TimeZone; import org.ofbiz.base.util.StringUtil; import org.ofbiz.base.util.UtilDateTime; import org.ofbiz.base.util.UtilXml; +import org.ofbiz.base.util.UtilValidate; import org.w3c.dom.Element; /** @@ -99,7 +100,7 @@ public class ModelInfo { // Strings to go in the comment header. /** The title for documentation purposes */ public String getTitle() { - return this.title != null ? this.title : def.getTitle(); + return UtilValidate.isNotEmpty(this.title) ? this.title : def.getTitle(); } public void setTitle(String title) { @@ -108,7 +109,7 @@ public class ModelInfo { /** The description for documentation purposes */ public String getDescription() { - return this.description != null ? this.description : def.getDescription(); + return UtilValidate.isNotEmpty(this.description) ? this.description : def.getDescription(); } public void setDescription(String description) { @@ -117,7 +118,7 @@ public class ModelInfo { /** The copyright for documentation purposes */ public String getCopyright() { - return this.copyright != null ? this.copyright : def.getCopyright(); + return UtilValidate.isNotEmpty(this.copyright) ? this.copyright : def.getCopyright(); } public void setCopyright(String copyright) { @@ -126,7 +127,7 @@ public class ModelInfo { /** The author for documentation purposes */ public String getAuthor() { - return this.author != null ? this.author : def.getAuthor(); + return UtilValidate.isNotEmpty(this.author) ? this.author : def.getAuthor(); } public void setAuthor(String author) { @@ -135,7 +136,7 @@ public class ModelInfo { /** The version for documentation purposes */ public String getVersion() { - return this.version != null ? this.version : def.getVersion(); + return UtilValidate.isNotEmpty(this.version) ? this.version : def.getVersion(); } public void setVersion(String version) { @@ -144,7 +145,7 @@ public class ModelInfo { /** The default-resource-name of the Entity */ public String getDefaultResourceName() { - return this.defaultResourceName != null ? this.defaultResourceName : def.getDefaultResourceName(); + return UtilValidate.isNotEmpty(this.defaultResourceName) ? this.defaultResourceName : def.getDefaultResourceName(); } public void setDefaultResourceName(String defaultResourceName) { Modified: ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java?rev=1096705&r1=1096704&r2=1096705&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/entity/src/org/ofbiz/entity/util/EntityDataLoader.java Tue Apr 26 09:39:01 2011 @@ -98,7 +98,7 @@ public class EntityDataLoader { } // get all of the main resource model stuff, ie specified in the entityengine.xml file - EntityDataReaderInfo entityDataReaderInfo = EntityConfigUtil.getEntityDataReaderInfo(readerName); + EntityDataReaderInfo entityDataReaderInfo = EntityConfigUtil.getEntityDataReaderInfo(readerName.trim()); if (entityDataReaderInfo == null) { Debug.logInfo("Could not find entity-data-reader named: " + readerName + ". Creating a new reader with this name. ", module); Modified: ofbiz/branches/jackrabbit20100709/framework/example/config/ExampleEntityLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/example/config/ExampleEntityLabels.xml?rev=1096705&r1=1096704&r2=1096705&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/example/config/ExampleEntityLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/example/config/ExampleEntityLabels.xml Tue Apr 26 09:39:01 2011 @@ -69,6 +69,22 @@ <value xml:lang="th">สภาà¸à¸à¸µà¹à¹à¸à¹à¸à¸à¸£à¸´à¸</value> <value xml:lang="zh">çå®ä¸ç</value> </property> + + <!-- Entity descriptions. The Web Tools component will use these properties + for online documentation. Entity description property keys have the form: + EntityDescription.[entityname]. + --> + <property key="EntityDescription.Example"> + <value xml:lang="en">Example Entity</value> + </property> + + <!-- Entity field descriptions. The Web Tools component will use these properties + for online documentation. Field description property keys have two forms: + FieldDescription.[fieldname] - will be used for all fields of that name + FieldDescription.[entityname].[fieldname] - will be used for the specified + entity field + --> + <property key="FieldDescription.Example.exampleId"> <value xml:lang="en">A unique Example ID. If you don't assign an ID, one will be generated automatically</value> <value xml:lang="fr">Une réf. unique d'exemple. Si vous n'entrez pas de réf., elle sera générée automatiquement</value> @@ -134,12 +150,6 @@ <value xml:lang="th">à¸à¸±à¸§à¸à¸¢à¹à¸²à¸à¸§à¸±à¸à¸à¸µà¹</value> <value xml:lang="zh">æ ·ä¾æ¥æ</value> </property> - <!-- Entity field descriptions. The Webtools component will use these properties - for online documentation. Field description properties have two forms: - FieldDescription.[fieldname] - will be used for all fields of that name - FieldDescription.[entityname].[fieldname] - will be used for the specified - entity field - --> <property key="FieldDescription.exampleId"> <value xml:lang="en">Example ID</value> <value xml:lang="fr">Réf. d'exemple</value> Modified: ofbiz/branches/jackrabbit20100709/framework/example/config/ExampleUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/example/config/ExampleUiLabels.xml?rev=1096705&r1=1096704&r2=1096705&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/example/config/ExampleUiLabels.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/example/config/ExampleUiLabels.xml Tue Apr 26 09:39:01 2011 @@ -459,6 +459,14 @@ <value xml:lang="th">à¸à¸±à¸§à¸à¸¢à¹à¸²à¸à¸£à¸¹à¸à¹à¸à¸ Widget</value> <value xml:lang="zh">表åæä»¶æ ·ä¾</value> </property> + <property key="ExamplePortletAttributNeedToBeDefineClickHere"> + <value xml:lang="en">Portlet Attribut need to be define, click here to resolve it </value> + <value xml:lang="fr">Les attributs de la portlet doivent être definie. Cliquez ici pour résoudre le problème.</value> + </property> + <property key="ExamplePortletGoToConfiguredPortalPage"> + <value xml:lang="en">Go to configured portal page -> </value> + <value xml:lang="fr">Allez à la page portail configurée -> </value> + </property> <property key="ExampleGroupField"> <value xml:lang="en">Group</value> <value xml:lang="it">Gruppo</value> Modified: ofbiz/branches/jackrabbit20100709/framework/example/data/ExamplePortletData.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/example/data/ExamplePortletData.xml?rev=1096705&r1=1096704&r2=1096705&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/example/data/ExamplePortletData.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/example/data/ExamplePortletData.xml Tue Apr 26 09:39:01 2011 @@ -25,6 +25,7 @@ under the License. <PortalPortlet portalPortletId="EXAMPLE_2" portletName="Example 2" description="Example portlet n. 2" screenName="ExamplePortlet2" screenLocation="component://example/widget/example/PortletScreens.xml" + editFormName="ExamplePortlet2Edit" editFormLocation="component://example/widget/example/PortletEditForms.xml" screenshot="/images/opentravelsystem_logo.jpg"/> <PortalPortlet portalPortletId="EXAMPLE_3" portletName="Example 3" description="Example portlet n. 3" Modified: ofbiz/branches/jackrabbit20100709/framework/example/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/example/entitydef/entitymodel.xml?rev=1096705&r1=1096704&r2=1096705&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/example/entitydef/entitymodel.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/example/entitydef/entitymodel.xml Tue Apr 26 09:39:01 2011 @@ -39,11 +39,7 @@ under the License. <!-- org.ofbiz.example.example --> <!-- ========================================================= --> - <entity entity-name="Example" - package-name="org.ofbiz.example.example" - title="Example Entity" - default-resource-name="ExampleEntityLabels" - > + <entity entity-name="Example" package-name="org.ofbiz.example.example" title="Example Entity"> <field name="exampleId" type="id-ne"><description>primary sequenced ID</description></field> <field name="exampleTypeId" type="id-ne"></field> <field name="statusId" type="id-ne"></field> Modified: ofbiz/branches/jackrabbit20100709/framework/example/widget/example/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/example/widget/example/CommonScreens.xml?rev=1096705&r1=1096704&r2=1096705&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/example/widget/example/CommonScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/example/widget/example/CommonScreens.xml Tue Apr 26 09:39:01 2011 @@ -92,15 +92,20 @@ under the License. <widgets> <container style="h1"><label>${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor} ${example.exampleName} [${exampleId}]</label></container> <container style="button-bar"> - <link target="EditExample" text="${uiLabelMap.ExampleNewExample}" style="buttontext create"/> + <link target="EditExample" text="${uiLabelMap.ExampleNewExample}" style="buttontext create"> + <image url-mode="raw" src="${iconsLocation}/add.png"/> + </link> <link target="ExampleReportHtml" text="${uiLabelMap.CommonPrinterFriendly}" style="buttontext"> <parameter param-name="exampleId"/> + <image url-mode="raw" src="${iconsLocation}/printer.png"/> </link> <link target="ExampleReportPdf" text="${uiLabelMap.CommonPdf}" style="buttontext"> <parameter param-name="exampleId"/> + <image url-mode="raw" src="${iconsLocation}/page_white_acrobat.png"/> </link> <link target="help" text="${uiLabelMap.CommonHelp}" style="buttontext" target-window="_blank"> <parameter param-name="topic" value="ExampleEditHelp"/> + <image url-mode="raw" src="${iconsLocation}/help.png"/> </link> </container> </widgets> @@ -158,7 +163,9 @@ under the License. <label>${uiLabelMap[titleProperty]} ${uiLabelMap.CommonFor} ${exampleFeature.description} [${exampleFeatureId}]</label> </container> <container style="button-bar"> - <link target="EditExampleFeature" text="${uiLabelMap.ExampleNewExampleFeature}" style="buttontext"/> + <link target="EditExampleFeature" text="${uiLabelMap.ExampleNewExampleFeature}" style="buttontext"> + <image url-mode="raw" src="${iconsLocation}/add.png"/> + </link> </container> </widgets> <fail-widgets> Modified: ofbiz/branches/jackrabbit20100709/framework/example/widget/example/ExampleForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/example/widget/example/ExampleForms.xml?rev=1096705&r1=1096704&r2=1096705&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/example/widget/example/ExampleForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/example/widget/example/ExampleForms.xml Tue Apr 26 09:39:01 2011 @@ -37,7 +37,7 @@ under the License. <entity-options description="${description}" key-field-name="statusId" entity-name="ExampleStatusItem"/> </drop-down> </field> - <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> + <field name="searchButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button" image-location="/images/icons/magnifier.png"/></field> </form> <form name="ListExamples" type="list" list-name="listIt" paginate-target="FindExample" default-entity-name="Example" separate-columns="true" @@ -174,8 +174,8 @@ under the License. </entity-options> </drop-down> </field> - <field name="deleteLink" title="" widget-style="buttontext"> - <hyperlink target="deleteExampleItem" description="${uiLabelMap.CommonDelete}" also-hidden="false" confirmation-message="${uiLabelMap.CommonConfirmDelete}"> + <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> + <hyperlink target="deleteExampleItem" description="${uiLabelMap.CommonDelete}" also-hidden="false" confirmation-message="${uiLabelMap.CommonConfirmDelete}" image-location="${iconsLocation}/delete.png"> <parameter param-name="exampleId"/> <parameter param-name="exampleItemSeqId"/> </hyperlink> @@ -224,8 +224,8 @@ under the License. </drop-down> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> - <field name="deleteLink" title="" widget-style="buttontext"> - <hyperlink target="example_deleteExampleFeatureAppl" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> + <hyperlink target="example_deleteExampleFeatureAppl" description="${uiLabelMap.CommonDelete}" also-hidden="false" image-location="${iconsLocation}/delete.png"> <parameter param-name="exampleId"/> <parameter param-name="exampleFeatureId"/> <parameter param-name="fromDate"/> Modified: ofbiz/branches/jackrabbit20100709/framework/example/widget/example/ExampleMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/example/widget/example/ExampleMenus.xml?rev=1096705&r1=1096704&r2=1096705&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/example/widget/example/ExampleMenus.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/example/widget/example/ExampleMenus.xml Tue Apr 26 09:39:01 2011 @@ -21,27 +21,39 @@ under the License. <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd"> <menu name="ExampleAppBar" title="${uiLabelMap.ExampleApplication}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> - <menu-item name="ExampleMenuItem" title="${uiLabelMap.ExampleExample}"><link target="FindExample"/></menu-item> - <menu-item name="ExampleFeature" title="${uiLabelMap.ExampleFeature}"><link target="FindExampleFeature"/></menu-item> - <menu-item name="FormWidgetExamples" title="${uiLabelMap.ExampleFormWidgetExamples}"><link target="FormWidgetExamples"/></menu-item> - <menu-item name="AjaxExample" title="${uiLabelMap.ExampleAjaxExamples}"><link target="authview/findExampleAjax"/></menu-item> + <menu-item name="ExampleMenuItem" title="${uiLabelMap.ExampleExample}"> + <link target="FindExample"/> + </menu-item> + <menu-item name="ExampleFeature" title="${uiLabelMap.ExampleFeature}"> + <link target="FindExampleFeature"/> + </menu-item> + <menu-item name="FormWidgetExamples" title="${uiLabelMap.ExampleFormWidgetExamples}"> + <link target="FormWidgetExamples"/> + </menu-item> + <menu-item name="AjaxExample" title="${uiLabelMap.ExampleAjaxExamples}"> + <link target="authview/findExampleAjax"/> + </menu-item> <menu-item name="portalPage" parent-portal-page-value="EXAMPLE"/> <menu-item name="Dashboard" title="${uiLabelMap.ExampleDashboard}" align-style="opposed"> <link target="ManagePortalPages"> <parameter param-name="parentPortalPageId" value="EXAMPLE"/> </link> </menu-item> - <menu-item name="ExampleGeoLocation" title="${uiLabelMap.CommonGeoLocation}"><link target="ExampleGeoLocationPointSet1"/></menu-item> - <menu-item name="Birt" title="${uiLabelMap.Birt}"><link target="BirtMain"/></menu-item> - <menu-item name="ExampleCharts" title="Chart examples"><link target="ExampleBarChart"/></menu-item> + <menu-item name="ExampleGeoLocation" title="${uiLabelMap.CommonGeoLocation}"> + <link target="ExampleGeoLocationPointSet1"/> + </menu-item> + <menu-item name="Birt" title="${uiLabelMap.Birt}"> + <link target="BirtMain"/> + </menu-item> + <menu-item name="ExampleCharts" title="Chart examples"> + <link target="ExampleBarChart"/> + </menu-item> <menu-item name="ExampleJackrabbit" title="Jackrabbit Sandbox"><link target="ExampleJackrabbit"/></menu-item> </menu> <menu name="EditExample" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="EditExample" title="${uiLabelMap.ExampleExample}"> - <link target="EditExample"> - <parameter param-name="exampleId"/> - </link> + <link target="EditExample"/> </menu-item> <menu-item name="EditExampleItems" title="${uiLabelMap.CommonItems}"> <link target="EditExampleItems"> @@ -57,14 +69,10 @@ under the License. <menu name="EditExampleFeature" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="EditExampleFeature" title="${uiLabelMap.ExampleFeature}"> - <link target="EditExampleFeature"> - <parameter param-name="exampleFeatureId"/> - </link> + <link target="EditExampleFeature"/> </menu-item> <menu-item name="EditExampleFeatureExampleAppls" title="${uiLabelMap.ExampleExamples}"> - <link target="EditExampleFeatureExampleAppls"> - <parameter param-name="exampleFeatureId"/> - </link> + <link target="EditExampleFeatureExampleAppls"/> </menu-item> </menu> Modified: ofbiz/branches/jackrabbit20100709/framework/example/widget/example/PortletEditForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/example/widget/example/PortletEditForms.xml?rev=1096705&r1=1096704&r2=1096705&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/example/widget/example/PortletEditForms.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/example/widget/example/PortletEditForms.xml Tue Apr 26 09:39:01 2011 @@ -38,6 +38,16 @@ under the License. <field name="updateButton"><submit/></field> </form> + <form name="ExamplePortlet2Edit" extends="CommonPortletEdit" extends-resource="component://common/widget/PortletEditForms.xml"> + <field name="nextPortalPageId"> + <lookup target-form-name="LookupPortalPage"/> + </field> + <field name="nextParentPortalPageId"> + <lookup target-form-name="LookupPortalPage"/> + </field> + <field name="updateButton"><submit/></field> + </form> + <form name="ExamplePortlet3Edit" extends="CommonPortletEdit" extends-resource="component://common/widget/PortletEditForms.xml"> <field name="SpecificTitle"> <text/> Modified: ofbiz/branches/jackrabbit20100709/framework/example/widget/example/PortletScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/example/widget/example/PortletScreens.xml?rev=1096705&r1=1096704&r2=1096705&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/example/widget/example/PortletScreens.xml (original) +++ ofbiz/branches/jackrabbit20100709/framework/example/widget/example/PortletScreens.xml Tue Apr 26 09:39:01 2011 @@ -47,10 +47,30 @@ under the License. <screen name="ExamplePortlet2"> <section> <actions> - <property-map resource="ExampleUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="ExampleUiLabels" map-name="uiLabelMap" global="true"/> + <set field="nextPortalPageId" from-field="nextPortalPageId" default-value=""/> + <set field="nextParentPortalPageId" from-field="nextParentPortalPageId" default-value="EXAMPLE"/> </actions> <widgets> <screenlet title="${uiLabelMap.ExamplePortletSecond}"> + <section> + <condition><not><if-empty field="nextPortalPageId"/></not></condition> + <widgets> + <link target="showPortalPage" text="${uiLabelMap.ExamplePortletGoToConfiguredPortalPage} : ${nextPortalPageId} ${uiLabelMap.CommonOf} ${nextParentPortalPageId}" > + <parameter param-name="portalPageId" from-field="nextPortalPageId"/> + <parameter param-name="parentPortalPageId" from-field="nextParentPortalPageId"/> + <image src="${iconsLocation}/application_go.png"/> + </link> + </widgets> + <fail-widgets> + <link target="editPortalPortletAttributes" text="${uiLabelMap.ExamplePortletAttributNeedToBeDefineClickHere}" > + <parameter param-name="portalPageId" from-field="parameters.portalPageId"/> + <parameter param-name="portalPortletId" value="EXAMPLE_2"/> + <parameter param-name="portletSeqId" value="00001"/> + <image src="${iconsLocation}/wrench_orange.png"/> + </link> + </fail-widgets> + </section> </screenlet> </widgets> </section> Modified: ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/fieldlookup.js URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/fieldlookup.js?rev=1096705&r1=1096704&r2=1096705&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/fieldlookup.js (original) +++ ofbiz/branches/jackrabbit20100709/framework/images/webapp/images/fieldlookup.js Tue Apr 26 09:39:01 2011 @@ -468,7 +468,7 @@ function modifySubmitButton (lookupDiv) //modify nav-pager var navPagers = jQuery("#" + lookupDiv + " .nav-pager a"); jQuery.each(navPagers, function(navPager) { - jQuery(navPagers[navPager]).attr("href", "javascript:lookupPaginationAjaxRequest('" + jQuery(navPagers[navPager]).attr("href") + "', '" + lookupForm.id + "', 'link')"); + jQuery(navPagers[navPager]).attr("href", "javascript:lookupPaginationAjaxRequest('" + jQuery(navPagers[navPager]).attr("href") + "','link')"); }); var navPagersSelect = jQuery("#" + lookupDiv + " .nav-pager select"); @@ -489,13 +489,13 @@ function modifySubmitButton (lookupDiv) var viewSize = navPagersSelect[navPager].value; var spl = ocSub.split(searchPattern); navPagersSelect[navPager].onchange = function () { - lookupPaginationAjaxRequest(spl[0] + this.value + spl[1], lookupForm.id, 'select'); + lookupPaginationAjaxRequest(spl[0] + this.value + spl[1],'select'); }; } else if (searchPattern_IE.test(ocSub)) { var viewSize = navPagersSelect[navPager].value; var spl = ocSub.split(searchPattern_IE); navPagersSelect[navPager].onchange = function () { - lookupPaginationAjaxRequest("/" + spl[0] + this.value + spl[1], lookupForm.id, 'select'); + lookupPaginationAjaxRequest("/" + spl[0] + this.value + spl[1],'select'); }; } else if (searchPattern2.test(ocSub)) { ocSub = ocSub.replace(searchPattern2, ""); @@ -503,7 +503,7 @@ function modifySubmitButton (lookupDiv) ocSub.replace(searchPattern, viewSize); } navPagersSelect[navPager].onchange = function () { - lookupPaginationAjaxRequest(ocSub + this.value, lookupForm.id, 'select'); + lookupPaginationAjaxRequest(ocSub + this.value,'select'); }; } else if (searchPattern2_IE.test(ocSub)) { ocSub = ocSub.replace(searchPattern2_IE, ""); @@ -511,12 +511,12 @@ function modifySubmitButton (lookupDiv) ocSub.replace(searchPattern_IE, viewSize); } navPagersSelect[navPager].onchange = function () { - lookupPaginationAjaxRequest("/" + ocSub + this.value, lookupForm.id, 'select'); + lookupPaginationAjaxRequest("/" + ocSub + this.value,'select'); }; } } else { var ocSub = oc.substring((oc.indexOf('=') + 1),(oc.length - 1)); - navPagersSelect[navPager].setAttribute("onchange", "lookupPaginationAjaxRequest(" + ocSub + ", '" + lookupForm.id +"')"); + navPagersSelect[navPager].setAttribute("onchange", "lookupPaginationAjaxRequest(" + ocSub + ",'')"); } if (resultTable == null) { @@ -615,16 +615,12 @@ function lookupFormAjaxRequest(formActio }); } -function lookupPaginationAjaxRequest(navAction, form, type) { +function lookupPaginationAjaxRequest(navAction, type) { lookupDiv = (GLOBAL_LOOKUP_REF.getReference(ACTIVATED_LOOKUP).divRef); lookupContent = (GLOBAL_LOOKUP_REF.getReference(ACTIVATED_LOOKUP).contentRef); - if (type == 'link') { - navAction = navAction.substring(0, navAction.length - 1); - } - lookupId = GLOBAL_LOOKUP_REF.getReference(ACTIVATED_LOOKUP).lookupId; - jQuery("#" + lookupId).load(navAction, function(data) { + jQuery("#" + lookupId).load(navAction, function(data) { if (data.search(/loginform/) != -1) { window.location.href = window.location.href; return; Propchange: ofbiz/branches/jackrabbit20100709/framework/security/data/PasswordSecurityData.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Apr 26 09:39:01 2011 @@ -2,4 +2,4 @@ /ofbiz/branches/dojo1.4/applications/securityext/data/PasswordSecurityData.xml:951708-952957 /ofbiz/branches/jquery/applications/securityext/data/PasswordSecurityData.xml:952958-1044489 /ofbiz/branches/multitenant20100310/applications/securityext/data/PasswordSecurityData.xml:921280-927264 -/ofbiz/trunk/framework/security/data/PasswordSecurityData.xml:962442-1094239 +/ofbiz/trunk/framework/security/data/PasswordSecurityData.xml:962442-1096699 Modified: ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/ServiceDispatcher.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/ServiceDispatcher.java?rev=1096705&r1=1096704&r2=1096705&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/ServiceDispatcher.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/service/src/org/ofbiz/service/ServiceDispatcher.java Tue Apr 26 09:39:01 2011 @@ -596,9 +596,19 @@ public class ServiceDispatcher { long timeToRun = System.currentTimeMillis() - serviceStartTime; if (Debug.timingOn() && timeToRun > 50) { - Debug.logTiming("Sync service [" + localName + "/" + modelService.name + "] finished in [" + timeToRun + "] milliseconds with response [" + result.toString() + "]", module); - } else if (timeToRun > 200) { - Debug.logInfo("Sync service [" + localName + "/" + modelService.name + "] finished in [" + timeToRun + "] milliseconds with response [" + result.toString() + "]", module); + // Sanity check - some service results can be multiple MB in size. Limit message size to 10K. + String resultStr = result.toString(); + if (resultStr.length() > 10240) { + resultStr = resultStr.substring(0, 10226) + "...[truncated]"; + } + Debug.logTiming("Sync service [" + localName + "/" + modelService.name + "] finished in [" + timeToRun + "] milliseconds with response [" + resultStr + "]", module); + } else if (timeToRun > 200 && Debug.infoOn()) { + // Sanity check - some service results can be multiple MB in size. Limit message size to 10K. + String resultStr = result.toString(); + if (resultStr.length() > 10240) { + resultStr = resultStr.substring(0, 10226) + "...[truncated]"; + } + Debug.logInfo("Sync service [" + localName + "/" + modelService.name + "] finished in [" + timeToRun + "] milliseconds with response [" + resultStr + "]", module); } return result; Modified: ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/taglib/ContentUrlTag.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/taglib/ContentUrlTag.java?rev=1096705&r1=1096704&r2=1096705&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/taglib/ContentUrlTag.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/webapp/src/org/ofbiz/webapp/taglib/ContentUrlTag.java Tue Apr 26 09:39:01 2011 @@ -67,7 +67,10 @@ public class ContentUrlTag extends BodyT return; } GenericValue webSite = WebSiteWorker.getWebSite(request); - appendContentPrefix(webSite, request.isSecure(), urlBuffer); + String forwardedProto = request.getHeader("X-Forwarded-Proto"); + boolean isForwardedSecure = UtilValidate.isNotEmpty(forwardedProto) && "HTTPS".equals(forwardedProto.toUpperCase()); + boolean isSecure = request.isSecure() || isForwardedSecure; + appendContentPrefix(webSite, isSecure, urlBuffer); } public static void appendContentPrefix(GenericValue webSite, boolean secure, Appendable urlBuffer) throws IOException { Modified: ofbiz/branches/jackrabbit20100709/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java?rev=1096705&r1=1096704&r2=1096705&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/webtools/src/org/ofbiz/webtools/WebToolsServices.java Tue Apr 26 09:39:01 2011 @@ -663,6 +663,15 @@ public class WebToolsServices { Debug.logInfo(exception.getMessage(), module); } } + String entityDescription = null; + if (bundle != null) { + try { + entityDescription = bundle.getString("EntityDescription." + entity.getEntityName()); + } catch (Exception exception) {} + } + if (UtilValidate.isEmpty(entityDescription)) { + entityDescription = entity.getDescription(); + } // fields list List<Map<String, Object>> javaNameList = FastList.newInstance(); @@ -754,7 +763,7 @@ public class WebToolsServices { entityMap.put("groupName", groupName); entityMap.put("plainTableName", entity.getPlainTableName()); entityMap.put("title", entity.getTitle()); - entityMap.put("description", entity.getDescription()); + entityMap.put("description", entityDescription); String entityLocation = entity.getLocation(); entityLocation = entityLocation.replaceFirst(System.getProperty("ofbiz.home") + "/", ""); entityMap.put("location", entityLocation); Modified: ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java?rev=1096705&r1=1096704&r2=1096705&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java Tue Apr 26 09:39:01 2011 @@ -190,7 +190,7 @@ public class MacroFormRenderer implement } String description = displayField.getDescription(context); String type = displayField.getType(); - String imageLocation = displayField.getImageLocation(); + String imageLocation = displayField.getImageLocation(context); Integer size = Integer.valueOf("0"); String title = ""; @@ -311,7 +311,7 @@ public class MacroFormRenderer implement } public void renderHyperlinkField(Appendable writer, Map<String, Object> context, HyperlinkField hyperlinkField) throws IOException { - this.request.setAttribute("image", hyperlinkField.getImage()); + this.request.setAttribute("image", hyperlinkField.getImageLocation(context)); ModelFormField modelFormField = hyperlinkField.getModelFormField(); String encodedAlternate = encode(hyperlinkField.getAlternate(context), modelFormField, context); @@ -352,6 +352,14 @@ public class MacroFormRenderer implement String id = modelFormField.getCurrentContainerId(context); String clientAutocomplete = "false"; + //check for required field style on single forms + if ("single".equals(modelFormField.getModelForm().getType()) && modelFormField.getRequiredField()) { + String requiredStyle = modelFormField.getRequiredFieldStyle(); + if (UtilValidate.isEmpty(requiredStyle)) requiredStyle = "required"; + if (UtilValidate.isEmpty(className)) className = requiredStyle; + else className = requiredStyle + " " + className; + } + List<ModelForm.UpdateArea> updateAreas = modelFormField.getOnChangeUpdateAreas(); boolean ajaxEnabled = updateAreas != null && this.javaScriptEnabled; if (!textField.getClientAutocompleteField() || ajaxEnabled) { @@ -425,6 +433,15 @@ public class MacroFormRenderer implement alert = "true"; } } + + //check for required field style on single forms + if ("single".equals(modelFormField.getModelForm().getType()) && modelFormField.getRequiredField()) { + String requiredStyle = modelFormField.getRequiredFieldStyle(); + if (UtilValidate.isEmpty(requiredStyle)) requiredStyle = "required"; + if (UtilValidate.isEmpty(className)) className = requiredStyle; + else className = requiredStyle + " " + className; + } + String visualEditorEnable = ""; String buttons = ""; if (textareaField.getVisualEditorEnable()) { @@ -618,6 +635,15 @@ public class MacroFormRenderer implement ampmName = UtilHttp.makeCompositeParam(paramName, "ampm"); } } + + //check for required field style on single forms + if ("single".equals(modelFormField.getModelForm().getType()) && modelFormField.getRequiredField()) { + String requiredStyle = modelFormField.getRequiredFieldStyle(); + if (UtilValidate.isEmpty(requiredStyle)) requiredStyle = "required"; + if (UtilValidate.isEmpty(className)) className = requiredStyle; + else className = requiredStyle + " " + className; + } + String mask = dateTimeField.getMask(); if ("Y".equals(mask)) { if ("date".equals(dateTimeField.getType())) { @@ -745,6 +771,14 @@ public class MacroFormRenderer implement } } + //check for required field style on single forms + if ("single".equals(modelFormField.getModelForm().getType()) && modelFormField.getRequiredField()) { + String requiredStyle = modelFormField.getRequiredFieldStyle(); + if (UtilValidate.isEmpty(requiredStyle)) requiredStyle = "required"; + if (UtilValidate.isEmpty(className)) className = requiredStyle; + else className = requiredStyle + " " + className; + } + String currentDescription = null; if (UtilValidate.isNotEmpty(currentValue)) { for (ModelFormField.OptionValue optionValue : allOptionValues) { @@ -1070,7 +1104,7 @@ public class MacroFormRenderer implement String name = modelFormField.getParameterName(context); String buttonType = submitField.getButtonType(); String formName = modelForm.getCurrentFormName(context); - String imgSrc = submitField.getImageLocation(); + String imgSrc = submitField.getImageLocation(context); String confirmation = submitField.getConfirmation(context); String className = ""; String alert = "false"; @@ -1341,12 +1375,24 @@ public class MacroFormRenderer implement public void renderFormClose(Appendable writer, Map<String, Object> context, ModelForm modelForm) throws IOException { String focusFieldName = modelForm.getfocusFieldName(); String formName = modelForm.getCurrentFormName(context); + String containerId = modelForm.getCurrentContainerId(context); + String hasRequiredField = ""; + for (ModelFormField formField : modelForm.getFieldList()) { + if (formField.getRequiredField()) { + hasRequiredField = "Y"; + break; + } + } StringWriter sr = new StringWriter(); sr.append("<@renderFormClose "); sr.append(" focusFieldName=\""); sr.append(focusFieldName); sr.append("\" formName=\""); sr.append(formName); + sr.append("\" containerId=\""); + sr.append(containerId); + sr.append("\" hasRequiredField=\""); + sr.append(hasRequiredField); sr.append("\" />"); executeMacro(writer, sr.toString()); renderEndingBoundaryComment(writer, "Form Widget - Form Element", modelForm); @@ -1999,6 +2045,14 @@ public class MacroFormRenderer implement alert = "true"; } } + + //check for required field style on single forms + if ("single".equals(modelFormField.getModelForm().getType()) && modelFormField.getRequiredField()) { + String requiredStyle = modelFormField.getRequiredFieldStyle(); + if (UtilValidate.isEmpty(requiredStyle)) requiredStyle = "required"; + if (UtilValidate.isEmpty(className)) className = requiredStyle; + else className = requiredStyle + " " + className; + } String name = modelFormField.getParameterName(context); String value = modelFormField.getEntry(context, lookupField.getDefaultValue(context)); Modified: ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java URL: http://svn.apache.org/viewvc/ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java?rev=1096705&r1=1096704&r2=1096705&view=diff ============================================================================== --- ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java (original) +++ ofbiz/branches/jackrabbit20100709/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java Tue Apr 26 09:39:01 2011 @@ -2064,7 +2064,7 @@ public class ModelFormField { protected FlexibleStringExpander description; protected String type; // matches type of field, currently text or currency protected String size; // maximum number of characters to display - protected String imageLocation; + protected FlexibleStringExpander imageLocation; protected FlexibleStringExpander currency; protected FlexibleStringExpander date; protected InPlaceEditor inPlaceEditor; @@ -2086,7 +2086,7 @@ public class ModelFormField { super(element, modelFormField); this.type = element.getAttribute("type"); this.size = element.getAttribute("size"); - this.imageLocation = element.getAttribute("image-location"); + this.setImageLocation(element.getAttribute("image-location")); this.setCurrency(element.getAttribute("currency")); this.setDescription(element.getAttribute("description")); this.setDate(element.getAttribute("date")); @@ -2118,8 +2118,12 @@ public class ModelFormField { return this.size = size; } - public String getImageLocation(){ - return this.imageLocation; + public String getImageLocation(Map<String, Object> context){ + if (this.imageLocation != null) { + return this.imageLocation.expandString(context); + } else { + return ""; + } } public String getDescription(Map<String, Object> context) { @@ -2231,6 +2235,13 @@ public class ModelFormField { } /** + * @param Image-location + */ + public void setImageLocation(String value) { + this.imageLocation = FlexibleStringExpander.getInstance(value); + } + + /** * @param Description */ public void setDescription(String string) { @@ -2361,11 +2372,11 @@ public class ModelFormField { protected boolean alsoHidden = true; protected String linkType; protected String targetType; - protected String image; protected String size; protected FlexibleStringExpander target; protected FlexibleStringExpander description; protected FlexibleStringExpander alternate; + protected FlexibleStringExpander imageLocation; protected FlexibleStringExpander imageTitle; protected FlexibleStringExpander targetWindowExdr; protected FlexibleMapAccessor<Map<String, String>> parametersMapAcsr; @@ -2390,6 +2401,7 @@ public class ModelFormField { this.setDescription(element.getAttribute("description")); this.setAlternate(element.getAttribute("alternate")); + this.setImageLocation(element.getAttribute("image-location")); this.setImageTitle(element.getAttribute("image-title")); this.setTarget(element.getAttribute("target")); this.alsoHidden = !"false".equals(element.getAttribute("also-hidden")); @@ -2397,7 +2409,6 @@ public class ModelFormField { this.targetType = element.getAttribute("target-type"); this.targetWindowExdr = FlexibleStringExpander.getInstance(element.getAttribute("target-window")); this.parametersMapAcsr = FlexibleMapAccessor.getInstance(element.getAttribute("parameters-map")); - this.image = element.getAttribute("image-location"); this.size = element.getAttribute("size"); this.setRequestConfirmation("true".equals(element.getAttribute("request-confirmation"))); this.setConfirmationMsg(element.getAttribute("confirmation-message")); @@ -2461,6 +2472,10 @@ public class ModelFormField { public String getAlternate(Map<String, Object> context) { return this.alternate.expandString(context); } + + public String getImageLocation(Map<String, Object> context) { + return this.imageLocation.expandString(context); + } public String getImageTitle(Map<String, Object> context) { return this.imageTitle.expandString(context); @@ -2485,10 +2500,6 @@ public class ModelFormField { return fullParameterMap; } - public String getImage() { - return this.image; - } - public String getSize() { return this.size; } @@ -2521,6 +2532,13 @@ public class ModelFormField { /** * @param string */ + public void setImageLocation(String string) { + this.imageLocation = FlexibleStringExpander.getInstance(string); + } + + /** + * @param string + */ public void setImageTitle(String string) { this.imageTitle = FlexibleStringExpander.getInstance(string); } @@ -3402,7 +3420,7 @@ public class ModelFormField { public static class SubmitField extends FieldInfo { protected String buttonType; - protected String imageLocation; + protected FlexibleStringExpander imageLocation; protected FlexibleStringExpander backgroundSubmitRefreshTargetExdr; protected boolean requestConfirmation = false; protected FlexibleStringExpander confirmationMsgExdr; @@ -3422,7 +3440,7 @@ public class ModelFormField { public SubmitField(Element element, ModelFormField modelFormField) { super(element, modelFormField); this.buttonType = element.getAttribute("button-type"); - this.imageLocation = element.getAttribute("image-location"); + setImageLocation(element.getAttribute("image-location")); this.backgroundSubmitRefreshTargetExdr = FlexibleStringExpander.getInstance(element.getAttribute("background-submit-refresh-target")); setRequestConfirmation("true".equals(element.getAttribute("request-confirmation"))); setConfirmationMsg(element.getAttribute("confirmation-message")); @@ -3437,8 +3455,8 @@ public class ModelFormField { return buttonType; } - public String getImageLocation() { - return imageLocation; + public String getImageLocation(Map<String, Object> context) { + return this.imageLocation.expandString(context); } public boolean getRequestConfirmation() { @@ -3472,8 +3490,8 @@ public class ModelFormField { /** * @param string */ - public void setImageLocation(String string) { - imageLocation = string; + public void setImageLocation(String val) { + imageLocation = FlexibleStringExpander.getInstance(val); } public String getBackgroundSubmitRefreshTarget(Map<String, Object> context) { |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |