Commit Graph
4 Commits
Author SHA1 Message Date
James Yong 05ffbd2817 Improved: Add 'controlPath' attribute to 'ofbizUrl' freemarker macro
(OFBIZ-11317)

Adding the controlPath attribute to allow the controls by ofbizUrl to support uri to other OFBiz web application.

Thanks: Jacques for the review
2020-01-12 22:25:50 +08:00
Jacques Le Roux 84d1b73fe4 Following partial revert of r1736868 for OFBIZ-6819 (order), this moves the *.ftl files from webapp to template subfolders
It also removes the empty and not used images subfolder in webapp/ordermgr

git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1737564 13f79535-47bb-0310-9956-ffa450edef68
2016-04-03 09:40:47 +00:00
Jacques Le Roux 63ce9f7daa This partially reverts the changes done by
r1736866 for OFBIZ-6816 (humanres)
  r1736867 for OFBIZ-6817 (manufacturing)
  r1736868 for OFBIZ-6819 (order)
  r1736869 for OFBIZ-6837 (webpos)
  r1736870 for OFBIZ-6860 (myportal)
  r1736876 for OFBIZ-6812 (project)
Partially because I did not revert the changes in screens files and I already restored the *.ftl files (+ ShowProductionRun.groovy) deleted in r1736867 in their initial locations.

I noticed there is another groovy file: OrderReportPrepare.groovy. It's not used OOTB (events in relation with JasperReport commented out in order controller)
Both groovy files will need to be moved to a right location before we move groovy files also. 
They might not be the only ones in this case (wrong initial locations)...

Actually I did not review these patches enough when I committed them. 
Apart r1736867 (manufacturing), the ftl files were not moved but simply copied from their initial locations to the templates components sub-folders. 
In r1736867 the files were not moved but deleted and copied (this maybe a patch effect, not sure we can move files using patches, I'll try)

images

So this simply deletes the templates components sub-folders and their contents
I'll soon properly move the file, in the meantime the trunk will be in an inconsistent state (because of the the changes in screens files not reverted).



git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1737557 13f79535-47bb-0310-9956-ffa450edef68
2016-04-03 09:10:47 +00:00
Jacques Le Roux fda400bc3b A patch from Pierre Smits for <<relocate .ftl files in the order component>> https://issues.apache.org/jira/browse/OFBIZ-6819
git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1736868 13f79535-47bb-0310-9956-ffa450edef68
2016-03-28 11:14:22 +00:00