Commit Graph
559 Commits
Author SHA1 Message Date
Jacques Le Roux dc96c0990c Fix a bug when there are no comments at all.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@989166 13f79535-47bb-0310-9956-ffa450edef68
2010-08-25 15:19:05 +00:00
Bruno Busco b7ea12ceba Enabled column sorting feature to temporal expression screen
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@988443 13f79535-47bb-0310-9956-ffa450edef68
2010-08-24 09:03:37 +00:00
Bruno Busco 4300a7aae9 Fixed TabBar menus highlights in WebTools configuration screens
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@988434 13f79535-47bb-0310-9956-ffa450edef68
2010-08-24 08:47:40 +00:00
Jacques Le Roux 4ced84dd08 A patch from Karl Pitrich "When editing Portal Pages, Drag & Drop for Portlets does not work" (https://issues.apache.org/jira/browse/OFBIZ-3889) - OFBIZ-3889
When editing Portlet Pages, either in MyPortal or PortalAdm, Drag & Drop of Portlets does not work.
Where are several Issues in the MyPortal, some have fixes, none is commited to trunk.

Problems:

    * in myportal.js, function getDestinationInformationPortlets(): DOM ID's are not handled correctly
    * in framework/webtools/widget/PortalAdmScreens.xml: required javascript + css files are not included


JLR: 
While working on this I have found other issues: the login.ftl files used in hhfacility and myportal were not tenant enabled. They are different  but by chance in myportal very close to common so I was finally able  to do both at along with  Karl's changes. Actually I wanted to do 2 commits but forget to uncheck the files while doing a second attempt to commit.

MyPortal
 * The login process in MyPortal was not tenant enabled, it's done in this commit.
 * I kept its specificity : newRegisterLogin and wonder why it has not been extended to common?

hhfacility
The login process in hhfacility was not tenant enabled, it's done in this commit. Doing so, I saw there i18n is not done, not an issue for me...







git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@985163 13f79535-47bb-0310-9956-ffa450edef68
2010-08-13 11:43:38 +00:00
Adam Heath da0da53f2a Fix importing of data in webtools xml file import.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@982871 13f79535-47bb-0310-9956-ffa450edef68
2010-08-06 04:47:01 +00:00
Adrian Crum de50263021 Built out the new service parameter description feature. Descriptions defined in service interfaces are not being copied to the implementations - so that needs to be fixed.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@981067 13f79535-47bb-0310-9956-ffa450edef68
2010-07-31 15:16:46 +00:00
Scott Gray 4448c4a866 No functional changes, just removing a whole bunch of unused imports and reorganizing them along the way.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@981019 13f79535-47bb-0310-9956-ffa450edef68
2010-07-31 08:28:34 +00:00
Jacques Le Roux 4c6376259c Fix r979204 on Adam's remarks in dev ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@979430 13f79535-47bb-0310-9956-ffa450edef68
2010-07-26 20:24:28 +00:00
Jacques Le Roux a81e990353 A patch from Deyan Tsvetanov "Service SaveLabelsToXmlFile omits labels for new locales that did not exist prior to calling service" (https://issues.apache.org/jira/browse/OFBIZ-3869) - OFBIZ-3869
1) Use LabelManagerFactory and try to add labels for a locale that does not exist in the resource bundles - for example en_US.
2) Invoke the service SaveLabelsToXmlFile

