[ARVADOS] updated: 77d9504c4a5328ce47535e8c6692cb718add1a20

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/views/users/_tables.html.erb |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

       via  77d9504c4a5328ce47535e8c6692cb718add1a20 (commit)
       via  ac5d05f71b5907ad65ba06ae840935c9389315b0 (commit)
      from  60cb933e17126bee490c86e100a28c96323f54f2 (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 77d9504c4a5328ce47535e8c6692cb718add1a20
Merge: ac5d05f 60cb933
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Jan 15 12:16:41 2014 -0500

    Merge branch 'master' of git.clinicalfuture.com:arvados
    
    # Please enter a commit message to explain why this merge is necessary,
    # especially if it merges an updated upstream into a topic branch.
    #
    # Lines starting with '#' will be ignored, and an empty message aborts
    # the commit.


commit ac5d05f71b5907ad65ba06ae840935c9389315b0
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Wed Jan 15 12:16:11 2014 -0500

    Story 1879 "log" link on dashboard links directly to log file.

diff --git a/apps/workbench/app/views/users/_tables.html.erb b/apps/workbench/app/views/users/_tables.html.erb
index bcbf3d7..36d63f7 100644
--- a/apps/workbench/app/views/users/_tables.html.erb
+++ b/apps/workbench/app/views/users/_tables.html.erb
@@ -35,8 +35,8 @@
 		<% if j.success %>
 
 		  <a href="<%= collection_path(j.output) %>">
-		    <% Collection.limit(1).where(uuid: j.output).each do |c|
-			 c.files.each do |file| %>
+		    <% Collection.limit(1).where(uuid: j.output).each do |c| %>
+			 <% c.files.each do |file| %>
 		      <%= file[0] == '.' ? file[1] : "#{file[0]}/#{file[1]}" %>
 		    <% end %>
 		<% end %>
@@ -49,7 +49,11 @@
 <td>
   <small>
     <% if j.log %>
-      <a href="<%= collection_path(j.log) %>">Log</a>
+      <% Collection.limit(1).where(uuid: j.log).each do |c| %>
+        <% c.files.each do |file| %>
+          <a href="<%= collection_path(j.log) %>/<%= file[1] %>?disposition=inline&size=<%= file[2] %>">Log</a>
+        <% end %>
+      <% end %>
     <% end %>
   </small>
 </td>

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


hooks/post-receive
--