opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix config parser

Browse Source
This commit is contained in:
guerler
2018-02-11 14:41:54 -05:00
parent f2335fe461
commit 9ae6cb1c6e
3 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/galaxy/scripts/mvc/visualization/chart/views/menu.js
-10
View File
@@ -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",
client/galaxy/scripts/mvc/visualization/chart/views/viewer.js
+1
View File
@@ -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 });
}
lib/galaxy/visualization/plugins/config_parser.py
+6 -6
View File
@@ -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 @@ class DictParser(dict):
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})