details: http://www.bx.psu.edu/hg/galaxy/rev/736b4ebcd9db changeset: 2984:736b4ebcd9db user: jeremy goecks <jeremy.goecks@emory.edu> date: Mon Nov 09 12:21:32 2009 -0500 description: enable history renaming functionality to handle unicode strings. diffstat: lib/galaxy/web/controllers/history.py | 6 +++--- templates/history/rename.mako | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diffs (46 lines): diff -r 144abb3b14bc -r 736b4ebcd9db lib/galaxy/web/controllers/history.py --- a/lib/galaxy/web/controllers/history.py Sat Nov 07 10:30:20 2009 -0500 +++ b/lib/galaxy/web/controllers/history.py Mon Nov 09 12:21:32 2009 -0500 @@ -106,7 +106,7 @@ 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 @@ 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 -r 144abb3b14bc -r 736b4ebcd9db templates/history/rename.mako --- a/templates/history/rename.mako Sat Nov 07 10:30:20 2009 -0500 +++ b/templates/history/rename.mako Mon Nov 09 12:21:32 2009 -0500 @@ -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