diff --git a/app/views/assets/_batch_asset_selection.html.erb b/app/views/assets/_batch_asset_selection.html.erb index 88485bd4c7..3f34a53470 100644 --- a/app/views/assets/_batch_asset_selection.html.erb +++ b/app/views/assets/_batch_asset_selection.html.erb @@ -10,6 +10,7 @@ text: "your items", select_deselect_all: true, collapse_expand: true, + show_hide_blocked: publishing, show_hide_permissions: show_permissions } %> @@ -34,6 +35,7 @@
<%= render partial: 'assets/batch_selection/buttons', locals: { text: (text_for_resource items.first).downcase.pluralize, + show_hide_blocked: publishing, select_deselect_all: true } %> <% items.each do |item| %> @@ -57,6 +59,7 @@
<%= render partial: 'assets/batch_selection/buttons', locals: { text: "items not in ISA", + show_hide_blocked: publishing, select_deselect_all: true } %> <% @assets_not_in_isa.each do |item| %> diff --git a/app/views/assets/publishing/publish_related_items.html.erb b/app/views/assets/publishing/publish_related_items.html.erb index 4685cebdd1..bb17deaf04 100644 --- a/app/views/assets/publishing/publish_related_items.html.erb +++ b/app/views/assets/publishing/publish_related_items.html.erb @@ -12,21 +12,31 @@
<%= form_tag({action: :check_gatekeeper_required}, method: :post) do %> - <% @items_for_publishing.each do |item| %> - <% if item.contains_publishable_items? %> - <% if item.is_asset? %> - <%= render partial: "assets/batch_selection/asset_row", - collection: item.assays.map(&:study).map(&:investigation).flatten.uniq, - locals: { preselected: item, publishing: true, show_permissions: true, show_children: true } %> - <% else %> - <%= render partial: "assets/batch_selection/asset_row", object: item, - locals: { preselected: item, publishing: true, show_permissions: true, show_children: true } %> +
+ <%= render partial: 'assets/batch_selection/buttons', locals: { + text: "your items", + select_deselect_all: true, + collapse_expand: true, + show_hide_blocked: true, + show_hide_permissions: true + } %> +
+ <% @items_for_publishing.each do |item| %> + <% if item.contains_publishable_items? %> + <% if item.is_asset? %> + <%= render partial: "assets/batch_selection/asset_row", + collection: item.assays.map(&:study).map(&:investigation).flatten.uniq, + locals: { preselected: item, publishing: true, show_permissions: true, show_children: true } %> + <% else %> + <%= render partial: "assets/batch_selection/asset_row", object: item, + locals: { preselected: item, publishing: true, show_permissions: true, show_children: true } %> + <% end %> + <% else %> + <%= check_box_tag publishing_item_param(item), 1, true, {style: 'display:none;'} %> + <% end %> <% end %> - <% else %> - <%= check_box_tag publishing_item_param(item), 1, true, {style: 'display:none;'} %> - <% end %> - <% end %> - +
+
<% resource = (controller_name == 'people') ? current_user.person : @asset %> <%= submit_tag "Next",data: { disable_with: 'Next' }, class: 'btn btn-primary' -%>