Commit Graph
268 Commits
Author SHA1 Message Date
Jacques Le Roux 5dc7ce9548 No functional changes
completes r1781219 by putting svn:eol-style=native to all file types declared 
in [auto-props] section of the svn config files.css

Actually this is only a 1st pass, it was too complicated to do it for  
all file types at once only concerned here
*.java;*.bsh;*.groovy;*.jsp;*.tld;*.ftl;*.js;*.sql;*.c;*.cpp;*.h;*.txt;*.sgml;
*.properties;*.xml;.classpath;.project;*.sld;*.gml;*.xsl;*.xsd
*.html;*.htm;*.css;*.md;README;NOTICE;LICENSE;rc.ofbiz.*;*.less;*.dsp;*.dsw

Most files should not be concerned by this change, but it's impossible to do
it one by one.

There are also changes in files with have mixed EOLs; because this has no sense
when using native which automatically resolves this issue

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/plugins@1781731 13f79535-47bb-0310-9956-ffa450edef68
2017-02-05 11:09:59 +00:00
Jacopo Cappellato 96b22285f4 Implemented: removed the "controller" related logic, that is now provided by the
new ControlFilter, from the ContextFilter; modified existing applications to use 
the two filters in a chain; removed from the other specialized filters all the 
logic that was duplicated or extended from ContextFilter.

A web application, in order to leverage the OFBiz framework, requires that a 
series of objects are in its contexts (servlet context, session and request) 
such as "delegator", "delegatorName", "dispatcher", "security" etc. etc...
This setup is performed by the logic contained in the servlet filter implemented 
by the ContextFilter class.
The execution of this logic is required for the application to run properly.
However, before this commit, in the ContextFilter there was other logic, related 
to access control and redirection rules (some of them performed in coordination 
with the ControlServlet), making it difficult to deploy this filter in all the 
web applications, especially the ones that implement special handling of paths.
In fact, this filter was deployed in most but not all the web application in the 
OFBiz codebase: specifically it was not deployed in web applications that 
require the execution of other filters (e.g. CatalogUrlFilter, etc...) like the 
ones in the "ecommerce" and "solr" components.



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1761304 13f79535-47bb-0310-9956-ffa450edef68
2016-09-18 08:08:30 +00:00
Gil Portenseigne b4942c2d68 Implemented: Add tasks from different project on the same invoice (OFBIZ-8116)
This new feature allow to bill task time entries from several projects into one unique Invoice.

Thanks Florian Montalbano for your contribution, i did apply some light improvments in your patch

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1761202 13f79535-47bb-0310-9956-ffa450edef68
2016-09-17 11:56:04 +00:00
Pranay Pandey e44ba95d72 [OFBIZ-7311] - Applied the patch from the ticket. Removing the unused references of the maincss.css from source code, following is done-
1) Removed 'maincss.css' entry from 'allowedPaths' param of from web.xml
Reason: Since, there is no file like 'maincss.css' exist under any includes directory. 
2) Removed the unused references of maincss.css from FTLs, code
<link rel="stylesheet" href="${StringUtil.wrapString(baseUrl!)}/images/maincss.css" type="text/css"/> 
has been removed.
Reason: This is an interesting thing, these FTLs were using the maincss.css located under the images directory.
When I look the history of these files, following were my findings,
The 'maincss.css' file under the 'images' directory exist in release4.0 
http://svn.apache.org/repos/asf/ofbiz/branches/release4.0/framework/images/webapp/images/
after this release, this files no longer exist there.
3) Also, I have updated one file 'InventoryNoticeEmail.ftl' and used the basic HTML code to style, instead of using style defined in 'maincss.css' which were exist in release-4.0
4) Updated some references from 'maincss.css' to style.css in comments.
5) Also removed the entry of including '/images/maincss.css' and '/images/mainrtl.css' in SimpleDecorator
Since, these files no longer exist after release-4.0.

