changeset 181:5ab5418d56cc

More changes following the renames in r187/r188.
author cmlenz
date Wed, 31 Aug 2005 01:49:59 +0000
parents 88b7f3a64370
children cafe294fa835
files MANIFEST.in bitten/trac_ext/templates/bitten_config.cs bitten/trac_ext/web_ui.py setup.py
diffstat 4 files changed, 9 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,1 @@
 include COPYING
-include htdocs/*.*
-include templates/*.cs
\ No newline at end of file
--- a/bitten/trac_ext/templates/bitten_config.cs
+++ b/bitten/trac_ext/templates/bitten_config.cs
@@ -106,7 +106,8 @@
       var:chrome.href ?>/bitten/charts.swf">
       <param name="FlashVars" value="library_path=<?cs
         var:chrome.href ?>/bitten&amp;xml_source=<?cs
-        var:chart.href ?>" />
+        var:chart.href ?><?cs if:config.charts_license ?>&amp;license=<?cs
+        var:config.charts_license ?><?cs /if ?>" />
       <param name="wmode" value="transparent" />
      </object><br /><?cs
     /each ?>
--- a/bitten/trac_ext/web_ui.py
+++ b/bitten/trac_ext/web_ui.py
@@ -318,13 +318,13 @@
             {'name': platform.name, 'id': platform.id} for platform in platforms
         ]
 
-        charts_license = self.config.get('bitten', 'charts_license')
-        if charts_license:
-            req.hdf['config.charts_license'] = charts_license
         req.hdf['config.charts'] = [
             {'href': self.env.href.build(config.name, 'chart/unittest')},
             {'href': self.env.href.build(config.name, 'chart/trace')}
         ]
+        charts_license = self.config.get('bitten', 'charts_license')
+        if charts_license:
+            req.hdf['config.charts_license'] = escape(charts_license)
 
         repos = self.env.get_repository(req.authname)
         try:
@@ -335,7 +335,8 @@
                 for build in Build.select(self.env, config=config.name, rev=rev):
                     if build.status == Build.PENDING:
                         continue
-                    req.hdf['%s.%s' % (prefix, build.platform)] = _build_to_hdf(self.env, req, build)
+                    build_hdf = _build_to_hdf(self.env, req, build)
+                    req.hdf['%s.%s' % (prefix, build.platform)] = build_hdf
                 if idx > 12:
                     break
         except TracError, e:
--- a/setup.py
+++ b/setup.py
@@ -19,7 +19,8 @@
                   'integration',
       license='BSD',
       packages=find_packages(exclude=['ez_setup', '*.tests*']),
-      package_data={'bitten.trac_ext': ['htdocs/*.*', 'htdocs/charts/*.swf',
+      package_data={'bitten.trac_ext': ['htdocs/*.*',
+                                        'htdocs/charts_library/*.swf',
                                         'templates/*.cs']},
       scripts=['scripts/bitten', 'scripts/bittend'],
       test_suite='bitten.tests.suite', zip_safe=True,
Copyright (C) 2012-2017 Edgewall Software