Commit Graph
19 Commits
Author SHA1 Message Date
James Yong 591b0442c7 Improved: Apply multi-block attr to each application (OFBIZ-11706)
For Webtools, Themes.
2020-05-15 21:25:12 +08:00
Deepak Dixit 9715eb8932 Improved: Proper use of if-has-permission, Apply slightly modified patch from jira issue, if if-has-permission uses _ADMIN permission to check condition, so its good to have old pattern instead of using permission/action pattern.
Thanks Suraj Khurana for your contribution(OFBIZ-9740)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/ofbiz-framework/trunk@1812381 13f79535-47bb-0310-9956-ffa450edef68
2017-10-17 09:58:24 +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 c8ba932772 Fixes a "typo" in last commit for "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061
We used targetNamespace (should only be used in schema) instead of xsi:schemaLocation



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749634 13f79535-47bb-0310-9956-ffa450edef68
2016-06-22 05:58:26 +00:00
Jacques Le Roux 89212904bd Completes and finish "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061
This is the 2nd step: puts back the original names, so it will be transparent for remaining references in xml catalogs, Java code, etc.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749489 13f79535-47bb-0310-9956-ffa450edef68
2016-06-21 11:37:47 +00:00
Jacques Le Roux 4931db1ed9 Completes and finish "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061 by replacing xsd files references in xml files by -ns.xsd files and removing the concerned xsd files
This is a 1st step, in a 2nd I will put back the original names, so it will be transparent for remaining reference in xml catalogs, Java code, etc.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1749488 13f79535-47bb-0310-9956-ffa450edef68
2016-06-21 11:14:16 +00:00
Deepak Dixit 543dd8e488 (OFBIZ-7221) Relocate .groovy files in the framework/webtools component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1747755 13f79535-47bb-0310-9956-ffa450edef68
2016-06-10 17:16:22 +00:00
Deepak Dixit 5063287ddf (OFBIZ-6824) Apply slightly modified patch from jira issue, updated path for ping.ftl and showDateTime.ftl in controller.xml
============================================================
relocate .ftl files in the framework/webtools component
============================================================
Thanks  Pierre Smits for your contribution. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1738581 13f79535-47bb-0310-9956-ffa450edef68
2016-04-11 12:57:45 +00:00
Hans Bakker 56323a459b make the webtools screens use the decorator location from web.xml
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1455024 13f79535-47bb-0310-9956-ffa450edef68
2013-03-11 07:35:16 +00:00
Adam Heath d241a1049a Fix several xml files that had DOS line endings; converted them to UNIX,
so that on fresh checkouts they will be auto-converted to native.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1040833 13f79535-47bb-0310-9956-ffa450edef68
2010-12-01 00:15:17 +00:00
Bruno Busco 53dbd32914 tabButtonItem variable was not always set in WebTools application resulting in the TabMenu items not highlighting as required.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@832881 13f79535-47bb-0310-9956-ffa450edef68
2009-11-04 21:59:19 +00:00
Bruno Busco 12b525b77b Changed container-based search screan with FindScreenDecorator
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@826108 13f79535-47bb-0310-9956-ffa450edef68
2009-10-16 22:13:52 +00:00
Bruno Busco 6926457840 Added TabBars menus for the WebTools application. (OFBIZ-3020)
The WebTools main screen is still untouched so that all screens can be reached in the same way as before.
When we are OK with the new screens grouping under menus we will remove the main screen as it is now.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@823806 13f79535-47bb-0310-9956-ffa450edef68
2009-10-10 06:46:57 +00:00
Adrian Crum 02705185ea Refactored the Webtools Label Manager - due to a multitude of problems. Most notably:
1. Not thread safe.
2. Server files were being read/written without multi-user synchronization
3. Reads all UI labels into memory, then stores them in static memory, PLUS
4. Finds all references of those labels in project files and store those references in static memory (!!!)
5. Doesn't follow best practices for UI layout

It's amazing the original code worked. Even more amazing is the fact that this code made it into the project.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@776988 13f79535-47bb-0310-9956-ffa450edef68
2009-05-21 07:26:22 +00:00
Jacques Le Roux b9c3ddef08 2d part and end of an effort to remove trailing spaces
[ \t]+$ => "" (empty)
Should be easier to review when committing changes with trailing spaces removed automatically by anyedit or such tool (please refer to http://docs.ofbiz.org/x/mg)

Of course this effort to remove trailing spaces has no functional implications.

Actually, I was doing a 1st commit and as it's long to upload, I got conflicts with r763135
In the meantime I did some refactoring also in *.java and *.groovy files :
){ => ) {
if( => if (
while( => while (
}else => } else
else{ => else {
switch( => switch (
try{ => try {
}catch => } catch
catch( => catch (
}finally{ => } finally {

So these changes are also in this commit, should not be a problem anyway.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@763175 13f79535-47bb-0310-9956-ffa450edef68
2009-04-08 10:54:51 +00:00
Jacques Le Roux ae94a956b3 Marco's LabelReferences3.patch from "New tool to get labels information" https://issues.apache.org/jira/browse/OFBIZ-2070 - OFBIZ-2070
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744842 13f79535-47bb-0310-9956-ffa450edef68
2009-02-16 07:51:34 +00:00
Jacques Le Roux d5dc2d53ab Marco's LabelReferences2.patch from "New tool to get labels information" https://issues.apache.org/jira/browse/OFBIZ-2070 - OFBIZ-2070
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@744635 13f79535-47bb-0310-9956-ffa450edef68
2009-02-15 08:42:06 +00:00
Jacques Le Roux 93d458ba1f LabelsInfo13.patch by Marco from "New tool to get labels information" (https://issues.apache.org/jira/browse/OFBIZ-2070) - OFBIZ-2070
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@737491 13f79535-47bb-0310-9956-ffa450edef68
2009-01-25 08:41:44 +00:00
Jacques Le Roux 8bfaac2648 A modified patch from Marco Risaliti "New tool to get labels information" (https://issues.apache.org/jira/browse/OFBIZ-2070) - OFBIZ-2070
I have already commited merged changes in labels files. I commented out for now the lines in SaveLabelsToXmlFile.java which write the XML changes.
We have, at least, known 2 issued related to SaveLabelsToXmlFile :
. adding the ASL header
. taking care of labels sorting in a case described here https://issues.apache.org/jira/browse/OFBIZ-2070?focusedCommentId=12660632#action_12660632

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@731370 13f79535-47bb-0310-9956-ffa450edef68
2009-01-04 21:44:14 +00:00