Thanks Wai for reviewing the work and thanks Swapnil M Mane for the contribution.


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1758389 13f79535-47bb-0310-9956-ffa450edef68
2016-08-30 13:37:27 +00:00
Deepak Dixit 8f3141cd46 (OFBIZ-6274) Renamed OFBiz artefacts from org.ofbiz.* to org.apache.ofbiz.*.Thanks to Taher for working on it.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1752920 13f79535-47bb-0310-9956-ffa450edef68
2016-07-16 10:30:49 +00:00
Jacques Le Roux 4deae05a38 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/specialpurpose@1749634 13f79535-47bb-0310-9956-ffa450edef68
2016-06-22 05:58:26 +00:00
Jacques Le Roux a98ac13d9d 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/specialpurpose@1749489 13f79535-47bb-0310-9956-ffa450edef68
2016-06-21 11:37:47 +00:00
Jacques Le Roux b20816bfa8 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/specialpurpose@1749488 13f79535-47bb-0310-9956-ffa450edef68
2016-06-21 11:14:16 +00:00
Deepak Dixit 54f6e94bc1 (OFBIZ-7218) Relocate .groovy files in the specialpurpose/projectmgr component
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1747848 13f79535-47bb-0310-9956-ffa450edef68
2016-06-11 05:50:23 +00:00
Jacques Le Roux 5e65059e4d A big but straightforward commit for "Move minilang scripts from component://componentname/script/org/ofbiz to component://componentname/minilang" - https://issues.apache.org/jira/browse/OFBIZ-7267
I removed duplicate paths were componentname was uselessly repeated after component://componentname/script/org/ofbiz (projectmngr was the only one using there project instead)

I had few typos, easily fixed thanks to the tests. There could be still typos but they are unexpected and anyway no-brainer to fix 

I'm still wondering about specialpurpose/example/minilang/README.txt.
I changed its content to 
  "The minilang directory is for static resources that are interpreted at run time rather than being compiled. This goes on the classpath, but does not get built or put into a JAR file."
not sure it makes any sense, I don't see how this relates to the classpath. 


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1747712 13f79535-47bb-0310-9956-ffa450edef68
2016-06-10 14:04:30 +00:00
Jacques Le Roux 1abac4e903 Following partial revert of r1736876 for OFBIZ-6812 (project), this moves the *.ftl files from webapp to template subfolders
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1737571 13f79535-47bb-0310-9956-ffa450edef68
2016-04-03 10:07:42 +00:00
Jacques Le Roux 0a982250e6 Temporary fix for "UtilXml.LocalResolver.resolveEntity] could not find LOCAL DTD/Schema with publicId [null] and the file/resource is [web-app_3_0.xsd]" - https://issues.apache.org/jira/browse/OFBIZ-6807
As suggested by Deepak keeps only <<web-app version="3.0">> in web.xml files instead of whole xmlns and schemaLocation. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1726388 13f79535-47bb-0310-9956-ffa450edef68
2016-01-23 11:52:08 +00:00
Jacques Le Roux 825286d68d A patch from "Ralph" (info at agentur-m3 dot de) for "ProjectMgr: GanttChart fails, in case of dependencies for tasks" https://issues.apache.org/jira/browse/OFBIZ-6842
the problen is in line 127:
taskInfo.preDecessor = latestTaskIds
This line causes brackets around ids (e.g.: [10098] )
And these brackets cannot be processed by jsgantt.
So in case of dependencies the ganttchart will not be displayed.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1725257 13f79535-47bb-0310-9956-ffa450edef68
2016-01-18 13:08:12 +00:00
Deepak Dixit 3ae8efbbb1 (OFBIZ-6655) Applied patch from jira issue OFBIZ-6655.
Add session tracking mode and make cookie secure for some special purposes component.