Expected behavior: the resource bundle should contain the newly added locales
Experienced behavior: the resource bundle does not contain the labels for the newly added locales. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@979204 13f79535-47bb-0310-9956-ffa450edef68
2010-07-26 09:01:56 +00:00
Adam Heath ac2299c50e Fix a bunch of no final newline issues.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@965918 13f79535-47bb-0310-9956-ffa450edef68
2010-07-20 17:15:21 +00:00
Adam Heath 92d004a866 Fix open file leak; the InputSource is only processed when a freemarker
template is given, so only attempt to create one if a template has been
specified.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@965916 13f79535-47bb-0310-9956-ffa450edef68
2010-07-20 17:14:17 +00:00
Adam Heath 76e9fc1b9a Remove use of deprecated ModelIindex.getIndexFieldsIterator().
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@958272 13f79535-47bb-0310-9956-ffa450edef68
2010-06-26 19:40:29 +00:00
Jacques Le Roux 9ef845d0ad A patch from BJ Freeman "complete web.xml for error reporting" (https://issues.apache.org/jira/browse/OFBIZ-3820) - OFBIZ-3820
BJ: when there is an error, the control servlet looks for an error path in <param-name>allowedPaths</param-name>
it does not find one throwing an exception which buries the orginal error.
instead of changing the code it is just easier to add the /error: path.
then the real error gets reported correctly.

JLR: This will maybe help to better understand some errors on demo servers, and can't hurt

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@954135 13f79535-47bb-0310-9956-ffa450edef68
2010-06-12 20:47:08 +00:00
Erwan de Ferrieres 928f68c016 Unexistant uilabel was used
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@953326 13f79535-47bb-0310-9956-ffa450edef68
2010-06-10 14:06:37 +00:00
Adam Heath 9cc1b3e521 Revert wrongly committed 950265
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950269 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 21:55:59 +00:00
Adam Heath 0a84a9166c Minor fixes to make webtools work underneath webslinger(not ready to go
public).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@950265 13f79535-47bb-0310-9956-ffa450edef68
2010-06-01 21:47:24 +00:00
Jacques Le Roux 2a1a5aee14 We don't need
<copyright>Copyright 2001-.* The Apache Software Foundation</copyright>
<copyright><year>.*</year><holder>Apache Foundation</holder></copyright>
<copyright><year>.*</year><holder>Apache Foundation.</holder></copyright>
<owner>Copyright 2001-.* The Apache Software Foundation</owner>

Less to update every year!

Thanks to BJ 1st effort at "update files from 2009 to 2010" (https://issues.apache.org/jira/browse/OFBIZ-3783) - OFBIZ-3783

Note: there are been a lot of efforts in 2009: there are plenty of data dated from this year!

I hope I did not broke anything (should not, but of course I did not try all changes...) Anyway, this can be easily reverted...

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@948846 13f79535-47bb-0310-9956-ffa450edef68
2010-05-27 14:23:22 +00:00
Jacques Le Roux f59221875d Fix a bug due to multi-tenant introduction. I guess this bug appears only if you use the multi-tenant mode.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@947988 13f79535-47bb-0310-9956-ffa450edef68
2010-05-25 09:53:56 +00:00
Erwan de Ferrieres 1769a48bb1 Missing screen when using the portal admin in webtools
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@945728 13f79535-47bb-0310-9956-ffa450edef68
2010-05-18 16:10:10 +00:00
Jacques Le Roux df9963f0e5 A patch from Nicolas Malin "Pass eCommerce label to Common Label" https://issues.apache.org/jira/browse/OFBIZ-3694 - OFBIZ-3694
Some labels changes, no functional changes



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@942818 13f79535-47bb-0310-9956-ffa450edef68
2010-05-10 16:41:18 +00:00
Erwan de Ferrieres 4f90299ebd Following a discussion on dev list, moving portal administration to webtools instead of myPortal (http://ofbiz.135035.n4.nabble.com/erwan-contributions-td2122600.html#a2122600)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@942406 13f79535-47bb-0310-9956-ffa450edef68
2010-05-08 15:52:31 +00:00
Bruno Busco 1664f3e90e A patch from Blas Rodriguez Somoza
OFBIZ-3732 - XHTML validation errors round 2++ (framework excluding widgets)
https://issues.apache.org/jira/browse/OFBIZ-3732
geolocation.ftl
Script content need to be inside markup comment to avoid character encoding issues.

EntityImport.ftl
attributes without values

EntityImportDir.ftl
attributes without values

EntityImportReaders.ftl
attributes without values

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@939757 13f79535-47bb-0310-9956-ffa450edef68
2010-04-30 17:46:49 +00:00
Scott Gray 28b1ea8962 Removed usage of deprecated methods
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@938949 13f79535-47bb-0310-9956-ffa450edef68
2010-04-28 11:30:44 +00:00
Adrian Crum c84bb63e24 Web Tools is two words - fixed UI labels.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@938089 13f79535-47bb-0310-9956-ffa450edef68
2010-04-26 15:22:03 +00:00
Erwan de Ferrieres 72d261af4b Buttons at the bottom of an list weren't working
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935891 13f79535-47bb-0310-9956-ffa450edef68
2010-04-20 12:22:25 +00:00
Bilgin Ismet Ibryam 1562b0a308 Added description field to TemporalExpression entity and related data plus forms. Part of https://issues.apache.org/jira/browse/OFBIZ-3521
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935387 13f79535-47bb-0310-9956-ffa450edef68
2010-04-18 18:41:20 +00:00
Bruno Busco 38c435ca8d A slightly changed (tabs replaced with spaces) patch from Blas Rodriguez Somoza
OFBIZ-3681 - XHTML validation errors round 2+ (framework excluding widgets)
https://issues.apache.org/jira/browse/OFBIZ-3681
XHTML validation errors

    * Unclosed tags
    * attributes without values (checked, selected, disabled, etc)
    * attribute values without "
    * Uppercase tags or attributes.
    * Unencoded ampersands in urls.

Other errors:

common/webcommon/includes/listVisualThemes.ftl
Line 19: style tag is not allowed here, style must be in the style attribute of the tag.

webtools/webapp/webtools/stats/StatBinsHistory.ftl
Line 29: duplicated id

webtools/webapp/webtools/tempexpr/tempExprMaint.ftl
Lin 32, 104: form must be outside table.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935311 13f79535-47bb-0310-9956-ffa450edef68
2010-04-18 07:52:08 +00:00
Scott Gray f8354e3fa4 Get rid of a bunch of Integer instantiations
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@935163 13f79535-47bb-0310-9956-ffa450edef68
2010-04-17 10:27:15 +00:00
Bruno Busco 792f965046 A patch from Blas Rodriguez Somoza
OFBIZ-3643 - Error screen in webtools->Import Export -> Induce model from database (Ofbiz Demo)
https://issues.apache.org/jira/browse/OFBIZ-3643

Error screen when "induce model from database" option selected.
org.apache.jasper.JasperException: Unable to compile class for JSP:...


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@932737 13f79535-47bb-0310-9956-ffa450edef68
2010-04-10 14:53:12 +00:00
Bruno Busco 5d5e489598 A patch from Blas Rodriguez Somoza
OFBIZ-3637 - XHTML validation errors (framework excluding widget) round 2
https://issues.apache.org/jira/browse/OFBIZ-3637

XHTML validation errors

    * Unclosed tags INPUT, IMG, BR...
    * attributes without values (checked, selected, disabled, etc)
    * attribute values without "
    * required attributes not included (alt in img, type in style, type in script etc)
    * Uppercase tags or attributes.
    * Unencoded entities (ampersands).

Other changes:

selectall.js
line 333. ajaxAutoCompleter must work with unenconded or encoded ampersands.

EntityRefMain.ftl
line 176. <div> must be </div>


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@932733 13f79535-47bb-0310-9956-ffa450edef68
2010-04-10 14:35:07 +00:00
Scott Gray b2e06c24b6 Increase the transaction timeout for rendering the artifact info screen
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@931775 13f79535-47bb-0310-9956-ffa450edef68
2010-04-08 04:08:50 +00:00
Hans Bakker 158fd4aec9 Update dutch translation, a contribution by Willem Janssen: OFBIZ-3652
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@931430 13f79535-47bb-0310-9956-ffa450edef68
2010-04-07 04:27:42 +00:00
Scott Gray 90cc6d7794 Store the ArtifactInfo's Recently Viewed Artifacts list in the session as basic maps instead of ArtifactInfoBase objects that aren't serializable.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@931222 13f79535-47bb-0310-9956-ffa450edef68
2010-04-06 17:00:05 +00:00
Adrian Crum da42890638 A patch from Blas Rodriguez Somoza - XHTML validation errors (framework excluding widget) (https://issues.apache.org/jira/browse/OFBIZ-3622).
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930701 13f79535-47bb-0310-9956-ffa450edef68
2010-04-04 15:29:58 +00:00
Bilgin Ismet Ibryam 2a29d19bc0 Committed a patch from OFBIZ-3541 "Using Widgets html form templates in FTL files". This change will make autocompleter available also in ftl lookups.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930660 13f79535-47bb-0310-9956-ffa450edef68
2010-04-04 10:38:19 +00:00
Adam Heath 5ec1f9cda5 Fix bad transaction pattern introduced with 927256.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@930332 13f79535-47bb-0310-9956-ffa450edef68
2010-04-02 17:22:24 +00:00
Adam Heath 94604a3923 Last commit fixed the compile error, and allowed the test cases to pass.
However, there are no tests against the webtools webapp, and this change
finishes the fix.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929849 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 05:42:11 +00:00
Adam Heath 6094c94ba2 Fix for buildbot failure, due to committing untested rebased code;
mea-culpa.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929847 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 05:21:21 +00:00
Adam Heath 1bc6324970 Remove SoftReferences automatically in the background. This is the
final step in removing all polling code patterns from UtilCache.
Because of this, all helper methods that were used to clear elements
programmatically are now officially deprecated.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929845 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:51:14 +00:00
Adam Heath ccbc1646ca Inline CacheLineTable into UtilCache. This removes the CacheLineTable
class completely.  The getCacheLine() method now throws
UnsupportedOperationException.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929838 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:46:53 +00:00
Adam Heath f530c596ed Add a feature to request CacheLine metadata as a simple list of maps.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929837 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:46:14 +00:00
Adam Heath b7acc2eb21 getMaxSize didn't actually do anything useful, and overlapped with
getMaxInMemory.  Deprecate getMaxSize(it continues to call setLru
underneath everything), and provide a new getSizeLimit method.  This
latter method still does nothing, but at least it no longer overlaps.

Also remove the maxSize parameter in webtools FindUtilCache page,
instead displaying and altering the maxInMemory setting.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929813 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:31:37 +00:00
Adam Heath 9bb060774d Fix parsing of maxSize parameter, should be an integer.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929805 13f79535-47bb-0310-9956-ffa450edef68
2010-04-01 04:23:30 +00:00
Adrian Crum 274cafd577 Removed obsolete template boundary comment.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929730 13f79535-47bb-0310-9956-ffa450edef68
2010-03-31 21:57:06 +00:00
Jacques Le Roux 0b8d1d026a A patch from Atul Vani "typo mistakes in tempExprMacros.ftl" https://issues.apache.org/jira/browse/OFBIZ-3629 - OFBIZ-3629
Fix 2 C/P in tempExprMacros.ftl. Like in HourOfDayRange's dropdown field the selected value is set to 31 which it can't hold so it is restored to 0 when the page renders
path to regenerate affected page "webtools>Configuration>Temporal Expression>Create" 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929582 13f79535-47bb-0310-9956-ffa450edef68
2010-03-31 15:12:42 +00:00
Jacopo Cappellato 505608a5b5 Updated groovy script broken after recent changes for multi tenant support.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@929148 13f79535-47bb-0310-9956-ffa450edef68
2010-03-30 14:10:23 +00:00
David E. Jones 8e3edae07f Merged multitenant20100310 branch into the trunk
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@927271 13f79535-47bb-0310-9956-ffa450edef68
2010-03-25 04:42:26 +00:00
Hans Bakker b1c0d136ef when exporting all data, an error message in the log advices to put the the function in a transaction. also added extra commits to try to solve the permgen problem. it is better now, but not solved completely
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@927256 13f79535-47bb-0310-9956-ffa450edef68
2010-03-25 02:28:25 +00:00
Scott Gray a8b40ca086 xhtml fix: & -> &amp;
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@924958 13f79535-47bb-0310-9956-ffa450edef68
2010-03-18 19:12:55 +00:00
Scott Gray 8e07d410ca xhtml fixes, forms aren't allowed within p tags and an input tag wasn't closed
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@924573 13f79535-47bb-0310-9956-ffa450edef68
2010-03-18 00:56:30 +00:00