From 907d90dc43f8c71e5afe0db5971f2edbc2917fec Mon Sep 17 00:00:00 2001
From: Jeremy Goecks <jeremy.goecks@emory.edu>
Date: Mon, 9 Nov 2009 12:21:32 -0500
Subject: [PATCH] enable history renaming functionality to handle unicode
 strings.

---
 lib/galaxy/web/controllers/history.py | 6 +++---
 templates/history/rename.mako         | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/galaxy/web/controllers/history.py b/lib/galaxy/web/controllers/history.py
index b3cd3cdc8eb..a7f25fb1613 100644
--- a/lib/galaxy/web/controllers/history.py
+++ b/lib/galaxy/web/controllers/history.py
@@ -106,7 +106,7 @@ class HistoryListGrid( grids.Grid ):
         grids.MulticolFilterColumn(  
         "Search", 
         cols_to_filter=[ columns[0], columns[2] ], 
-        key="free-text-search", visible=False, filterable="default" )
+        key="free-text-search", visible=False, filterable="standard" )
                 )
                 
     operations = [
@@ -807,13 +807,13 @@ class HistoryController( BaseController ):
             history = get_history( trans, history_id )
             if history and history.user_id == user.id:
                 histories.append( history )
-                cur_names.append( history.name )
+                cur_names.append( history.get_display_name() )
         if not name or len( histories ) != len( name ):
             return trans.fill_template( "/history/rename.mako", histories=histories )
         change_msg = ""
         for i in range(len(histories)):
             if histories[i].user_id == user.id:
-                if name[i] == histories[i].name:
+                if name[i] == histories[i].get_display_name():
                     change_msg = change_msg + "<p>History: "+cur_names[i]+" is already named: "+name[i]+"</p>"
                 elif name[i] not in [None,'',' ']:
                     name[i] = escape(name[i])
diff --git a/templates/history/rename.mako b/templates/history/rename.mako
index 9736fca3169..2e1da8db956 100644
--- a/templates/history/rename.mako
+++ b/templates/history/rename.mako
@@ -18,11 +18,11 @@
                 %for history in histories:
                     <tr>
                         <td>
-                            <input type="hidden" name="id" value="${trans.security.encode_id( history.id )}">      
-                            ${history.name}
+                            <input type="hidden" name="id" value="${trans.security.encode_id( history.id )}">
+                            ${history.get_display_name()}
                         </td>
                         <td>
-                            <input type="text" name="name" value="${history.name}" size="40">
+                            <input type="text" name="name" value="${history.get_display_name()}" size="40">
                         </td>
                     </tr>
                 %endfor