Thanks Rahul Bhammarker for contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1724930 13f79535-47bb-0310-9956-ffa450edef68
2016-01-16 07:15:09 +00:00
Arun Patidar da04c7ce72 [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/specialpurpose@1706589 13f79535-47bb-0310-9956-ffa450edef68
2015-10-03 14:15:21 +00:00
Nicolas Malin 1e3600618d Convert javolution FastMap, FastSet and FastList by standard java.util.*
Related to OFBIZ-5781 Convert Javolution collections into Java collections
Thanks to Deepak Dixit and Adrian Crum for their help.

By defautl converted :
 * FastMap by HashMap
 * FastList by LinkedList
 * FastSet by HashSet

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1672752 13f79535-47bb-0310-9956-ffa450edef68
2015-04-10 20:22:54 +00:00
Ashish Vijaywargiya 1432b8f43f Applied two patch files from jira issue - OFBIZ-5893 - Use EntityQuery Builder methods in goovy files by replacing Entity Engine methods. Thanks Arun for your recent contribution where you have included changes from specialpurpose and product component.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1647937 13f79535-47bb-0310-9956-ffa450edef68
2014-12-26 06:54:50 +00:00
Ashish Vijaywargiya 1756807812 Applied patch from jira issue - OFBIZ-5892 - Replace all occurences of dispatcher.runSync in groovy files with runService() of DSL.
Thanks Arun for the contribution.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1646167 13f79535-47bb-0310-9956-ffa450edef68
2014-12-17 08:10:12 +00:00
Ashish Vijaywargiya c5bbc062b3 Applied the patch OFBIZ-4902_specialpurpose.patch from OFBIZ-4902 - Replace in Freemarker templates the deprecated built-ins: default, exists, if_exists.
Thanks http://ofbiz.us team for providing the patch work. 

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1618313 13f79535-47bb-0310-9956-ffa450edef68
2014-08-16 08:40:28 +00:00
Erwan de Ferrieres 72c3fd4fc0 renaming gantchart as ganttchart to remove the error in the chart name
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1376030 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 13:21:07 +00:00
Sascha Rodekamp 84f1ddafac - Fixed a bug, the Projectmgr GantChart was not shown anymore. Thanks Hans for reposting on the user ML
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1375953 13f79535-47bb-0310-9956-ffa450edef68
2012-08-22 09:23:52 +00:00
Adam Heath 123e69b53f DEPRECATION: specialpurpose: GenericValue.getRelated(ByAnd|OrderBy)(|Cache)
replaced by the single getRelated variant.

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1343530 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 04:21:13 +00:00
Adam Heath e92d3a52f4 DEPRECATION: specialpurpose/projectmgr: GenericValue.getRelated/getRelatedCache variants replaced with a getRelated that takes a boolean useCache parameter.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1343523 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 04:19:56 +00:00
Adam Heath 249d62d4ea DEPRECATION: specialpurpose/projectmgr: getRelatedOne variants replaced with a getRelatedOne variant that takes a boolean useCache parameter.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1343500 13f79535-47bb-0310-9956-ffa450edef68
2012-05-29 04:15:53 +00:00
Adam Heath 2bdf42b88d DEPRECATION: specialpurpose/projectmgr: findByAnd variants replaced with findByAnd that takes a boolean useCache parameter.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1338422 13f79535-47bb-0310-9956-ffa450edef68
2012-05-14 21:03:26 +00:00
Adam Heath 3edf9fdad7 DEPRECATION: specialpurpose/projectmgr: findByPrimaryKey variants
replaced with findOne

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1337682 13f79535-47bb-0310-9956-ffa450edef68
2012-05-12 21:21:37 +00:00
Jacopo Cappellato 3f50aa391c This is just a guess but this could fix the issue reported in the user list by Tolu Williams:
While viewing gantt chart in trunk for any project i get the following error

org.ofbiz.widget.screen.ScreenRenderException: Error rendering screen
[component://projectmgr/widget/ProjectScreens.xml#ganttChart]:
java.lang.IllegalArgumentException: Error running script at location
[component://projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy]:
javax.script.ScriptException:
org.codehaus.groovy.runtime.typehandling.GroovyCastException: Cannot cast
object 'null' with class 'null' to class 'double'. Try 'java.lang.Double'
instead (Error running script at location
[component://projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy]:
javax.script.ScriptException:
org.codehaus.groovy.runtime.typehandling.GroovyCastException: Cannot cast
object 'null' with class 'null' to class 'double'. Try 'java.lang.Double'
instead)

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1327275 13f79535-47bb-0310-9956-ffa450edef68
2012-04-17 20:53:03 +00:00
Jacques Le Roux a27159d9c2 A patch from Wai https://issues.apache.org/jira/browse/OFBIZ-4486
"createuserlogin, createUserLogin duplicate request map entries"

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1184906 13f79535-47bb-0310-9956-ffa450edef68
2011-10-16 19:36:20 +00:00
Hans Bakker 288019cf38 remove the rest of the website definitions from seed data, the ones that are left are in the demo data
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1158099 13f79535-47bb-0310-9956-ffa450edef68
2011-08-16 03:43:06 +00:00
Erwan de Ferrieres e7ba49027e Missing phase name when displaying a task
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1130221 13f79535-47bb-0310-9956-ffa450edef68
2011-06-01 16:52:04 +00:00
Erwan de Ferrieres 9fa86f57b3 A patch from Pierre Gaudin OFBIZ-4298: fix js Gantt display for milestone and associated workeffort
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1130143 13f79535-47bb-0310-9956-ffa450edef68
2011-06-01 13:26:37 +00:00
Adrian Crum 71f65add97 Eliminated a redundant screen in Project Manager. This is in preparation for moving userlogin UI artifacts to the framework.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1050759 13f79535-47bb-0310-9956-ffa450edef68
2010-12-19 05:07:59 +00:00
Jacques Le Roux c008c6ccb3 Merges the jQuery branch back to the trunk
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@1044503 13f79535-47bb-0310-9956-ffa450edef68
2010-12-10 20:40:08 +00:00
Adam Heath 5b3b7e0c99 Finally created a script to find and fix tons of missing final newlines.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@982870 13f79535-47bb-0310-9956-ffa450edef68
2010-08-06 04:46:48 +00:00
Jacques Le Roux e263a69b74 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/specialpurpose@954135 13f79535-47bb-0310-9956-ffa450edef68
2010-06-12 20:47:08 +00:00
Erwan de Ferrieres 3d50d28eec XHTML validation errors round 2+ (specialpurpose/projectmgr) - OFBIZ-3672 (https://issues.apache.org/jira/browse/OFBIZ-3762)
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@945573 13f79535-47bb-0310-9956-ffa450edef68
2010-05-18 10:03:01 +00:00
Bruno Busco 7a529c00bc A patch from Blas Rodriguez Somoza
OFBIZ-3677 - XHTML validation errors round 2 (specialpurpose/projectmgr)
https://issues.apache.org/jira/browse/OFBIZ-3677

XHTML validation errors

    * Unclosed tags




git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@934184 13f79535-47bb-0310-9956-ffa450edef68
2010-04-14 20:35:23 +00:00
Bruno Busco 11b8f06bf4 A patch from Blas Rodriguez Somoza
OFBIZ-3617 - XHTML validation errors (specialpurpose_projectmgr)
https://issues.apache.org/jira/browse/OFBIZ-3617

XHTML validation errors

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

Other errors:
gantChart.ftl
Duplicated DOCTYPE

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@932722 13f79535-47bb-0310-9956-ffa450edef68
2010-04-10 13:58:26 +00:00
Erwan de Ferrieres ed1b494882 Adding week-ends display in Gantt chart
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@932278 13f79535-47bb-0310-9956-ffa450edef68
2010-04-09 07:48:29 +00:00
Erwan de Ferrieres 6c73e92fd6 Adding a specific CSS for displaying Gantt charts in project manager. Tables are now aligned.
Next step is to make weekends apparent !

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@931925 13f79535-47bb-0310-9956-ffa450edef68
2010-04-08 13:14:22 +00:00
Jacques Le Roux 14bf0f757c Closes "Using Widgets html form templates in FTL files" (https://issues.apache.org/jira/browse/OFBIZ-3541) - OFBIZ-3541
This concerns the lookups which are now rendered the same in ftl files and widget forms

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@931854 13f79535-47bb-0310-9956-ffa450edef68
2010-04-08 10:19:38 +00:00
Adam Heath 62ede2cc16 Fix lots of bad xhtml tags, need to have a space before the ending /.
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@923545 13f79535-47bb-0310-9956-ffa450edef68
2010-03-16 01:56:41 +00:00
Hans Bakker 15f446e69e show wbsId on project manager timesheets
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@920212 13f79535-47bb-0310-9956-ffa450edef68
2010-03-08 06:59:23 +00:00
Erwan de Ferrieres 333746dd89 Project manager update :
milestones can be added to a project and are diplayed on the Gantt chart

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@918343 13f79535-47bb-0310-9956-ffa450edef68
2010-03-03 07:11:31 +00:00
Hans Bakker 41aa40d3b2 add optional sequenceNum to be able to order phases and tasks within a project
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@915275 13f79535-47bb-0310-9956-ffa450edef68
2010-02-23 10:47:21 +00:00
Hans Bakker 442f1e9df0 remove a resource from the projectmanager did not return to the original screen
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@906436 13f79535-47bb-0310-9956-ffa450edef68
2010-02-04 10:15:05 +00:00
Hans Bakker 8d68ecddb6 create a customer request from an incoming email did not return to the incoming emaillist
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@891157 13f79535-47bb-0310-9956-ffa450edef68
2009-12-16 08:37:27 +00:00
Jacques Le Roux b7d0f685f2 A patch from Erwan de FERRIERES " Misc. internationalization on projectmgr" (https://issues.apache.org/jira/browse/OFBIZ-3069) - OFBIZ-3069
Word "week" was hard-coded in a form and a timesheet's total was hardcoded in the groovy script


git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@828844 13f79535-47bb-0310-9956-ffa450edef68
2009-10-22 20:46:17 +00:00
Hans Bakker cd2bfcb1f0 add username to customeritem note list
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@827935 13f79535-47bb-0310-9956-ffa450edef68
2009-10-21 09:22:16 +00:00
Hans Bakker 7453e5dfb7 improve displa of customer request in project manager
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk/specialpurpose@827921 13f79535-47bb-0310-9956-ffa450edef68
2009-10-21 08:39:24 +00:00