Skip to content
Snippets Groups Projects
Commit 05b16f10 authored by Gyan Gupta's avatar Gyan Gupta
Browse files

made some changes

parent 2b27f39d
1 merge request!270Added tabs for Archive and Tombstoned
Pipeline #12621 failed
......@@ -16,8 +16,8 @@ module Hyrax
add_breadcrumb t(:'hyrax.admin.sidebar.tasks'), '#'
add_breadcrumb t(:'hyrax.admin.sidebar.workflow_review'), request.path
@status_list = actionable_objects.reject(&:published?)
@published_list = actionable_objects.select(&:published?)
@status_list = actionable_objects.reject(&:published?).select{|object| under_review?(object.workflow_state) }
@published_list = ActiveFedora::Base.where(workflow_state_name_ssim: 'published')
@archived_list = ActiveFedora::Base.where(workflow_state_name_ssim: 'archived')
@tombstoned_list = ActiveFedora::Base.where(is_tombstoned_ssim: 'true')
end
......@@ -32,5 +32,9 @@ module Hyrax
@actionable_objects ||=
Hyrax::Workflow::ActionableObjects.new(user: current_user)
end
def under_review?(workflow_state)
["pending_review_from_publication_manager","changes_required_from_publication_manager","pending_review_from_crc_manager","changes_required_from_crc_manager","pending_review_from_group_manager","changes_required_from_group_manager"].include?(workflow_state)
end
end
end
\ No newline at end of file
......@@ -76,13 +76,13 @@
<%= link_to document, [main_app, document] %>
</td>
<td>
<%= safe_join(document.creator, tag(:br)) %>
<%= safe_join(document.creator.to_a, tag(:br)) %>
</td>
<td>
<%= document.date_modified %>
</td>
<td>
<span class="state state-pending"><%= document.workflow_state %></span>
<span class="state state-pending">Published</span>
</td>
</tr>
<% end %>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment