opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-28 02:58:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Charts to_json_string/dumps swap.

Browse Source
This commit is contained in:
Dannon Baker
2014-09-08 17:11:18 -04:00
parent 21eb0edea3
commit 3125e5fa09
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/plugins/visualizations/charts/templates/charts.mako
+2 -2
View File
@@ -86,8 +86,8 @@
require(['plugin/app'], function(App) {
// load options
var options = {
id : ${h.to_json_string( visualization_id )} || undefined,
config : ${h.to_json_string( config )}
id : ${h.dumps( visualization_id )} || undefined,
config : ${h.dumps( config )}
}
// create application
config/plugins/visualizations/common/templates/config_utils.mako
+1 -1
View File
@@ -36,7 +36,7 @@
'action' : 'saved',
'type' : visualization_name,
'title' : title,
'config' : h.to_json_string( config )
'config' : h.dumps( config )
}
# save to existing visualization
if visualization_id:
config/plugins/visualizations/scatterplot/templates/scatterplot.mako
+6 -6
View File
@@ -50,11 +50,11 @@ ${h.javascript_link( root + 'plugins/visualizations/scatterplot/static/scatterpl
<script type="text/javascript">
$(function(){
var model = new ScatterplotModel({
id : ${h.to_json_string( visualization_id )} || undefined,
id : ${h.dumps( visualization_id )} || undefined,
title : "${title}",
config : ${h.to_json_string( config, indent=2 )}
config : ${h.dumps( config, indent=2 )}
});
hdaJson = ${h.to_json_string( trans.security.encode_dict_ids( hda.to_dict() ), indent=2 )},
hdaJson = ${h.dumps( trans.security.encode_dict_ids( hda.to_dict() ), indent=2 )},
display = new ScatterplotDisplay({
el : $( '.scatterplot-display' ).attr( 'id', 'scatterplot-display-' + '${visualization_id}' ),
model : model,
@@ -78,11 +78,11 @@ $(function(){
<script type="text/javascript">
$(function(){
var model = new ScatterplotModel({
id : ${h.to_json_string( visualization_id )} || undefined,
id : ${h.dumps( visualization_id )} || undefined,
title : "${title or default_title}",
config : ${h.to_json_string( config, indent=2 )}
config : ${h.dumps( config, indent=2 )}
}),
hdaJson = ${h.to_json_string( trans.security.encode_dict_ids( hda.to_dict() ), indent=2 )},
hdaJson = ${h.dumps( trans.security.encode_dict_ids( hda.to_dict() ), indent=2 )},
editor = new ScatterplotConfigEditor({
el : $( '.scatterplot-editor' ).attr( 'id', 'scatterplot-editor-hda-' + hdaJson.id ),
model : model,