Fix config parser

galaxyproject · Feb 11, 2018 · 9ae6cb1 · 9ae6cb1
1 parent f2335fe
commit 9ae6cb1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 16 deletions.
diff --git a/client/galaxy/scripts/mvc/visualization/chart/views/menu.js b/client/galaxy/scripts/mvc/visualization/chart/views/menu.js
@@ -90,16 +90,6 @@ export default Backbone.View.extend({
                     window.dispatchEvent(new Event("resize"));
                 }
             }),
-            new Ui.ButtonIcon({
-                icon: "fa-line-chart",
-                tooltip: "Visualize",
-                onclick: () => {
-                    app.chart.set({
-                        date: Utils.time()
-                    });
-                    app.chart.trigger("redraw");
-                }
-            }),
             this.export_button,
             new Ui.ButtonIcon({
                 icon: "fa-save",

diff --git a/client/galaxy/scripts/mvc/visualization/chart/views/viewer.js b/client/galaxy/scripts/mvc/visualization/chart/views/viewer.js
@@ -84,6 +84,7 @@ export default Backbone.View.extend({
     _draw: function(process, chart) {
         var n_panels = chart.settings.get("__use_panels") == "true" ? chart.groups.length : 1;
         this._createContainer(chart.plugin.specs.tag, n_panels);
+        chart.set("date", Utils.time());
         chart.state("wait", "Please wait...");
         this.app.chart_load({ process: process, chart: chart, dataset: this.app.dataset, targets: this.targets });
     }

diff --git a/lib/galaxy/visualization/plugins/config_parser.py b/lib/galaxy/visualization/plugins/config_parser.py
@@ -406,10 +406,10 @@ class ListParser(list):
     def __init__(self, aList):
         for element in aList:
             if len(element) > 0:
-                if len(element) == 1 or element[0].tag != element[1].tag:
-                    self.append(DictParser(element))
-                elif element[0].tag == element[1].tag:
+                if element.tag == element[0].tag:
                     self.append(ListParser(element))
+                else:
+                    self.append(DictParser(element))
             elif element.text:
                 text = element.text.strip()
                 if text:
@@ -426,10 +426,10 @@ def __init__(self, parent_element):
             self.update(dict(parent_element.items()))
         for element in parent_element:
             if len(element) > 0:
-                if len(element) == 1 or element[0].tag != element[1].tag:
-                    aDict = DictParser(element)
-                else:
+                if element.tag == element[0].tag:
                     aDict = ListParser(element)
+                else:
+                    aDict = DictParser(element)
                 if element.items():
                     aDict.update(dict(element.items()))
                 self.update({element.tag: aDict})