Commit Graph
192 Commits
Author SHA1 Message Date
Jacques Le Roux 2b15c0302c Fixed: Add http to https redirect rule for ofbiz.apache.org (OFBIZ-10590)
This prevented to run the stable demo
2021-07-20 07:35:11 +02:00
Jacques Le Roux c6918b670e "Applied fix from trunk for revision: 1822383"
------------------------------------------------------------------------
r1822383 | jleroux | 2018-01-27 11:27:31 +0100 (sam., 27 janv. 2018) | 7 lines

Fixed: EntitySaxReader mostly-insert (store after create-error) Fix
(OFBIZ-1032)

This changes the label for more clarity. Actually there is not only inserts but
no replacements. Because you can also create and delete. This has been defined
after this label was created with OFBIZ-4949. So we have EntitySaxReader Action
enum and it's used in this this context.
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1822384 13f79535-47bb-0310-9956-ffa450edef68
2018-01-27 10:27:58 +00:00
Jacques Le Roux d8e24334e9 "Applied fix from trunk for revision: 1822310 "
------------------------------------------------------------------------
r1822310 | jleroux | 2018-01-26 16:13:42 +0100 (ven., 26 janv. 2018) | 29 lines

Fixed: EntitySaxReader mostly-insert (store after create-error) Fix
(OFBIZ-1032)

Karl:
Avoids rollback on create error to be able to store the entity instead 
(previous mostly-inserts feature).

Matin:
I think, the data load with "mostly inserts" activated should fail on a 
create-failure (what it does indeed already), so I see no need for a working 
solution of a fallback store attempt. Consistently the Feature should be renamed 
in the frontend from "mostly inserts" to "only inserts".

Kyra:
Additional trivial refactoring in the patch: I reduced the full qualified 
classname of org.xml.sax.SAXException in method signatures to the simple name.

This incorperates the changes that Martin has mentioned above. 
The unnecessary call to store() is removed, simplifying the process of creating 
and deleting entities. (These changes were already in Martins old patch but had 
the wrong format.) This means that the flag "mostly Inserts?" is not accurately 
worded since as long as there is only create fail, all operations are rolled 
back. So the second patch renames the flag and all appropriate parameters to 
"onlyInserts". 

jleroux: I made few no functional changes, apart not swallowing an exception

Thanks: Thanks Karl for the 1st patch, Martin to get further, and Kyra to 
complete the whole with a final touch and help to quickly test
------------------------------------------------------------------------


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/branches/release17.12@1822311 13f79535-47bb-0310-9956-ffa450edef68
2018-01-26 15:14:54 +00:00
Jacques Le Roux 6030547746 Fixed: Transaction Timeout in JavaEventHandler
(OFBIZ-9725)

When you run a service from webtools (not scheduling it) the the duration of the
 service is limited to the transaction default timeout (60 seconds)

Thanks: Jeffrey Breault for report

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1809741 13f79535-47bb-0310-9956-ffa450edef68
2017-09-26 13:15:12 +00:00
Nicolas Malin 703148c27e Implemented: Manage deprecated service in the ModelService (OFBIZ-9558)
When you want to remove a service we add a new xml element <deprecated/> that you can put on the service definition like this

<service name="oldService" ...>
    <deprecated use-instead="newService" since="theReleaseXXX">The reason to move it as deprecated</deprecated>
    <implements service="newService"/>
</service>

A deprecated service generate a warning log each time it is called
When you navigate on webtools a deprecated service is strike in the service list and display deprecated reason on the service definition detail page.

Thanks to Scott, Deepak, Taher and Jacques for sharing on this subject

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1804786 13f79535-47bb-0310-9956-ffa450edef68
2017-08-11 12:41:22 +00:00
Jacques Le Roux d952873c74 Implemented: Rename "loadAll" the "loadDefault" Gradle task
(OFBIZ-9411)

