1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/0470feeb593f/ Changeset: 0470feeb593f User: dan Date: 2013-08-31 00:06:52 Summary: Fixes for dictify to to_dict change. Affected #: 8 files diff -r c59cc42b279385f0d351d31f919d29bb7c012877 -r 0470feeb593f9797fa9fd19dfdac4751a7ca788b config/plugins/visualizations/scatterplot/templates/scatterplot.mako --- a/config/plugins/visualizations/scatterplot/templates/scatterplot.mako +++ b/config/plugins/visualizations/scatterplot/templates/scatterplot.mako @@ -41,7 +41,7 @@ <script type="text/javascript"> $(function(){ - var hda = ${h.to_json_string( trans.security.encode_dict_ids( hda.dictify() ) )}, + var hda = ${h.to_json_string( trans.security.encode_dict_ids( hda.to_dict() ) )}, querySettings = ${h.to_json_string( query_args )}, chartConfig = _.extend( querySettings, { containerSelector : '#chart', diff -r c59cc42b279385f0d351d31f919d29bb7c012877 -r 0470feeb593f9797fa9fd19dfdac4751a7ca788b templates/webapps/galaxy/base_panels.mako --- a/templates/webapps/galaxy/base_panels.mako +++ b/templates/webapps/galaxy/base_panels.mako @@ -16,7 +16,7 @@ """Bootstrapping user API JSON""" #TODO: move into common location (poss. BaseController) if trans.user: - user_dict = trans.user.dictify( view='element', value_mapper={ 'id': trans.security.encode_id, + user_dict = trans.user.to_dict( view='element', value_mapper={ 'id': trans.security.encode_id, 'total_disk_usage': float } ) user_dict['quota_percent'] = trans.app.quota_agent.get_percent( trans=trans ) else: diff -r c59cc42b279385f0d351d31f919d29bb7c012877 -r 0470feeb593f9797fa9fd19dfdac4751a7ca788b templates/webapps/galaxy/dataset/display.mako --- a/templates/webapps/galaxy/dataset/display.mako +++ b/templates/webapps/galaxy/dataset/display.mako @@ -20,7 +20,7 @@ require(['mvc/data'], function(data) { data.createTabularDatasetChunkedView( // Dataset config. TODO: encode id. - _.extend( ${h.to_json_string( item.dictify() )}, + _.extend( ${h.to_json_string( item.to_dict() )}, { chunk_url: "${h.url_for( controller='/dataset', action='display', dataset_id=trans.security.encode_id( item.id ))}", diff -r c59cc42b279385f0d351d31f919d29bb7c012877 -r 0470feeb593f9797fa9fd19dfdac4751a7ca788b templates/webapps/galaxy/dataset/tabular_chunked.mako --- a/templates/webapps/galaxy/dataset/tabular_chunked.mako +++ b/templates/webapps/galaxy/dataset/tabular_chunked.mako @@ -19,7 +19,7 @@ require(['mvc/data'], function(data) { data.createTabularDatasetChunkedView( - _.extend( ${h.to_json_string( trans.security.encode_dict_ids( dataset.dictify() ) )}, + _.extend( ${h.to_json_string( trans.security.encode_dict_ids( dataset.to_dict() ) )}, { url_viz: "${h.url_for( controller='/visualization')}", chunk_url: "${h.url_for( controller='/dataset', action='display', diff -r c59cc42b279385f0d351d31f919d29bb7c012877 -r 0470feeb593f9797fa9fd19dfdac4751a7ca788b templates/webapps/galaxy/galaxy.masthead.mako --- a/templates/webapps/galaxy/galaxy.masthead.mako +++ b/templates/webapps/galaxy/galaxy.masthead.mako @@ -4,7 +4,7 @@ """Bootstrapping user API JSON""" #TODO: move into common location (poss. BaseController) if trans.user: - user_dict = trans.user.dictify( view='element', value_mapper={ 'id': trans.security.encode_id, + user_dict = trans.user.to_dict( view='element', value_mapper={ 'id': trans.security.encode_id, 'total_disk_usage': float } ) user_dict['quota_percent'] = trans.app.quota_agent.get_percent( trans=trans ) else: diff -r c59cc42b279385f0d351d31f919d29bb7c012877 -r 0470feeb593f9797fa9fd19dfdac4751a7ca788b templates/webapps/galaxy/root/tool_menu.mako --- a/templates/webapps/galaxy/root/tool_menu.mako +++ b/templates/webapps/galaxy/root/tool_menu.mako @@ -25,12 +25,12 @@ hidden: false }), tools = new tools_mod.ToolCollection( - ${ h.to_json_string( trans.app.toolbox.dictify( trans, in_panel=False ) ) } + ${ h.to_json_string( trans.app.toolbox.to_dict( trans, in_panel=False ) ) } ), tool_panel = new tools_mod.ToolPanel({ tool_search: tool_search, tools: tools, - layout: ${h.to_json_string( trans.app.toolbox.dictify( trans ) )} + layout: ${h.to_json_string( trans.app.toolbox.to_dict( trans ) )} }), tool_panel_view = new tools_mod.ToolPanelView({ model: tool_panel }); diff -r c59cc42b279385f0d351d31f919d29bb7c012877 -r 0470feeb593f9797fa9fd19dfdac4751a7ca788b templates/webapps/galaxy/visualization/scatterplot.mako --- a/templates/webapps/galaxy/visualization/scatterplot.mako +++ b/templates/webapps/galaxy/visualization/scatterplot.mako @@ -222,7 +222,7 @@ <script type="text/javascript"> $(function(){ - var hda = ${h.to_json_string( trans.security.encode_dict_ids( hda.dictify() ) )}, + var hda = ${h.to_json_string( trans.security.encode_dict_ids( hda.to_dict() ) )}, querySettings = ${h.to_json_string( query_args )}, chartConfig = _.extend( querySettings, { containerSelector : '#chart', diff -r c59cc42b279385f0d351d31f919d29bb7c012877 -r 0470feeb593f9797fa9fd19dfdac4751a7ca788b templates/webapps/galaxy/visualization/v_fwork_test.mako --- a/templates/webapps/galaxy/visualization/v_fwork_test.mako +++ b/templates/webapps/galaxy/visualization/v_fwork_test.mako @@ -19,7 +19,7 @@ <%def name="process_hda( hda )"><% - hda_dict = hda.dictify() + hda_dict = hda.to_dict() hda_dict[ 'id' ] = trans.security.encode_id( hda_dict[ 'id' ] ) hda_dict[ 'history_id' ] = trans.security.encode_id( hda_dict[ 'history_id' ] ) del hda_dict[ 'peek' ] Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.