3605: Fix tab param['tab_pane'] merge conflicts causing tests to fail.

diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index d5260e111fa934360f0190722a0dc5a978823a7f..1dec57ca5bfb1e6e509670460f72bacc536f833f 100644 (file)
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -212,8 +212,8 @@ class ApplicationController < ActionController::Base
         render json: @object.attributes.merge(extra_attrs)
       end
       f.html {
-        if params['tab_pane']          
-          render_pane(if params.is_a? Hash then params['tab_pane']["name"] else params['tab_pane'] end)
+        if params['tab_pane']
+          render_pane(if params['tab_pane'].is_a? Hash then params['tab_pane']["name"] else params['tab_pane'] end)
         elsif request.method.in? ['GET', 'HEAD']
           render
         else

diff --git a/apps/workbench/app/views/application/_content.html.erb b/apps/workbench/app/views/application/_content.html.erb
index 65a518faee0a93f36f091497a76c211557388d8c..e37225ce80c6082fe13e40367282f710795508af 100644 (file)
--- a/apps/workbench/app/views/application/_content.html.erb
+++ b/apps/workbench/app/views/application/_content.html.erb
@@ -8,7 +8,7 @@
     <li class="<%= 'active' if i==0 %>">
       <a href="#<%= pane_name %>" data-toggle="tab"
          class="pane-anchor"
-         id="<%= pane %>-tab"
+         id="<%= pane_name %>-tab"
          data-pane-content-url="<%= url_for(params.merge(tab_pane: pane)) %>">
         <%= pane_name.gsub('_', ' ') %> <span id="<%= pane_name %>-count"></span>
       </a>