6064: rollback cache update so that it can be done in a separate branch.

diff --git a/apps/workbench/app/models/arvados_base.rb b/apps/workbench/app/models/arvados_base.rb
index 4b0a6cf3d03ab8b8f4d8c82e1dda22acb9116244..2fca11ecf13f75fb1b5a3838659da64665d40fbf 100644 (file)
--- a/apps/workbench/app/models/arvados_base.rb
+++ b/apps/workbench/app/models/arvados_base.rb
@@ -102,7 +102,7 @@ class ArvadosBase < ActiveRecord::Base
     # Only do one lookup on the API side per {class, uuid, workbench
     # request} unless {cache: false} is given via opts.
     cache_key = "request_#{Thread.current.object_id}_#{self.to_s}_#{uuid}"
-    if false != opts[:cache]
+    if opts[:cache] == false
       Rails.cache.write cache_key, arvados_api_client.api(self, '/' + uuid)
     end
     hash = Rails.cache.fetch cache_key do

diff --git a/apps/workbench/app/views/collections/_show_source_summary.html.erb b/apps/workbench/app/views/collections/_show_source_summary.html.erb
index 1d15c96d8d9a306aa5fe712dd65592c984539431..ddcdc12343f4b9b3c3ad9480249194eaa0793d76 100644 (file)
--- a/apps/workbench/app/views/collections/_show_source_summary.html.erb
+++ b/apps/workbench/app/views/collections/_show_source_summary.html.erb
@@ -32,7 +32,7 @@
 <% if @log_of.andand.any? %>
   <p><i>This collection contains log messages from:</i><br />
     <%= render_arvados_object_list_start(@log_of, 'Show all jobs',
-                                         jobs_path(filters: [['log', '=', @object.uuid]].to_json)) do |job| %>
+                                         jobs_path(filters: [['log', '=', @object.portable_data_hash]].to_json)) do |job| %>
       <%= link_to_if_arvados_object(job, friendly_name: true) %><br />
     <% end %>
   </p>