svn commit: r1788744 - in /ofbiz/ofbiz-plugins/trunk/pri
Locked
 
|
Author: shijh
Date: Sun Mar 26 16:28:19 2017 New Revision: 1788744 URL: http://svn.apache.org/viewvc?rev=1788744&view=rev Log: Improved: Add a PriCat component under specialpurpose (OFBIZ-9123) Moved pricat/webapp/pricat/ftl to pricat/template/pricat, pricat/webapp/pricatdemo/ftl to pricat/template/pricatdemo, and changed paths in files accordingly. Thanks Jacques, Pierre and Michael for the code review and suggestion on this improvement. Added: ofbiz/ofbiz-plugins/trunk/pricat/template/ ofbiz/ofbiz-plugins/trunk/pricat/template/pricat/ - copied from r1788711, ofbiz/ofbiz-plugins/trunk/pricat/webapp/pricat/ftl/ ofbiz/ofbiz-plugins/trunk/pricat/template/pricatdemo/ - copied from r1788711, ofbiz/ofbiz-plugins/trunk/pricat/webapp/pricatdemo/ftl/ Removed: ofbiz/ofbiz-plugins/trunk/pricat/webapp/pricat/ftl/ ofbiz/ofbiz-plugins/trunk/pricat/webapp/pricatdemo/ftl/ Modified: ofbiz/ofbiz-plugins/trunk/pricat/ofbiz-component.xml ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java ofbiz/ofbiz-plugins/trunk/pricat/template/pricat/viewExcelImportHistory.ftl ofbiz/ofbiz-plugins/trunk/pricat/template/pricatdemo/countdownreport.ftl ofbiz/ofbiz-plugins/trunk/pricat/template/pricatdemo/countupreport.ftl ofbiz/ofbiz-plugins/trunk/pricat/template/pricatdemo/parsePricatExcel.ftl ofbiz/ofbiz-plugins/trunk/pricat/widget/CommonScreens.xml ofbiz/ofbiz-plugins/trunk/pricat/widget/SampleScreens.xml Modified: ofbiz/ofbiz-plugins/trunk/pricat/ofbiz-component.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/pricat/ofbiz-component.xml?rev=1788744&r1=1788743&r2=1788744&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/pricat/ofbiz-component.xml (original) +++ ofbiz/ofbiz-plugins/trunk/pricat/ofbiz-component.xml Sun Mar 26 16:28:19 2017 @@ -41,6 +41,6 @@ under the License. server="default-server" location="webapp/pricatdemo" app-bar-display="false" - base-permission="OFBTOOLS,EXAMPLE" + base-permission="OFBTOOLS" mount-point="/pricatdemo" /> </ofbiz-component> Modified: ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java?rev=1788744&r1=1788743&r2=1788744&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java (original) +++ ofbiz/ofbiz-plugins/trunk/pricat/src/main/java/org/apache/ofbiz/htmlreport/AbstractHtmlReport.java Sun Mar 26 16:28:19 2017 @@ -36,11 +36,7 @@ public abstract class AbstractHtmlReport public final static String THREAD_TYPE = "thread_type"; - public final static String RUN_CREATETABLE_SCRIPT = "runcreatetablescript"; - - public final static String RUN_DROPTABLE_SCRIPT = "rundroptablescript"; - - public final static String FILE_REPORT_OUTPUT = "plugins/pricat/webapp/pricat/ftl/report.ftl"; + public final static String FILE_REPORT_OUTPUT = "plugins/pricat/template/pricat/report.ftl"; /** * Constructs a new report using the provided locale for the output language. Modified: ofbiz/ofbiz-plugins/trunk/pricat/template/pricat/viewExcelImportHistory.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/pricat/template/pricat/viewExcelImportHistory.ftl?rev=1788744&r1=1788711&r2=1788744&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/pricat/template/pricat/viewExcelImportHistory.ftl (original) +++ ofbiz/ofbiz-plugins/trunk/pricat/template/pricat/viewExcelImportHistory.ftl Sun Mar 26 16:28:19 2017 @@ -22,7 +22,7 @@ under the License. <div class="col-lg-12"> <div class="ibox float-e-margins"> <div class="ibox-content text-left p-md"> - <#include "component://pricat/webapp/pricat/ftl/ExcelImportHistoryReport.ftl"/> + <#include "component://pricat/template/pricat/ExcelImportHistoryReport.ftl"/> </div> </div> </div> Modified: ofbiz/ofbiz-plugins/trunk/pricat/template/pricatdemo/countdownreport.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/pricat/template/pricatdemo/countdownreport.ftl?rev=1788744&r1=1788711&r2=1788744&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/pricat/template/pricatdemo/countdownreport.ftl (original) +++ ofbiz/ofbiz-plugins/trunk/pricat/template/pricatdemo/countdownreport.ftl Sun Mar 26 16:28:19 2017 @@ -18,4 +18,4 @@ under the License. --> <#assign report = Static["org.apache.ofbiz.htmlreport.sample.SampleHtmlReport"].getReport(request, response)> ${report.prepareDisplayReport(request, response, "countdown", "/pricatdemo/control/countdownreport")} - <#include "component://pricat/webapp/pricat/ftl/report.ftl"> + <#include "component://pricat/template/pricat/report.ftl"> Modified: ofbiz/ofbiz-plugins/trunk/pricat/template/pricatdemo/countupreport.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/pricat/template/pricatdemo/countupreport.ftl?rev=1788744&r1=1788711&r2=1788744&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/pricat/template/pricatdemo/countupreport.ftl (original) +++ ofbiz/ofbiz-plugins/trunk/pricat/template/pricatdemo/countupreport.ftl Sun Mar 26 16:28:19 2017 @@ -18,4 +18,4 @@ under the License. --> <#assign report = Static["org.apache.ofbiz.htmlreport.sample.SampleHtmlReport"].getReport(request, response)> ${report.prepareDisplayReport(request, response, "countup", "/pricatdemo/control/countupreport")} - <#include "component://pricat/webapp/pricat/ftl/report.ftl"> + <#include "component://pricat/template/pricat/report.ftl"> Modified: ofbiz/ofbiz-plugins/trunk/pricat/template/pricatdemo/parsePricatExcel.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/pricat/template/pricatdemo/parsePricatExcel.ftl?rev=1788744&r1=1788711&r2=1788744&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/pricat/template/pricatdemo/parsePricatExcel.ftl (original) +++ ofbiz/ofbiz-plugins/trunk/pricat/template/pricatdemo/parsePricatExcel.ftl Sun Mar 26 16:28:19 2017 @@ -18,4 +18,4 @@ under the License. --> <#assign report = Static["org.apache.ofbiz.pricat.PricatParseExcelHtmlReport"].getReport(request, response)> ${report.prepareDisplayReport(request, response, "parse_excel", "/pricatdemo/control/parseSamplePricat")} - <#include "component://pricat/webapp/pricat/ftl/pricatreport.ftl"> + <#include "component://pricat/template/pricat/pricatreport.ftl"> Modified: ofbiz/ofbiz-plugins/trunk/pricat/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/pricat/widget/CommonScreens.xml?rev=1788744&r1=1788743&r2=1788744&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/pricat/widget/CommonScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/pricat/widget/CommonScreens.xml Sun Mar 26 16:28:19 2017 @@ -52,7 +52,7 @@ under the License. <widgets> <decorator-screen name="main-decorator"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://pricat/webapp/pricat/ftl/viewExcelImportHistory.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://pricat/template/pricat/viewExcelImportHistory.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> @@ -71,7 +71,7 @@ under the License. <widgets> <decorator-screen name="main-decorator"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://pricat/webapp/pricat/ftl/viewExcelImportLog.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://pricat/template/pricat/viewExcelImportLog.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> Modified: ofbiz/ofbiz-plugins/trunk/pricat/widget/SampleScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/pricat/widget/SampleScreens.xml?rev=1788744&r1=1788743&r2=1788744&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/pricat/widget/SampleScreens.xml (original) +++ ofbiz/ofbiz-plugins/trunk/pricat/widget/SampleScreens.xml Sun Mar 26 16:28:19 2017 @@ -51,7 +51,7 @@ under the License. <widgets> <platform-specific> <html> - <html-template location="component://pricat/webapp/pricatdemo/ftl/main.ftl"/> + <html-template location="component://pricat/template/pricatdemo/main.ftl"/> </html> </platform-specific> </widgets> @@ -74,7 +74,7 @@ under the License. <widgets> <platform-specific> <html> - <html-template location="component://pricat/webapp/pricatdemo/ftl/countdownreport.ftl"/> + <html-template location="component://pricat/template/pricatdemo/countdownreport.ftl"/> </html> </platform-specific> </widgets> @@ -97,7 +97,7 @@ under the License. <widgets> <platform-specific> <html> - <html-template location="component://pricat/webapp/pricatdemo/ftl/countupreport.ftl"/> + <html-template location="component://pricat/template/pricatdemo/countupreport.ftl"/> </html> </platform-specific> </widgets> @@ -116,7 +116,7 @@ under the License. <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://pricat/webapp/pricatdemo/ftl/SamplePricat.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://pricat/template/pricatdemo/SamplePricat.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> @@ -131,7 +131,7 @@ under the License. <widgets> <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <platform-specific><html><html-template location="component://pricat/webapp/pricatdemo/ftl/parsePricatExcel.ftl"/></html></platform-specific> + <platform-specific><html><html-template location="component://pricat/template/pricatdemo/parsePricatExcel.ftl"/></html></platform-specific> </decorator-section> </decorator-screen> </widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |