[ARVADOS] updated: 5cf53c5f133040aa21ebfb4e7687e8759cfea636

git at public.curoverse.com git at public.curoverse.com
Mon Jan 6 18:08:18 EST 2014


Summary of changes:
 .../app/views/user_agreements/index.html.erb       |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

       via  5cf53c5f133040aa21ebfb4e7687e8759cfea636 (commit)
      from  7546b1b3ffb7ef649333c04c58eec6cdb7dd7ddd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 5cf53c5f133040aa21ebfb4e7687e8759cfea636
Author: Tom Clegg <tom at curoverse.com>
Date:   Mon Jan 6 15:04:50 2014 -0800

    Fix mime-type lookup.
    
    refs #1813

diff --git a/apps/workbench/app/views/user_agreements/index.html.erb b/apps/workbench/app/views/user_agreements/index.html.erb
index 6cad423..53a37a2 100644
--- a/apps/workbench/app/views/user_agreements/index.html.erb
+++ b/apps/workbench/app/views/user_agreements/index.html.erb
@@ -23,7 +23,7 @@
   <div class="modal-body">
     <% if n_files == 1 %>
       <% ua = @required_user_agreements.first; file = ua.files.first %>
-      <object data="<%= url_for(controller: 'collections', action: 'show_file', uuid: ua.uuid, file: "#{file[0]}/#{file[1]}") %>" type="<%= Rack::Mime::MIME_TYPES[file[1]] || 'application/pdf' %>" width="100%" height="400px">
+      <object data="<%= url_for(controller: 'collections', action: 'show_file', uuid: ua.uuid, file: "#{file[0]}/#{file[1]}") %>" type="<%= Rack::Mime::MIME_TYPES[file[1].match(/\.\w+$/)[0]] rescue '' %>" width="100%" height="400px">
       </object>
     <% end %>
     <div class="alert alert-info">

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list