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

Merge pull request #2312 from nsoranzo/release_16.01_fix_makos

Browse Source 
[16.01] Unicodify pretty datetimes which can contain non-ASCII chars
This commit is contained in:
Dannon Baker
2016-05-07 18:11:24 -04:00
parent 41e6f22f33 0f984d3bfd
commit 79dd8c82f0
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/show_params.mako
+2 -2
View File
@@ -1,6 +1,6 @@
<%inherit file="/base.mako"/>
<%namespace file="/message.mako" import="render_msg" />
<% from galaxy.util import nice_size %>
<% from galaxy.util import nice_size, unicodify %>
<style>
.inherit {
@@ -117,7 +117,7 @@
encoded_history_id = trans.security.encode_id( hda.history_id )
%>
<tr><td>Name:</td><td>${hda.name | h}</td></tr>
<tr><td>Created:</td><td>${hda.create_time.strftime(trans.app.config.pretty_datetime_format)}</td></tr>
<tr><td>Created:</td><td>${unicodify(hda.create_time.strftime(trans.app.config.pretty_datetime_format))}</td></tr>
## <tr><td>Copied from another history?</td><td>${hda.source_library_dataset}</td></tr>
<tr><td>Filesize:</td><td>${nice_size(hda.dataset.file_size)}</td></tr>
<tr><td>Dbkey:</td><td>${hda.dbkey | h}</td></tr>
templates/webapps/galaxy/data_manager/view_job.mako
+2 -2
View File
@@ -1,6 +1,6 @@
<%inherit file="/base.mako"/>
<%namespace file="/message.mako" import="render_msg" />
<% from galaxy.util import nice_size %>
<% from galaxy.util import nice_size, unicodify %>
<%def name="title()">Data Manager: ${ data_manager.name | h } - ${ data_manager.description | h }</%def>
@@ -26,7 +26,7 @@
</thead>
<tbody>
<tr><td>Name:</td><td>${hda.name | h}</td></tr>
<tr><td>Created:</td><td>${hda.create_time.strftime(trans.app.config.pretty_datetime_format) | h}</td></tr>
<tr><td>Created:</td><td>${unicodify(hda.create_time.strftime(trans.app.config.pretty_datetime_format)) | h}</td></tr>
<tr><td>Filesize:</td><td>${nice_size(hda.dataset.file_size) | h}</td></tr>
<tr><td>Tool Exit Code:</td><td>${job.exit_code | h}</td></tr>
<tr><td>Full Path:</td><td>${hda.file_name | h}</td></tr>