r23144 - gnucash/trunk/src/report/report-system - Bug 704525 - When you have a mix of chart types (bar charts and pie charts)

[Geert Janssens]

Author: gjanssens
Date: 2013-08-18 17:22:07 -0400 (Sun, 18 Aug 2013)
New Revision: 23144
Trac: http://svn.gnucash.org/trac/changeset/23144

Modified:
   gnucash/trunk/src/report/report-system/report.scm
Log:
Bug 704525 - When you have a mix of chart types (bar charts and pie charts)

Add calls to gnc:substring-replace-from-to to procedure gnc:report-run.
Filter out all occurances of jquery.min.js and jquery.jqplot.js except for the first occurances.
Author:    Carsten Rinke <carsten.rinke at gmx.de>

Modified: gnucash/trunk/src/report/report-system/report.scm
===================================================================
--- gnucash/trunk/src/report/report-system/report.scm	2013-08-18 21:21:57 UTC (rev 23143)
+++ gnucash/trunk/src/report/report-system/report.scm	2013-08-18 21:22:07 UTC (rev 23144)
@@ -751,7 +751,10 @@
      (lambda ()
        (if report
 	   (begin 
-	     (set! html (gnc:report-render-html report #t))))))
+	     (set! html (gnc:report-render-html report #t))
+             (set! html (gnc:substring-replace-from-to html "jquery.min.js" "" 2 -1))
+             (set! html (gnc:substring-replace-from-to html "jquery.jqplot.js" "" 2 -1))
+           ))))
     (gnc-unset-busy-cursor '())
     html))