# HG changeset patch
# User Sylvain Thénault <sylvain.thenault@logilab.fr>
# Date 1255936541 -7200
# Node ID 2a86851cf2ffa73fe2e9afa3ba8db642ca67e948
# Parent  e3ccadb126d7df1614c675660a84188f534d58eb# Parent  3cb7dcd9ae774bef6b70b5483ce9e09d0ecf19dd
merge

diff -r e3ccadb126d7 -r 2a86851cf2ff devtools/fill.py
--- a/devtools/fill.py	Mon Oct 19 09:15:19 2009 +0200
+++ b/devtools/fill.py	Mon Oct 19 09:15:41 2009 +0200
@@ -397,9 +397,12 @@
             restrictions = ', '.join(c.restriction for c in constraints)
             q += ', %s' % restrictions
             # restrict object eids if possible
+            # XXX the attempt to restrict below in completely wrong
+            # disabling it for now
             objeids = select(restrictions, self.cursor)
         else:
             objeids = oedict.get(obj, frozenset())
+##         objeids = oedict.get(obj, frozenset())
         if subjcard in '?1' or objcard in '?1':
             for subjeid, objeid in used:
                 if subjcard in '?1' and subjeid in subjeids:
diff -r e3ccadb126d7 -r 2a86851cf2ff web/views/plots.py
--- a/web/views/plots.py	Mon Oct 19 09:15:19 2009 +0200
+++ b/web/views/plots.py	Mon Oct 19 09:15:41 2009 +0200
@@ -112,7 +112,8 @@
         for idx, (label, plot) in enumerate(zip(self.labels, self.plots)):
             plotid = '%s_%s' % (figid, idx)
             plotdefs.append('var %s = %s;' % (plotid, self.dump_plot(plot)))
-            plotdata.append("{label: '%s', data: %s}" % (label, plotid))
+            # XXX ugly but required in order to not crash my demo
+            plotdata.append("{label: '%s', data: %s}" % (label.replace(u'&', u''), plotid))
         req.html_headers.add_onload(self.onload %
                                     {'plotdefs': '\n'.join(plotdefs),
                                      'figid': figid,