projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix nil dereference causing a fiddlesticks on the collections index page. no issue #
[arvados.git]
/
apps
/
workbench
/
app
/
views
/
application
/
_content.html.erb
diff --git
a/apps/workbench/app/views/application/_content.html.erb
b/apps/workbench/app/views/application/_content.html.erb
index 776787b416e97e4490dcc7171f135ba3cd9b6acd..437975831a99de6edfd2ce41cc53ad5ed0bee40b 100644
(file)
--- a/
apps/workbench/app/views/application/_content.html.erb
+++ b/
apps/workbench/app/views/application/_content.html.erb
@@
-4,7
+4,7
@@
<ul class="nav nav-tabs">
<% pane_list.each_with_index do |pane, i| %>
<ul class="nav nav-tabs">
<% pane_list.each_with_index do |pane, i| %>
- <li class="<%= 'active' if i==0 %>"><a href="#<%= pane %>" data-toggle="tab" id="<%= pane %>-tab" data-pane-content-url="<%= url_for(
tab_pane: pane
) %>"> <%= pane.gsub('_', ' ') %></a></li>
+ <li class="<%= 'active' if i==0 %>"><a href="#<%= pane %>" data-toggle="tab" id="<%= pane %>-tab" data-pane-content-url="<%= url_for(
params.merge(tab_pane: pane)
) %>"> <%= pane.gsub('_', ' ') %></a></li>
<% end %>
</ul>
<div class="tab-content">
<% end %>
</ul>
<div class="tab-content">
@@
-21,8
+21,7
@@
<div id="<%= pane %>-scroll" style="margin-top:0.5em;">
<div class="pane-content">
<% if i == 0 %>
<div id="<%= pane %>-scroll" style="margin-top:0.5em;">
<div class="pane-content">
<% if i == 0 %>
- <%= render(partial: 'show_' + pane.downcase,
- locals: { comparable: comparable, objects: @objects }) %>
+ <%= render_pane pane, to_string: true %>
<% else %>
<div class="spinner spinner-32px spinner-h-center"></div>
<% end %>
<% else %>
<div class="spinner spinner-32px spinner-h-center"></div>
<% end %>