From 78dbe4b9137213a878de8ccd30194b50394c86be Mon Sep 17 00:00:00 2001
From: Daniel Blankenberg <dan@bx.psu.edu>
Date: Fri, 30 Aug 2013 18:06:52 -0400
Subject: [PATCH] Fixes for dictify to to_dict change.

---
 .../visualizations/scatterplot/templates/scatterplot.mako     | 2 +-
 templates/webapps/galaxy/base_panels.mako                     | 2 +-
 templates/webapps/galaxy/dataset/display.mako                 | 2 +-
 templates/webapps/galaxy/dataset/tabular_chunked.mako         | 2 +-
 templates/webapps/galaxy/galaxy.masthead.mako                 | 2 +-
 templates/webapps/galaxy/root/tool_menu.mako                  | 4 ++--
 templates/webapps/galaxy/visualization/scatterplot.mako       | 2 +-
 templates/webapps/galaxy/visualization/v_fwork_test.mako      | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/config/plugins/visualizations/scatterplot/templates/scatterplot.mako b/config/plugins/visualizations/scatterplot/templates/scatterplot.mako
index 821427a8e17..9cd2920a34a 100644
--- 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 --git a/templates/webapps/galaxy/base_panels.mako b/templates/webapps/galaxy/base_panels.mako
index dc8e16fce89..9d82f517934 100644
--- a/templates/webapps/galaxy/base_panels.mako
+++ b/templates/webapps/galaxy/base_panels.mako
@@ -16,7 +16,7 @@ ${h.js( "mvc/base-mvc", "mvc/user/user-model", "mvc/user/user-quotameter" )}
     """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 --git a/templates/webapps/galaxy/dataset/display.mako b/templates/webapps/galaxy/dataset/display.mako
index fbb8f40353a..091ad3ca0a7 100644
--- 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 --git a/templates/webapps/galaxy/dataset/tabular_chunked.mako b/templates/webapps/galaxy/dataset/tabular_chunked.mako
index 125e573e6d0..5989f56ca35 100644
--- 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 --git a/templates/webapps/galaxy/galaxy.masthead.mako b/templates/webapps/galaxy/galaxy.masthead.mako
index f16b6ef9366..18b55224f30 100644
--- 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 --git a/templates/webapps/galaxy/root/tool_menu.mako b/templates/webapps/galaxy/root/tool_menu.mako
index 08aa7057d89..4dfe51a74a8 100644
--- 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 --git a/templates/webapps/galaxy/visualization/scatterplot.mako b/templates/webapps/galaxy/visualization/scatterplot.mako
index 8d3507e83a2..92138d9467f 100644
--- a/templates/webapps/galaxy/visualization/scatterplot.mako
+++ b/templates/webapps/galaxy/visualization/scatterplot.mako
@@ -222,7 +222,7 @@ ${h.js(
 <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 --git a/templates/webapps/galaxy/visualization/v_fwork_test.mako b/templates/webapps/galaxy/visualization/v_fwork_test.mako
index 20cf07e7d0b..4cf0b79620d 100644
--- a/templates/webapps/galaxy/visualization/v_fwork_test.mako
+++ b/templates/webapps/galaxy/visualization/v_fwork_test.mako
@@ -19,7 +19,7 @@ ${h.css(
 
 <%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' ]