Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove in-publication status from ATBD workflow #553

Merged
merged 2 commits into from
Aug 22, 2022
Merged

Remove in-publication status from ATBD workflow #553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4aa930
Remove in-publication status from ATBD workflow
oliverroick Aug 11, 2022
da7e6d5
Merge branch 'develop' into publication-workflow
naomatheus Aug 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 1 addition & 15 deletions app/acls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
"CLOSED_REVIEW_REQUESTED",
"OPEN_REVIEW",
"PUBLICATION_REQUESTED",
"PUBLICATION",
"PUBLISHED",
],
},
Expand Down Expand Up @@ -61,7 +60,6 @@
# "CLOSED_REVIEW_REQUESTED",
# "OPEN_REVIEW",
# "PUBLICATION_REQUESTED",
# "PUBLICATION",
# "PUBLISHED",
# ],
# },
Expand All @@ -75,7 +73,6 @@
"CLOSED_REVIEW_REQUESTED",
"OPEN_REVIEW",
"PUBLICATION_REQUESTED",
"PUBLICATION",
"PUBLISHED",
],
},
Expand All @@ -102,7 +99,6 @@
# "CLOSED_REVIEW_REQUESTED",
# "OPEN_REVIEW",
# "PUBLICATION_REQUESTED",
# "PUBLICATION",
# "PUBLISHED",
# ],
# },
Expand All @@ -116,7 +112,6 @@
"CLOSED_REVIEW_REQUESTED",
"OPEN_REVIEW",
"PUBLICATION_REQUESTED",
"PUBLICATION",
"PUBLISHED",
],
},
Expand Down Expand Up @@ -169,7 +164,6 @@
"CLOSED_REVIEW",
"OPEN_REVIEW",
"PUBLICATION_REQUESTED",
"PUBLICATION",
"PUBLISHED",
],
},
Expand All @@ -189,15 +183,7 @@
},
},
{"action": "open_review", "conditions": {"status": ["CLOSED_REVIEW"]}},
{
"action": "deny_publication_request",
"conditions": {"status": ["PUBLICATION_REQUESTED"]},
},
{
"action": "accept_publication_request",
"conditions": {"status": ["PUBLICATION_REQUESTED"]},
},
{"action": "publish", "conditions": {"status": ["PUBLICATION"]}},
{"action": "publish", "conditions": {"status": ["PUBLICATION_REQUESTED"]}},
],
fastapi_permissions.Everyone: [
{"action": "view", "conditions": {"status": ["PUBLISHED"]}}
Expand Down
9 changes: 0 additions & 9 deletions app/api/v2/events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,15 +327,6 @@ def update_review_status_handler(
"next_status": "OPEN_REVIEW",
"notify": ["curators"],
},
"deny_publication_request": {
"custom_handler": deny_request_with_comment(
next_status="OPEN_REVIEW", notification="deny_publication_request"
),
},
"accept_publication_request": {
"next_status": "PUBLICATION",
"notify": ["owner", "authors", "reviewers"],
},
"publish": {"custom_handler": publish_handler},
"bump_minor_version": {"custom_handler": bump_minor_version_handler},
"update_review_status": {"custom_handler": update_review_status_handler},
Expand Down
10 changes: 1 addition & 9 deletions app/email/email_templates.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,6 @@
"subject": "Publication request cancelled",
"content": "<p>Hi $preferred_username,</p> <p>$app_user has removed their request for publication of the following ATBD version: <a href=\"$atbd_version_link\">$atbd_title, $atbd_version</a>.</p><p>Sincerely,</p><p>The APT Team</p>"
},
"deny_publication_request": {
"subject": "Publication request denied",
"content": "<p>Hi $preferred_username,</p> <p>$app_user ($role) has denied the request for publication of the following ATBD version: <a href=\"$atbd_version_link\">$atbd_title, $atbd_version</a> with this note: $comment.</p><p>Sincerely,</p><p>The APT Team</p>"
},
"accept_publication_request": {
"subject": "Publication request accepted",
"content": "<p>Hi $preferred_username,</p> <p>$app_user ($role) has accepted the request for publication of the following ATBD version: <a href=\"$atbd_version_link\">$atbd_title, $atbd_version</a>!</p><p>Sincerely,</p><p>The APT Team</p>"
},
"publish": {
"subject": "Atbd version published",
"content": "<p>Hi $preferred_username,</p> <p>$app_user ($role) has published the following ATBD version: <a href=\"$atbd_version_link\">$atbd_title, $atbd_version</a>!</p><p>Sincerely,</p><p>The APT Team</p>"
Expand All @@ -75,4 +67,4 @@
"subject": "Thread closed",
"content": "<p>Hi $preferred_username,</p> <p>$app_user ($role) has closed a thread in the following ATBD version: <a href=\"$atbd_version_link\">$atbd_title, $atbd_version</a>, section: $section. </p><p>Sincerely,</p><p>The APT Team</p>"
}
}
}