Commit Graph
10472 Commits
Author SHA1 Message Date
Jacques Le Roux 41f04cefbb As discussed on dev ML, by default comment out Beanshell and Groovy containers for security reasons
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1063228 13f79535-47bb-0310-9956-ffa450edef68
2011-01-25 11:25:23 +00:00
Jacques Le Roux c054c7ed6e Formatting, no functional changes
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1062866 13f79535-47bb-0310-9956-ffa450edef68
2011-01-24 16:38:32 +00:00
Jacques Le Roux f28b0343e1 A patch from Deyan "Allow attributes enable-lock, no-auto-stamp, auto-clear-cache, never-cache and sequence-bank-size in <extend-entity> tag in entitydef.xml fields " (https://issues.apache.org/jira/browse/OFBIZ-3882) - OFBIZ-3882
Allow attributes
enable-lock
no-auto-stamp
auto-clear-cache
never-cache
sequence-bank-size

in <extend-entity> tag in entitydef.xml fiels

Example: <extend-entity entity-name="Person" enable-lock="true" sequence-bank-size="1" />

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1062863 13f79535-47bb-0310-9956-ffa450edef68
2011-01-24 16:33:16 +00:00
Jacques Le Roux 7f9e57427d Better French label
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1062729 13f79535-47bb-0310-9956-ffa450edef68
2011-01-24 11:05:08 +00:00
Jacques Le Roux 746ba1e9b1 A patch from Leon "In layer mode, the attribute "target-parameter" of a lookup field is not used" (https://issues.apache.org/jira/browse/OFBIZ-4136) - OFBIZ-4136
As xsd describes, "target-parameter" of a lookup field can be used to transfer extra parameters to lookup something. But if we choose "layer" mode (the default mode of lookup), this attribute does nothing. It works before jQuery introduced. I guess this feature is forgot by mistake during migration.

JLR: Nice catch! Actually IIRW it's because this has been introduced in trunk after we migrated this part in the jQuery branch and it passed "hidden" when I merged the trunk in branch.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1062709 13f79535-47bb-0310-9956-ffa450edef68
2011-01-24 09:55:17 +00:00
Jacques Le Roux d42aaef2b8 A patch from René Scheibe "Groovy shell." (https://issues.apache.org/jira/browse/OFBIZ-3954) - OFBIZ-3954
A Groovysh container to connect to. Just do a 'telnet localhost 9991' and you have a fully fledged groovysh.
This is a Groovy equivalent to the already existing BeanShell container.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1062476 13f79535-47bb-0310-9956-ffa450edef68
2011-01-23 17:58:43 +00:00
Jacques Le Roux 1dab0c10f2 Update copyright from 2010 to 2011, BTW this closes "update files from 2009 to 2010" (https://issues.apache.org/jira/browse/OFBIZ-3783) - OFBIZ-3783
I have changed ModelInfo.getCopyright() in order to automatize (I believe the copyright is always valid so we don't care about the date really used, if you disagree please let me know, I have a doubt about this...)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1061886 13f79535-47bb-0310-9956-ffa450edef68
2011-01-21 16:33:22 +00:00
Jacques Le Roux 5457a40512 Merge CommonInventory and FacilityInventory labels and use only CommonInventory
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1061848 13f79535-47bb-0310-9956-ffa450edef68
2011-01-21 15:29:40 +00:00
Jacques Le Roux c32e55a7be A patch from Abdullah Shaikh "Added drop down options replacing text box to configure sagepay." (https://issues.apache.org/jira/browse/OFBIZ-3260) - OFBIZ-3260
To configure SagePay payment gateway transaction types settings.

JLR: this patch contains a bit of labels redundancy, but I prefer to keep them as is. At least it's verbs in Common and can be reused... (why have a Payment label in each app...)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1061728 13f79535-47bb-0310-9956-ffa450edef68
2011-01-21 10:50:43 +00:00
Jacques Le Roux 51a2ceb54f A patch from Chatree Srichart "Fix using TagLib in Freemarker." (https://issues.apache.org/jira/browse/OFBIZ-2703) - OFBIZ-2703
Fix using TagLib in freemarker follow this.
1. In ControlServlet.java, create ServletContextHashModel instance and set to request's attritube
2. In ScreenRenderer.java, set ServletContextHashModel instance from request's attribute to context name Application and set HttpRequestHashModel instance from requestAttributes in context to context name Request

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1061310 13f79535-47bb-0310-9956-ffa450edef68
2011-01-20 14:23:29 +00:00
Jacques Le Roux 2238844c6b A patch from Chatree Srichart "BIRT set output file name." (https://issues.apache.org/jira/browse/OFBIZ-4129) - OFBIZ-4129
I got a request to export a BIRT report as PDF file with custom file name. I attach a patch file for this feature.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1061295 13f79535-47bb-0310-9956-ffa450edef68
2011-01-20 13:35:00 +00:00
Erwan de Ferrieres ec5adee63b Displaying help was in error in the big topics, buffer.flip() was misplaced
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1061189 13f79535-47bb-0310-9956-ffa450edef68
2011-01-20 10:10:52 +00:00
Erwan de Ferrieres 1dedf4711c Upgrading to tomcat 6.0.30 - Changelog is here: http://tomcat.apache.org/tomcat-6.0-doc/changelog.html
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1061169 13f79535-47bb-0310-9956-ffa450edef68
2011-01-20 09:14:24 +00:00
Adrian Crum 74cb3f0103 Made the Find Screen "Search Results" text match the "Search Options" text. Also includes a layout demo and the CSS changes needed for the Flat Grey visual theme.
This is kind of kludgy. We need a screenlet-title style.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1061056 13f79535-47bb-0310-9956-ffa450edef68
2011-01-19 23:09:37 +00:00
Adrian Crum c9c512948a One more fixup for the Layout Demo page move.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1060923 13f79535-47bb-0310-9956-ffa450edef68
2011-01-19 19:33:55 +00:00
Adrian Crum f4e001a3fe Fix screenlet title in Layout Demo screen.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1060703 13f79535-47bb-0310-9956-ffa450edef68
2011-01-19 07:56:27 +00:00
Adrian Crum 60b30b5af1 Move "Search Options" text to screenlet title bar in the FindDecorator screen. It's now visible when the screenlet is collapsed.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1060701 13f79535-47bb-0310-9956-ffa450edef68
2011-01-19 07:39:16 +00:00
Adrian Crum 10f0b07fe5 Fixed bug in collapsible screenlet - expand/collapse link wasn't working with JavaScript turned off.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1060699 13f79535-47bb-0310-9956-ffa450edef68
2011-01-19 07:23:33 +00:00
Jacques Le Roux 59a6ad1b7d Revert r1060229 for now (see https://issues.apache.org/jira/browse/OFBIZ-4119)
Thanks Adrian for the reminder


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1060417 13f79535-47bb-0310-9956-ffa450edef68
2011-01-18 15:32:17 +00:00
Jacques Le Roux 09029298c4 A patch from Ankit Jain "The id attribute is not set in the <a> tag." (https://issues.apache.org/jira/browse/OFBIZ-4119) - OFBIZ-4119
By adding id attribute in the <a> tag then its helpful for developers to perform action on it using js or css. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1060229 13f79535-47bb-0310-9956-ffa450edef68
2011-01-18 08:00:37 +00:00
Adrian Crum 4c01ad9512 Moved new layout demo page to Webtools component. After thinking about it, Webtools seemed to be a more logical place to put it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1060219 13f79535-47bb-0310-9956-ffa450edef68
2011-01-18 07:25:06 +00:00
Adrian Crum 134846ee66 Added "required" style to layout demo.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1059935 13f79535-47bb-0310-9956-ffa450edef68
2011-01-17 14:42:45 +00:00
Jacques Le Roux fa9697b615 Themes French labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1059844 13f79535-47bb-0310-9956-ffa450edef68
2011-01-17 10:22:37 +00:00
Marco Risaliti 80c7d141b8 Remove most of the java compilation warning (generics markup, unused code/import) (OFBIZ-4102)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1059659 13f79535-47bb-0310-9956-ffa450edef68
2011-01-16 20:51:22 +00:00
Adrian Crum 8dac73e8db Updated Flat Grey visual theme. Design contributed by Ryan Foster - https://issues.apache.org/jira/browse/OFBIZ-4092 with bug fixes and minor design changes by me.
I reorganized the main style sheet and pushed the deprecated styles down to the bottom. I also moved the jQuery styles to a separate file.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1059564 13f79535-47bb-0310-9956-ffa450edef68
2011-01-16 14:12:46 +00:00
Bilgin Ismet Ibryam 9904b2b1a9 Allow calling simple method in form actions
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1059529 13f79535-47bb-0310-9956-ffa450edef68
2011-01-16 10:47:31 +00:00
Adrian Crum b22caf0d18 Small fixup for previous commit - "test page" sounds less technical than "test jig."
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1059437 13f79535-47bb-0310-9956-ffa450edef68
2011-01-16 02:51:20 +00:00
Adrian Crum fd2b63c3d8 Fixed a bug in HtmlMenuRenderer.java - menu item widget-style attribute was being ignored.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1059433 13f79535-47bb-0310-9956-ffa450edef68
2011-01-16 02:18:43 +00:00
Adrian Crum 805555b0f1 New feature - Page Layout Best Practices demonstration and visual theme test jig.
Based on a recent dev mailing list discussion, I added a page to the Example component that demonstrates some basic layout concepts. The idea is to display the page, then look at the screen widget definition and the HTML markup to see how the page is constructed.

The page can also be used for visual theme development - because most of the common UI elements are all on one page.

This could be improved - it needs a multi-column layout example, a tree widget example, and a form widget field group example.

Internationalization note: This commit contains new UI labels.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1059429 13f79535-47bb-0310-9956-ffa450edef68
2011-01-16 01:14:21 +00:00
Adrian Crum 78682e55ee Parameterize form widget odd-row-style, header-row-style, and default-table-style attributes.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1059425 13f79535-47bb-0310-9956-ffa450edef68
2011-01-16 00:10:25 +00:00
Adrian Crum 8254c6930a Fix capitalization on CommonSelected UI label.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1059424 13f79535-47bb-0310-9956-ffa450edef68
2011-01-16 00:08:21 +00:00
Adrian Crum de0ac1ce2e Named some of the GlobalDecorator sections so they're easier to find in markup.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1059391 13f79535-47bb-0310-9956-ffa450edef68
2011-01-15 19:00:04 +00:00
Jacques Le Roux e77b9d2468 Removes an empty useless function. 1st step for https://issues.apache.org/jira/browse/OFBIZ-1319
I will also see if regrouping all OFBIz js functions loaded in framework commonscreen in a sole file is not interesting. By and large I will follow/adapt advices in http://www.ibm.com/developerworks/web/library/wa-aj-jsajaxperf/index.html

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1059382 13f79535-47bb-0310-9956-ffa450edef68
2011-01-15 18:00:48 +00:00
Adrian Crum 3045d7d83c Corrected English spelling on Work Effort and Web Tools UI labels.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1059066 13f79535-47bb-0310-9956-ffa450edef68
2011-01-14 16:41:30 +00:00
Jacques Le Roux 673804eb6c As requested by Jacopo on dev ML, moves setPriceRulesCondEventJs.ftl from framework to product/catalog
Also fix an orthograph error in a related French labels

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1058719 13f79535-47bb-0310-9956-ffa450edef68
2011-01-13 19:55:07 +00:00
Jacopo Cappellato 674a4f8e1c Another missing license header
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1058597 13f79535-47bb-0310-9956-ffa450edef68
2011-01-13 15:06:14 +00:00
Jacopo Cappellato c4ff3a401c Another group of missing licence heders.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1058590 13f79535-47bb-0310-9956-ffa450edef68
2011-01-13 14:51:38 +00:00
Jacopo Cappellato 0ed73fe64c Added a bunch of missing license headers.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1058580 13f79535-47bb-0310-9956-ffa450edef68
2011-01-13 14:25:38 +00:00
Jacques Le Roux 29458f23a8 Remove unrelated changes that slipped in with r1058197
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1058198 13f79535-47bb-0310-9956-ffa450edef68
2011-01-12 15:43:04 +00:00
Jacques Le Roux 2bfcc945e3 A patch from Martin Kreidenweis "Adding content in CMS using add long text (right mouse click) doesn't work" (https://issues.apache.org/jira/browse/OFBIZ-4079) - OFBIZ-4079
Fixes some bugs in CMS introduced in svn r1036195 when migrating from dojo to jQuery:
* reverted accidental logic change in callDocument() that broke the "new ..." context menu items
* making elRTE "save" toolbar button work: same behavior as the regular "Save" button
* using regular form submit instead of ajax for new content for now
  o ajaxSubmitForm() can't handle new content, it won't reload the form because it doesn't know the new contentId
    + some controller changes would probably be necessary to make that work (return new contentId as JSON)
  o nav tree is not updated with ajax submit currently
* now always creating editor if corresponsing html element exists
  o editor was not initialized when WebSiteCMSContent screen was loaded by non-ajax call


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1058197 13f79535-47bb-0310-9956-ffa450edef68
2011-01-12 15:39:29 +00:00
Jacopo Cappellato 8564cd8125 Removed unused handler from controller files; replaced handlers that were still using the old ScreenWidgetViewHandler with the current MacroScreenViewHandler; deprecated compress.HTML property with output specific properties like screen.compress; this fixes a rather important issue happening when the compress.HTML setting is set to true: non html output screens like for example tab delimited exports were messed up.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1058056 13f79535-47bb-0310-9956-ffa450edef68
2011-01-12 10:44:35 +00:00
Hans Bakker 338a2456e3 service 'performFindItem' got sometimes unwanted output parameter 'listSize' from parent findList service: removed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1058041 13f79535-47bb-0310-9956-ffa450edef68
2011-01-12 10:06:19 +00:00
Jacques Le Roux 0e5dec72c6 Only to ease test/exchange with date-time picker author for now...
I think i18n does not work as well as datepicker

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1057892 13f79535-47bb-0310-9956-ffa450edef68
2011-01-11 22:17:40 +00:00
Jacques Le Roux bd207e8eac Fix a small typo in comment
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1057155 13f79535-47bb-0310-9956-ffa450edef68
2011-01-10 11:37:21 +00:00
Jacques Le Roux bfa23d2ff8 A patch from Sascha "The variants case does not work in product lookups" (https://issues.apache.org/jira/browse/OFBIZ-4100) - OFBIZ-4100
All cases are now fixed

Also replace all tabs by spaces

JLR: I have fixed another related bug at r1057153 (the 1st one I crossed and is the summary of OFBIZ-4100). It was introduced by r1040908 and I'm afraid there are more unwanted side effects

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1057154 13f79535-47bb-0310-9956-ffa450edef68
2011-01-10 11:36:19 +00:00
Hans Bakker d696e3547b When a load balancer is in front of the ofbiz system and takes care of the ssl certificate, ofbiz is now reading the Header[X-Forwarded-Proto] parameters to check if the request was secure or not. It still works the old way if these request parameters are not present
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1057115 13f79535-47bb-0310-9956-ffa450edef68
2011-01-10 08:26:04 +00:00
Jacques Le Roux 461278703f Resolves "The online help navigation panel is too narrow" (https://issues.apache.org/jira/browse/OFBIZ-4066) - OFBIZ-4066
But in Flat Grey, even when you had the content of the bluelight/help.css in flatgrey/help.css...

I have set the default lookup_popup2 size to width=900 height=700, now that anyway OFBiz is designed to be used with at least a 1024*768 screen

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1056986 13f79535-47bb-0310-9956-ffa450edef68
2011-01-09 17:55:04 +00:00
Jacques Le Roux bc0fc07a9b We have decided to use only one HTML editor and it's elrte jQuery plugin.
So WhizzyWig is not needed anymore. I removed also WhizzyWig Notice and while at it Scriptaculous Notice (which should have been removed when we merged jQuery branch)

BTW, is CoolTips Notice still needed?

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1056984 13f79535-47bb-0310-9956-ffa450edef68
2011-01-09 17:37:38 +00:00
Jacques Le Roux 509711c04d A patch from Leon "i18n problem in auto-completed dropdown box: display not correct characters but html entities" (https://issues.apache.org/jira/browse/OFBIZ-4101) - OFBIZ-4101
If there're chinese characters contained in a description field of a lookup textbox with auto-complete feature enabled, then what I can get from auto-completed dropdown box is not unstandable chinese but messed html entities such as "氨" blah blah.


Thanks to Dukian for quick testing!

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1056977 13f79535-47bb-0310-9956-ffa450edef68
2011-01-09 16:57:32 +00:00
Jacques Le Roux 65ab7533f0 A patch from Jeroen van der Wal "When audit log is enabled it creates log transactions even when there are no changes" (https://issues.apache.org/jira/browse/OFBIZ-4076) - OFBIZ-4076
The createEntittyAuditLogSingle function creates a record in the AuditLog entity even when there's no change. This patch only logs new, changed and deleted values. Also, all changes in the same transaction will get the same change date.

After applying this patch the overhead of the AuditEntityLog is recuded from 32% to 25%.

There's even more room for performance increase: a findOne search for the previous entity is done for every field that's enabled.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1056973 13f79535-47bb-0310-9956-ffa450edef68
2011-01-09 16:36:40 +00:00