SciPost Code Repository
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
SciPost
Manage
Activity
Members
Labels
Plan
Issues
118
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SciPost
SciPost
Commits
feeb646d
Commit
feeb646d
authored
8 months ago
by
George Katsikas
Browse files
Options
Downloads
Patches
Plain Diff
warn of unvetted objects in earlier editorial page
parent
3660b182
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
scipost_django/submissions/managers/submission.py
+23
-0
23 additions, 0 deletions
scipost_django/submissions/managers/submission.py
scipost_django/submissions/templates/submissions/pool/editorial_page.html
+18
-2
18 additions, 2 deletions
...ubmissions/templates/submissions/pool/editorial_page.html
with
41 additions
and
2 deletions
scipost_django/submissions/managers/submission.py
+
23
−
0
View file @
feeb646d
...
@@ -5,8 +5,11 @@ __license__ = "AGPL v3"
...
@@ -5,8 +5,11 @@ __license__ = "AGPL v3"
import
datetime
import
datetime
from
django.db
import
models
from
django.db
import
models
from
django.db.models
import
Q
from
django.utils
import
timezone
from
django.utils
import
timezone
from
comments.models
import
Comment
from
..
import
constants
from
..
import
constants
from
typing
import
TYPE_CHECKING
from
typing
import
TYPE_CHECKING
...
@@ -397,6 +400,26 @@ class SubmissionQuerySet(models.QuerySet):
...
@@ -397,6 +400,26 @@ class SubmissionQuerySet(models.QuerySet):
.
exclude
(
has_qualification
=
True
,
has_readiness
=
True
,
has_clearance
=
True
)
.
exclude
(
has_qualification
=
True
,
has_readiness
=
True
,
has_clearance
=
True
)
)
)
def
comments_set_complete
(
self
):
"""
Return Comments on Submissions, Reports and other Comments.
"""
qs
=
Comment
.
objects
.
filter
(
Q
(
submissions__in
=
self
)
|
Q
(
reports__submission__in
=
self
)
|
Q
(
comments__reports__submission__in
=
self
)
|
Q
(
comments__submissions__in
=
self
)
)
# Add recursive comments:
for
c
in
qs
:
if
c
.
nested_comments
:
qs
=
qs
|
c
.
all_nested_comments
().
all
()
return
qs
.
distinct
()
def
reports
(
self
):
"""
Return all Reports for Submissions.
"""
from
submissions.models
import
Report
return
Report
.
objects
.
filter
(
submission__in
=
self
)
class
SubmissionEventQuerySet
(
models
.
QuerySet
):
class
SubmissionEventQuerySet
(
models
.
QuerySet
):
def
for_edadmin
(
self
):
def
for_edadmin
(
self
):
...
...
This diff is collapsed.
Click to expand it.
scipost_django/submissions/templates/submissions/pool/editorial_page.html
+
18
−
2
View file @
feeb646d
...
@@ -373,7 +373,15 @@ container border border-warning border-3
...
@@ -373,7 +373,15 @@ container border border-warning border-3
</ul>
</ul>
</li>
</li>
{% else %}
{% else %}
<li>
All Reports have been vetted.
</li>
{% with submission.other_versions.reports.awaiting_vetting as other_reports %}
<li>
All Reports on this version have been vetted.
{% if other_reports %}
<span
class=
"text-warning ms-1"
>
{% include "bi/exclamation-triangle-fill.html" %}
</span>
There {{ other_reports|pluralize:"is,are" }} still {{ other_reports.count }}
Report{{ other_reports|pluralize }} awaiting vetting on other versions.
{% endif %}
</li>
{% endwith %}
{% endif %}
{% endif %}
{% endwith %}
{% endwith %}
...
@@ -388,7 +396,15 @@ container border border-warning border-3
...
@@ -388,7 +396,15 @@ container border border-warning border-3
</ul>
</ul>
</li>
</li>
{% else %}
{% else %}
<li>
All Comments have been vetted.
</li>
{% with submission.other_versions.comments_set_complete.awaiting_vetting as other_comments %}
<li>
All Comments on this version have been vetted.
{% if other_comments %}
<span
class=
"text-warning ms-1"
>
{% include "bi/exclamation-triangle-fill.html" %}
</span>
There {{ other_comments|pluralize:"is,are" }} still {{ other_comments.count }}
Comment{{ other_comments|pluralize }} awaiting vetting on other versions.
{% endif %}
</li>
{% endwith %}
{% endif %}
{% endif %}
{% endwith %}
{% endwith %}
{% if submission.eic_recommendation_required %}
{% if submission.eic_recommendation_required %}
...
...
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