Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
RDMS
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
researchdata
RDMS
Commits
05b16f10
Commit
05b16f10
authored
1 year ago
by
Gyan Gupta
Browse files
Options
Downloads
Patches
Plain Diff
made some changes
parent
2b27f39d
Branches
fix_bug/270-display-published-works-in-published-tab
No related tags found
1 merge request
!270
Added tabs for Archive and Tombstoned
Pipeline
#12621
failed
1 year ago
Stage: build
Stage: test
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
hyrax/app/controllers/hyrax/admin/workflows_controller.rb
+6
-2
6 additions, 2 deletions
hyrax/app/controllers/hyrax/admin/workflows_controller.rb
hyrax/app/views/hyrax/admin/workflows/index.html.erb
+2
-2
2 additions, 2 deletions
hyrax/app/views/hyrax/admin/workflows/index.html.erb
with
8 additions
and
4 deletions
hyrax/app/controllers/hyrax/admin/workflows_controller.rb
+
6
−
2
View file @
05b16f10
...
...
@@ -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
=
a
cti
onable_objects
.
select
(
&
:
published
?
)
@status_list
=
actionable_objects
.
reject
(
&
:published?
)
.
select
{
|
object
|
under_review?
(
object
.
workflow_state
)
}
@published_list
=
A
cti
veFedora
::
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
This diff is collapsed.
Click to expand it.
hyrax/app/views/hyrax/admin/workflows/index.html.erb
+
2
−
2
View file @
05b16f10
...
...
@@ -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
%>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment