3531: Pass through tab_pane to reused partials, so element IDs are really unique

across tabs.

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index d47242224622931c7060016b810f5302b96663a4..10a1de8d4f3ea212bd7ce5436025bf0dd44b6c50 100644 (file)
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -131,8 +131,8 @@ class ApplicationController < ActionController::Base
     respond_to do |f|
       f.json { render json: @objects }
       f.html {
-        if params['tab_pane']
-          render_pane params['tab_pane']
+        if params[:tab_pane]
+          render_pane params[:tab_pane]
         else
           render
         end

diff --git a/apps/workbench/app/views/projects/_show_data_collections.html.erb b/apps/workbench/app/views/projects/_show_data_collections.html.erb
index cd4728e775f00b4fe4c3f9517269366480daa60f..e56321dde8a55b4137e082882b8afe77244d7e80 100644 (file)
--- a/apps/workbench/app/views/projects/_show_data_collections.html.erb
+++ b/apps/workbench/app/views/projects/_show_data_collections.html.erb
@@ -1,3 +1,3 @@
 <%= render_pane 'tab_contents', to_string: true, locals: {
     filters: [['uuid', 'is_a', "arvados#collection"]]
-    } %>
+    }.merge(local_assigns) %>

diff --git a/apps/workbench/app/views/projects/_show_jobs_and_pipelines.html.erb b/apps/workbench/app/views/projects/_show_jobs_and_pipelines.html.erb
index 02a84c35b8536ddc8565a7937a9404f5637db9ad..df31fec8ee0bf19df7058fa358d0330636d06798 100644 (file)
--- a/apps/workbench/app/views/projects/_show_jobs_and_pipelines.html.erb
+++ b/apps/workbench/app/views/projects/_show_jobs_and_pipelines.html.erb
@@ -1,3 +1,3 @@
 <%= render_pane 'tab_contents', to_string: true, locals: {
     filters: [['uuid', 'is_a', ["arvados#job", "arvados#pipelineInstance"]]]
-    } %>
+    }.merge(local_assigns) %>

diff --git a/apps/workbench/app/views/projects/_show_other_objects.html.erb b/apps/workbench/app/views/projects/_show_other_objects.html.erb
index f0da35dd185373a36406e138af2b38dea24f2299..af6fbd1a92ab9b5049e64d635741f4295e7a46a5 100644 (file)
--- a/apps/workbench/app/views/projects/_show_other_objects.html.erb
+++ b/apps/workbench/app/views/projects/_show_other_objects.html.erb
@@ -1,3 +1,3 @@
 <%= render_pane 'tab_contents', to_string: true, locals: {
     filters: [['uuid', 'is_a', ["arvados#human", "arvados#specimen", "arvados#trait"]]]
-    } %>
+    }.merge(local_assigns) %>

diff --git a/apps/workbench/app/views/projects/_show_pipeline_templates.html.erb b/apps/workbench/app/views/projects/_show_pipeline_templates.html.erb
index df2d6b6996eece0309fc05c05faeeb39c6b28b4e..b875b086ec3e1528a1a29fb35df40ba1b239dd7c 100644 (file)
--- a/apps/workbench/app/views/projects/_show_pipeline_templates.html.erb
+++ b/apps/workbench/app/views/projects/_show_pipeline_templates.html.erb
@@ -1,3 +1,3 @@
 <%= render_pane 'tab_contents', to_string: true, locals: {
     filters: [['uuid', 'is_a', ["arvados#pipelineTemplate"]]]
-    } %>
+    }.merge(local_assigns) %>

diff --git a/apps/workbench/app/views/projects/_show_subprojects.html.erb b/apps/workbench/app/views/projects/_show_subprojects.html.erb
index 2aa236437e8fc10a77e64ef9e29d321a066289d1..2c0ba6017831b5cab5c2361a98aa5a49ed9f1e1a 100644 (file)
--- a/apps/workbench/app/views/projects/_show_subprojects.html.erb
+++ b/apps/workbench/app/views/projects/_show_subprojects.html.erb
@@ -1,3 +1,3 @@
 <%= render_pane 'tab_contents', to_string: true, locals: {
     filters: [['uuid', 'is_a', ["arvados#group"]]]
-    } %>
+    }.merge(local_assigns) %>