As discussed on user ML (https://s.apache.org/xjFj) rename "loadAll" 
the "loadDefault" Gradle task.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1798844 13f79535-47bb-0310-9956-ffa450edef68
2017-06-15 15:35:59 +00:00
Jacques Le Roux 344ffc3e92 No functional change to test svn to git sync
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1774731 13f79535-47bb-0310-9956-ffa450edef68
2016-12-17 10:42:39 +00:00
Jacques Le Roux 59025dde56 No functional change: removed an annoying superfluous space, when searching:
can't be found when searching from HTML source, HTML removes it

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1764058 13f79535-47bb-0310-9956-ffa450edef68
2016-10-10 11:09:29 +00:00
Jacques Le Roux 881b56ceeb Improves: Translate the svn and git info footers
(OFBIZ-7798)

We slightly changed the old format of the footer. The old format used only the 
translated words _uiLabelMap.CommonBuiltOn_ and _uiLabelMap.CommonWith_. 
On the other hand, the new format contains the words Branch, Revision, 
Built On and Java Version.

We need to translate all four words in the CommonUiLabels.xml and then 
incorporate them

old version:
" - Release-revision : ${releasePath}-r${info.entry.commit(revision)},  
${uiLabelMap.CommonBuiltOn} ${dateTime} ${uiLabelMap.CommonWith} 
Java ${java.version}

new version:
"Branch: ${info.entry.url.text()}" + System.lineSeparator()
"Revision: ${info.entry.commit.@revision}" + System.lineSeparator()
"Built on: ${timestamp}" + System.lineSeparator()
"Java Version: ${org.gradle.internal.jvm.Jvm.current()}"

Thanks: Taher Alkhateeb for the 1st patch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1762077 13f79535-47bb-0310-9956-ffa450edef68
2016-09-23 18:09:19 +00:00
Jacques Le Roux 88a9927834 After an exchange with Jacopo on dev ML, removes the need for the webtools.properties file
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1759573 13f79535-47bb-0310-9956-ffa450edef68
2016-09-07 09:50:54 +00:00
Jacques Le Roux c750a95810 Fixes "The "Only Not Used Labels" option of the Label Manager is broken" OFBIZ-8114
Simply replaces the parenthesis in ServiceUtil.getResource() by 2 spaces when parsing files with getLabelsFromJavaFiles() and getLabelsFromFtlFiles(). 
ServiceUtil.getResource() breaks the parsing
Note: no occurrences of ServiceUtil.getResource() yet in FTL files, and only 16 in Java files.

Also replaces "script" by "minilang" in getLabelsFromSimpleMethodFiles()

This adds a getResourceRegex  in a new webtools.properties files. This property
* Allow to remove this string from files when parsing with Label Manager, else it breaks 
* Moreover the string can't be in the LabelReferences.java file, to avoid side effects

I have also increased the transaction-timeout of the screen "SearchLabels" to 600. 
Because when using the "Only Not Used Labels" option the 1st pass can be long. 10 min should plenty enough, even on old machines. Not blocking anyway, just a bad stack trace in log
I'm sorry you will see a lot of false changes because the LabelManagerScreens.xml had no svn:properties at all, here they are now.


We have 5237 "Not Used Labels". I wondered if they were all real, I just checked some an indeed, they were not used. 
But there are also a huge bunch of *.description.* labels which certainly make sense. I'll remove them from the "Only Not Used Labels" result in another Jira I'll create

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1759457 13f79535-47bb-0310-9956-ffa450edef68
2016-09-06 16:38:14 +00:00
Jacques Le Roux b4cf32a0de No functional changes, simply update the documentation with respect to Gradle changes - OFBIZ-7677
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1756334 13f79535-47bb-0310-9956-ffa450edef68
2016-08-14 21:45:22 +00:00
Jacopo Cappellato 7820ab91de Removed a label no more used after the removal of JDBM in commit 1751817; thanks to Nicolas Malin for spotting this.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1751818 13f79535-47bb-0310-9956-ffa450edef68
2016-07-07 17:09:47 +00:00
Jacques Le Roux b476fc3dfc As always forgot to commit this French label change while committing stuff for OFBIZ-7363. Anyway better to have it apart.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1748703 13f79535-47bb-0310-9956-ffa450edef68
2016-06-16 12:34:30 +00:00
Arun Patidar fbe2dfb9d2 [OFBIZ-7140] Added Fetch Log Functionality parallel to View Log in webtools. Thanks Rishi Solanki for new feature and patch.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1746227 13f79535-47bb-0310-9956-ffa450edef68
2016-05-31 05:26:43 +00:00
Nicolas Malin 0c5de17f41 Add the possibility to set a blackout period for job manager service. During this time all async and scheduled service are put on hold.
This improvement add a entity JobManagerLock, a new screen to add/edit job manager lock and an information for end user on FindJob and ScheduleJob screen.
See more information on issue OFBIZ-6790. Thanks to Jacques for sharing on this improvement.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1727570 13f79535-47bb-0310-9956-ffa450edef68
2016-01-29 12:52:34 +00:00
Nicolas Malin c4c57626d8 * add missing french translation
* correct typo error on label WebtoolsEntityCretePermissionError -> WebtoolsEntityCreatePermissionError
* correct typo error on labels WebtoolsErrror* -> WebtoolsError*

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1726485 13f79535-47bb-0310-9956-ffa450edef68
2016-01-24 12:41:38 +00:00
Nicolas Malin fbae10008c add french label missing for EntityImport* and PageTitle*
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1726457 13f79535-47bb-0310-9956-ffa450edef68
2016-01-24 00:06:17 +00:00
Nicolas Malin 23fca59d0c add french translation on WebtoolsConfirmDelete label
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1722071 13f79535-47bb-0310-9956-ffa450edef68
2015-12-29 08:07:55 +00:00
Deepak Dixit f7a89e5cdd (OFBIZ-6525) Add confirmation message before deleting entity record from web-tools application.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1721089 13f79535-47bb-0310-9956-ffa450edef68
2015-12-21 05:09:06 +00:00
Jacques Le Roux 063c1201cf Fixes a typo I introduced, thanks to Nicolas at r1711918
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1711941 13f79535-47bb-0310-9956-ffa450edef68
2015-11-02 12:11:11 +00:00
Jacques Le Roux e9705da1ff Fixes a French label
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1711513 13f79535-47bb-0310-9956-ffa450edef68
2015-10-30 17:20:18 +00:00
Arun Patidar 3865ff485d [OFBIZ-6171] Applied patch from Pierre Smits for replacing 'Open for Business' references with 'Apache OFBiz'.Thanks Pierre for the contribution.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1706589 13f79535-47bb-0310-9956-ffa450edef68
2015-10-03 14:15:21 +00:00
Jacques Le Roux 4d2a942aa4 A patch from Gil Portenseigne for "Add a mean to untie geo associations" https://issues.apache.org/jira/browse/OFBIZ-6528
In the Webtools we can asociate Geos but we have yet no means to untie them

This patch adds a new grid in EditGeoScreen to see/delete GeoAssoc and CommonEntityLabels default-resource-name on GeoAssocType for translation purpose.

jleroux: On Pierre's Smits suggestion Gil also added a clickable link to open the associated Geo and a column to show the geoTypeId of the associated Geo.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1687259 13f79535-47bb-0310-9956-ffa450edef68
2015-06-24 13:10:00 +00:00
Shi Jinghai 85bed69778 Refs #6518.
Translated new labels in trunk version into zh locale (Simplified Chinese).

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1686778 13f79535-47bb-0310-9956-ffa450edef68
2015-06-22 07:10:41 +00:00
Nicolas Malin 68522eb09b Second pass due to local problem :/ . Resynchronise template macro form xml, text, csv and fo from html related to issue OFBIZ-6461.
adding unit test that call webtools/control/WebtoolsLayoutDemo with html, text, csv, xml and fop render and detect on the stream if an FTl stacktrace is present.
The fop test is currently commented because the screenfop failed to generate WebtoolsLayoutDemo page.
To support the unit case, the screen engine has been extend to manage platform-specific : <text> and <csv>

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1685132 13f79535-47bb-0310-9956-ffa450edef68
2015-06-12 16:48:55 +00:00
Nicolas Malin ae1af54128 revert previous commit, bad repo use my apologies
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1685130 13f79535-47bb-0310-9956-ffa450edef68
2015-06-12 16:46:08 +00:00
Nicolas Malin d3e95bb938 Resynchronise template macro form xml, text, csv and fo from html related to issue OFBIZ-6461.
adding unit test that call webtools/control/WebtoolsLayoutDemo with html, text, csv, xml and fop render and detect on the stream if an FTl stacktrace is present.
The fop test is currently commented because the screenfop failed to generate WebtoolsLayoutDemo page.
To support the unit case, the screen engine has been extend to manage platform-specific : <text> and <csv>

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1685124 13f79535-47bb-0310-9956-ffa450edef68
2015-06-12 16:25:30 +00:00
Jacques Le Roux 6c650d849a A patch from Pierre Smits for "Adding GeoPoints overview to geo management" https://issues.apache.org/jira/browse/OFBIZ-6148
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1667969 13f79535-47bb-0310-9956-ffa450edef68
2015-03-20 09:48:24 +00:00
Jacques Le Roux 6c48f830c8 A slightly modified patch from Pierre Smits for "Remove Portal Management code from Framework/WebTools." https://issues.apache.org/jira/browse/OFBIZ-5817
Remove code related to Portal Management functionality from WebTools after equivalent code in MyPortal has been committed. 

jleroux: I just removed also the FindPortalPage entry in Webtools main.ftl


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1653481 13f79535-47bb-0310-9956-ffa450edef68
2015-01-21 11:27:16 +00:00
Jacques Le Roux b8ca5543c9 Changes in all labels files: <value xml:lang="(.*)_(.*)"> to <value xml:lang="$1-$2">
Changes also listLocales.ftl to show dashes rather than underscores

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1650880 13f79535-47bb-0310-9956-ffa450edef68
2015-01-11 09:59:32 +00:00
Adrian Crum 91feff5f51 Updated the UI label files so they reference a schema.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1649666 13f79535-47bb-0310-9956-ffa450edef68
2015-01-05 21:24:18 +00:00
Jacques Le Roux 682c9014a2 Fixes and completes r1640588 and more minor things which were left after the change from run-install to load-demo
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1640727 13f79535-47bb-0310-9956-ffa450edef68
2014-11-20 12:18:59 +00:00
Jacques Le Roux 3b118d4842 An excerpt of a patch from Nick Ho for "Add/Revise Traditional Chinese (zh-TW) translations" https://issues.apache.org/jira/browse/OFBIZ-5764
added/revised zh-TW translations in the framework, applications and specialpurpose folders to have consistent, commonly-used meaningful terms in Traditional Chinese.

jleroux: from Nick Ho's patch I have extracted only the Chinese changes, w/o the proposed  dash to underscore changes
This contains notably this 14 "zh" (not "sh-TW") changes:
<value xml:lang="zh">人将由电子邮件接受一个临时密码。</value><!-- was 客户将通过电子邮件收到一个临时密码。 -->
<value xml:lang="zh">合计属于公司: </value>
<value xml:lang="zh"> 完整文本:${fullText}</value>
<value xml:lang="zh">供货商佣金百分比</value>
<value xml:lang="zh">文本大小</value>
<value xml:lang="zh">值</value>
<value xml:lang="zh">算子</value>
<value xml:lang="zh">不能转移已序列化的库存。</value>
<value xml:lang="zh">货运收据</value>
<value xml:lang="zh">获取标识为 ${productStoreShipMethId} 的产品店铺送货方法(ProductStoreShipmentMeth)时出错:${errorString}</value>
<value xml:lang="zh">中国人民币元</value>
<value xml:lang="zh">如果选择"specify other",下拉框旁边会出现文本框。参考form的drop-down元素的other-field-size属性说明</value>
<value xml:lang="zh">文本消息</value>
<value xml:lang="zh">能够收到和解析XML消息,但是BSR->NOUN(买卖关系->名词) ${bsrNoun} 和/或 BSR->VERB(买卖关系->动词) ${bsrVerb} 是空的</value>
I have no competency to judge these changes, but from previous Shi Jinghai's feedback I believe there are OK

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1625816 13f79535-47bb-0310-9956-ffa450edef68
2014-09-17 20:44:07 +00:00
Jacques Le Roux 425ce1c003 A patch from Nick Ho for "Add/Revise Traditional Chinese (zh-TW) translations in framework" https://issues.apache.org/jira/browse/OFBIZ-5737
more added/updated translations patch files for zh-TW locale

jleroux: 
I added the label
<value xml:lang="zh_TW">服務執行程式拋出一個異常</value>
by hand
Only 1 label was not added:
<value xml:lang="zh_TW">代號</value>
Because of the fuzziness and presence of several possibilities


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1621688 13f79535-47bb-0310-9956-ffa450edef68
2014-09-01 06:51:33 +00:00
Jacques Le Roux eb01bb126d Misc. cleaning in labels
Removes all empty ones
Removes some redundant/duplicates ones (please committers don't commit those again, I know it's not easy to catch, hopefully now we should have less of them)
Automatically replaces some tabs
Few French labels improvements
Removes 2 orphan entries ("ja" & "cs")
Fixes the schema header of WebtoolsUiLabels.xml


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1551594 13f79535-47bb-0310-9956-ffa450edef68
2013-12-17 16:00:50 +00:00
Hans Bakker 2908317017 added a new menu item in webtools: 'programmable export' where interactively a groovy program can be entered to export specifc records from the database. In order to apply some global changes for re-import
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1520505 13f79535-47bb-0310-9956-ffa450edef68
2013-09-06 08:03:34 +00:00
Hans Bakker f85167e1ca make component list the top level menu item of 'artifacts' because loading fast. move the 'take some time' message on the lower level menu iem now renamed to 'atifact search'
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1508738 13f79535-47bb-0310-9956-ffa450edef68
2013-07-31 06:26:37 +00:00
Jacques Le Roux 76274c5448 Better labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1500771 13f79535-47bb-0310-9956-ffa450edef68
2013-07-08 14:37:14 +00:00
Jacques Le Roux cff3539f53 French labels and better en label for WebtoolsMetricsRate
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1500705 13f79535-47bb-0310-9956-ffa450edef68
2013-07-08 13:00:28 +00:00
Adrian Crum 21f9c859d7 Removed the XSD-to-Java feature. Tools to make OFBiz development easier are outside the scope of the project.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1500424 13f79535-47bb-0310-9956-ffa450edef68
2013-07-07 13:05:14 +00:00
Adrian Crum e5eb503602 New feature: Convert an XSD file to Java source code. The feature creates immutable Java object models that represent the XML file defined by the schema. It supports an optional Visitor implementation.
The feature can be accessed in Web Tools by clicking on the XSD to Java link.

The Java source code is displayed in a text area - where it can be copied-and-pasted to your IDE. The source code is fairly complete, but you will have to fill in some missing bits.

If anyone wants to adapt the feature to make it a command-line utility, then that would be welcome.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1489362 13f79535-47bb-0310-9956-ffa450edef68
2013-06-04 09:52:10 +00:00
Adrian Crum 9bd42ec3a2 Reverted revision 1483822.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1484134 13f79535-47bb-0310-9956-ffa450edef68
2013-05-18 16:12:50 +00:00
Jacques Le Roux 929a06dfd5 Improves the Metrics stats by adding a new column used only by requests. It's quite useful to measure the real (not smoothed) durations of events in notably *chained* requests.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1483822 13f79535-47bb-0310-9956-ffa450edef68
2013-05-17 14:21:02 +00:00
Jacques Le Roux 830f9f7b91 A patch from Shi Jinghai for "Chinese localizations (zh) for trunk (Part II)" https://issues.apache.org/jira/browse/OFBIZ-5137
Translated missing zh labels for projectmgr, scrum, service, webpos and webtools components. These are the last 5 components.





git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1448350 13f79535-47bb-0310-9956-ffa450edef68
2013-02-20 18:50:33 +00:00
Adrian Crum a0402a0d38 Small improvement to Web Tools services screen: Add service definition location.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1446885 13f79535-47bb-0310-9956-ffa450edef68
2013-02-16 12:37:20 +00:00
Jacques Le Roux ecd2de6362 A patch from Naofumi Fukue "Japanese patch" https://issues.apache.org/jira/browse/OFBIZ-5061
Completed Japanese translation

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1412997 13f79535-47bb-0310-9956-ffa450edef68
2012-11-23 17:35:16 +00:00
Jacques Le Roux b46c7a2c06 A patch from Naofumi Fukue "Japanese patch" https://issues.apache.org/jira/browse/OFBIZ-5061
Got an issue merging GeoData_JP.xml with Subclipse, using Toirtoise solved it

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1403746 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 15:48:42 +00:00
Jacques Le Roux e381dea7a3 Better French label
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1403655 13f79535-47bb-0310-9956-ffa450edef68
2012-10-30 10:35:01 +00:00
Jacques Le Roux 88dfaa9bb4 Just to clarify, when you check all you don't check views. I just changed English and French labels
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1397809 13f79535-47bb-0310-9956-ffa450edef68
2012-10-13 10:24:49 +00:00