Commit Graph
11784 Commits
Author SHA1 Message Date
Hans Bakker 23b160661a paging on testsuites in selenium test corrected
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821731 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 10:00:45 +00:00
Hans Bakker 512f29383d removed entries to non existing files
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821710 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 07:56:50 +00:00
Scott Gray ab4dfc0c28 Fix bug reported by Abdullah Shaikh - OFBIZ-2978
It appears the PaymentGatewayServices method savePgr and its associated service savePaymentGatewayResponse was originally intended to support saving either PaymentGatewayResponse OR PaymentGatewayRespMsg values but at some point this has been reduced to supporting only PaymentGatewayResponse values.
Fixed by checking the entity name before running some PaymentGatewayResponse spcific code.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821705 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 07:19:42 +00:00
Ashish Vijaywargiya b55b1f44ba Oops ..... I got build failed error due to custom changes in UpsServices.java.
Sorry to bother you guys on this - but yes the service for Ups Transit time will be soon in OFBiz trunk. :)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821699 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 06:53:25 +00:00
Ashish Vijaywargiya c9239cb9df Recent changes done by Adrian for GenericDelegator -> Delegator.
The build was failing due to changes missed from UpsServices.java file.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821697 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 06:42:34 +00:00
Vikas Mayur 673e2c01c0 workEffortId was not available in screen scope and when user click on Tasks tab, survey sub-tab as well as survey list was not visible to the user.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821674 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 03:55:56 +00:00
Adam Heath b15b30ddfd Simple factory lookup, DelegatorFactory switched to abstract class.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821669 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 03:00:11 +00:00
Adrian Crum 7fa08f9079 Replaced GenericDelegator.getGenericDelegator(...) calls with new factory method.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821649 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 01:53:50 +00:00
Adrian Crum a4d68934c9 Converted GenericDelegator concrete class references to Delegator interface references.
This commit requires ant clean. Also, external libraries that reference GenericDelegator will need to be updated.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821643 13f79535-47bb-0310-9956-ffa450edef68
2009-10-05 00:08:27 +00:00
Adam Heath db585f5d95 Oops, shouldn't have checked these 2 lines in.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821577 13f79535-47bb-0310-9956-ffa450edef68
2009-10-04 19:04:08 +00:00
Adam Heath 11df2b159a Make 2 reusable schema types, boolean, and aggregate-function.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821576 13f79535-47bb-0310-9956-ffa450edef68
2009-10-04 19:01:44 +00:00
Bruno Busco 19463b758e Fixed markup for correct content list rendering
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821498 13f79535-47bb-0310-9956-ffa450edef68
2009-10-04 10:19:45 +00:00
Bruno Busco e93de08bce MarMarkup cleanup.
All the screenlet content should be contained in the screenlet-body tag


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821491 13f79535-47bb-0310-9956-ffa450edef68
2009-10-04 09:43:14 +00:00
Bruno Busco 6b0ca7b16b Markup cleanup.
Only one screenlet-body should be present in a screenlet.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821490 13f79535-47bb-0310-9956-ffa450edef68
2009-10-04 09:40:49 +00:00
Bruno Busco 62652236c1 Cleanup of the screenlet title in all FTL files.
Removed all occurrences of <div class="screenlet-header"><div class="boxhead"></div></div>
Replaced with the new
<div class="screenlet-title-bar"><div class="h3"></div></div>

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821476 13f79535-47bb-0310-9956-ffa450edef68
2009-10-04 08:04:35 +00:00
Jacques Le Roux ef8b371712 A patch from Patrick Antivackis "Improving the ContentMapFacade class in order to filter and sort results." (https://issues.apache.org/jira/browse/OFBIZ-2988) - OFBIZ-2988
Today's ContentMapFacade.class is mapped in the content application to the ${thisContent} variable in Freemarker templates.
Using {$thisContent.subcontent_all} return all the "subcontents" associated with thisContent sorting by -fromDate.
(in fact you usually use it like
<#list thisContent.subcontent_all as contentItem>
${contentItem}
</#list>
)
Using {$thisContent.subcontent.foo} return all the first "subcontent" associated with thisContent and mapped by foo mapKey (first sorted by -fromDate).
Unfortunatelly this facade don't bring any filter or sorting options.
I updated this class in order to allow to :
- sort the subcontents (both sucontent_all or subcontent.foo) by whatever field of the ContentAssocViewTo view. For this you need to write in the Freemarker template ${thisContent.setSortOrder(sortString)} before using the sucontent_all or subcontent .foo operations.
- filter the output of subcontent_all by mapKey. For this you need to write in the Freemarker template ${thisContent.setMapKeyFilter(mapKeyString)} before using the subcontent_all operation.
- filter the output of subcontent_all or subcontent.foo by statusId of the content. For this you need to write in the Freemarker template ${thisContent.setStatusFilter(CONTENT_STATUS)} before using the sbucontent_all or subcontent.foo operations.

Examples are given in the Jira issue


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821474 13f79535-47bb-0310-9956-ffa450edef68
2009-10-04 07:53:56 +00:00
Adam Heath 5a30fec5d9 Bother, forgot to allow default-resource-name at the top level.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821406 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 20:05:58 +00:00
Adam Heath 124ebc7e8d Suppress deprecation warnings.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821405 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 20:01:16 +00:00
Adam Heath f0b81f5331 Make use of feature from last commit, moving default-resource-name to
the top-level.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821404 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 19:54:55 +00:00
Adam Heath 80d220afe8 Allow <default-resource-name> globally.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821403 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 19:53:20 +00:00
Adrian Crum dd22f83c72 Improvements to the GenericDelegator refactoring - based on suggestions from Adam Heath.
I removed the deprecated methods from the Delegator interface. So, any replacements of GenericDelegator.getGenericDelegator(...) with the new factory method will have to include code to replace the deprecated method calls.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821391 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 18:52:29 +00:00
Vikas Mayur c4fa4b8f1b By default show certain screenlets collapsed as the screen is offering too much information at this moment and is usually not required.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821317 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 13:36:10 +00:00
Vikas Mayur cffa7673b8 Improvement to the facility contactmech screen. Moved permission check and various links from the template to the screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821313 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 13:19:14 +00:00
Ashish Vijaywargiya 78829c8302 Removed duplicate request entry - Thanks Rishi for the report.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821285 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 09:54:12 +00:00
Ashish Vijaywargiya f5e6ae7b8d Applied patch from jira issue OFBIZ-2994 - Consistency in location of select checkbox.
Thanks Chirag for your contribution on this.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821284 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 09:51:52 +00:00
Bruno Busco 27d52b9c01 Cleaned up several ftl screenlets markup.
Changed from <div class="screenlet-header"> to <div class="screenlet-title-bar">.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821281 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 09:30:48 +00:00
Bruno Busco 18e1e159cc Changed back from <screenlet> to <container style="screenlet"...> pattern since the first seems still not usable in multicolum screens :(
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821280 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 09:26:23 +00:00
Jacques Le Roux 4448688f12 A patch from Wickersheimer Jeremy "promotion giving gift items and inventory check." (https://issues.apache.org/jira/browse/OFBIZ-2991) - OFBIZ-2991
The code in the ProductPromoWorker should be checking if a git item is available before adding to the order, but it only checks the quantity in the inventory without taking into account the quantity already in the cart.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821270 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 08:35:06 +00:00
Hans Bakker 85d74d8505 set the userlogin party as default for the contact list owner
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821267 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 08:28:07 +00:00
Jacques Le Roux fe6a959a74 A patch from Rohit Jain "In Content Manager component Remove Survey question link of Edit survey question page is showing error." (https://issues.apache.org/jira/browse/OFBIZ-2993) - OFBIZ-2993
Part of Main task for securing URLs in Freemarker templates files  (OFBIZ-2330)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821263 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 07:48:11 +00:00
Scott Gray 97026e0656 Removed the following deprecated method from PartyWorker:
getPartyOtherValues(PageContext, String, String, String, String)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821255 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 05:55:01 +00:00
Scott Gray 9836077091 Generics markup
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821254 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 05:50:33 +00:00
Scott Gray 4d77193628 Removed the following deprecated methods from ContactMechWorker:
getPartyContactMechValueMaps(PageContext, String, boolean, String)
getOrderContactMechValueMaps(PageContext, String, String)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821253 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 05:49:45 +00:00
Scott Gray 65221e1e3d Removed the following deprecated methods from DataResourceWorker:
renderDataResourceAsText(GenericDelegator, String, Map, GenericValue, Locale, String)
renderDataResourceAsText(GenericDelegator, String, Appendable, Map, GenericValue, Locale, String)
renderDataResourceAsTextCache(GenericDelegator, String, Map, GenericValue, Locale, String)
renderDataResourceAsTextCache(GenericDelegator, String, Appendable, Map, GenericValue, Locale, String)
getDataResourceTextCache(GenericValue, String, Locale, Map, GenericDelegator)
writeDataResourceTextCache(GenericValue, String, Locale, Map, GenericDelegator, Appendable)
getDataResourceText(GenericValue, String, Locale, Map, GenericDelegator)
writeDataResourceText(GenericValue, String, Locale, Map, GenericDelegator, Appendable)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821252 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 05:24:00 +00:00
Scott Gray e419be8e1f Remove usage of a deprecated DataResourceWorker method
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821250 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 05:16:30 +00:00
Scott Gray 13d77a190f Remove usage of deprecated methods
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821248 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 05:06:54 +00:00
Scott Gray 9d6f469d3f Removed use of a deprecated DataResourceWorker method
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821244 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 04:57:00 +00:00
Scott Gray 97ddcd9bb1 Missed to the UtilMisc generics weirdness again
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821243 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 04:29:12 +00:00
Scott Gray 1c8d1d3ef5 Added generics markup
Another file I missed committing in r821238

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821242 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 04:27:02 +00:00
Scott Gray ee3a4b1342 Fix a generics related compilation error introduced by my last commit (r821238)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821239 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 04:16:21 +00:00
Scott Gray 9e77901bf8 Cleaned up imports
Additional generics markup
Enhanced for loops
Fixed a comment typos
Removed an unused method variable


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821238 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 04:12:28 +00:00
Scott Gray d02b770738 Removed the deprecated method getImageType(GenericDelegator, GenericValue)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821234 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 03:41:43 +00:00
Scott Gray 013ceb9961 Removed use of a deprecated method from getImageType(GenericDelegator, String) and deprecated the method itself
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821233 13f79535-47bb-0310-9956-ffa450edef68
2009-10-03 03:39:29 +00:00
Bruno Busco 486c8f477c Cleaned up several ftl screenlets markup.
Changed from <div class="screenlet-header"> to <div class="screenlet-title-bar">.
Replaced <div class="boxhead"> with <div class="h3">.
This fixes also a white text on white background issue with bluelight theme reported by Matthieu Bollot in the dev ML.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@821197 13f79535-47bb-0310-9956-ffa450edef68
2009-10-02 23:00:22 +00:00
Ashish Vijaywargiya 2a5926b236 Based on Pranay's Proposal on Dev Mailing list for changing shipmentMethodName field type from "id-ne" to "id-long-ne".
I saw five +1 vote on thread "Proposal for change in entity "GoogleCoShippingMethod"" and considering that this entity was recently introduced so this change will not create any problem.

Thanks Pranay for raising this issue as a proposal infront of community.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@820993 13f79535-47bb-0310-9956-ffa450edef68
2009-10-02 12:50:54 +00:00
Ashish Vijaywargiya f1ec15157c I think it will be "de"(German Translation) instead of "en".
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@820941 13f79535-47bb-0310-9956-ffa450edef68
2009-10-02 09:24:58 +00:00
Hans Bakker bee6ed81cd if the contact mech is not provided when a party is added to a contact list, find it and use that, also set the default status to accepted if added in the backoffice
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@820913 13f79535-47bb-0310-9956-ffa450edef68
2009-10-02 07:16:05 +00:00
Hans Bakker c30bf1d172 added some help screens for the marketing contact lists
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@820911 13f79535-47bb-0310-9956-ffa450edef68
2009-10-02 07:11:23 +00:00
Hans Bakker 6e4069cf2b forget one file on last commit
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@820899 13f79535-47bb-0310-9956-ffa450edef68
2009-10-02 06:39:49 +00:00
Hans Bakker 364d0505aa added html=safe to opportunity services text fields and move the servicedef from order to marketing
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@820898 13f79535-47bb-0310-9956-ffa450edef68
2009-10-02 06:38:05 +00:00