0
0
mirror of https://github.com/wagtail/wagtail.git synced 2024-11-29 17:36:49 +01:00
Commit Graph

10299 Commits

Author SHA1 Message Date
Karl Hobley
e962ad6004 Use latest revision that's relevant to the workflow 2020-07-24 16:59:33 +01:00
Karl Hobley
fdaa99e4f9 Remove a magic-string 2020-07-24 16:59:33 +01:00
Karl Hobley
7bcd10208f Get task number from list inex (instead of Task.sort_order)
This fixes inaccuracies if there are any inactive tasks
2020-07-24 16:59:33 +01:00
Karl Hobley
ab101f3503 Only use WorkflowState's from latest revision when reporting progress
Also, annotate status_display so we don't use slugs
2020-07-24 16:59:33 +01:00
Karl Hobley
8487742df8 Remove unnecessary workflow_name/task_name variables 2020-07-24 16:59:33 +01:00
Karl Hobley
d7b2e06ece Implemented WorkflowState.all_tasks_with_status 2020-07-24 16:59:33 +01:00
jacobtoppm
b2a6274a79 Replace .intersection() uses with id__in filters to avoid failure on MySQL backend 2020-07-24 16:59:33 +01:00
jacobtoppm
0fbc40bd41 Tweak icon alignment in nav to raise icons relative to text by 5%, as previously looked like clipboard icon was misaligned 2020-07-24 16:59:33 +01:00
jacobtoppm
b4ea951ab3 Use new workflow icon in add to page view 2020-07-24 16:59:33 +01:00
jacobtoppm
b10ba56b26 Add new clipboard-list icon and use for workflows. Fix if statement in views/pages to add buttons outside main conditional clauses 2020-07-24 16:59:33 +01:00
jacobtoppm
b01ba985c4 Remove reference to old field on GroupApprovalTask 2020-07-24 16:59:33 +01:00
jacobtoppm
95cb76996d Fix data migration setting of sort order to set 0 rather than 1 2020-07-24 16:59:33 +01:00
jacobtoppm
6ea10a8f1a Include auto_now_add change to started_at in migrations 2020-07-24 16:59:33 +01:00
jacobtoppm
a0818bc49f Get steplen from Page model rather than hardcoding in migration 2020-07-24 16:59:33 +01:00
Karl Hobley
a05063bcdf Fix flake8 issues 2020-07-24 16:59:33 +01:00
Karl Hobley
98b149bea9 Use auto_now_add for TaskState.created_at 2020-07-24 16:59:33 +01:00
Karl Hobley
9f26bf6eac Use auto_now_add for WorkflowState.created_at 2020-07-24 16:59:33 +01:00
jacobtoppm
a203b04c84 Respect 'keep_live' parameter on copy, remove unnecessary kwargs and saving from copy methods 2020-07-24 16:59:33 +01:00
jacobtoppm
ecbb9e6233 Flake8 2020-07-24 16:59:33 +01:00
jacobtoppm
c8edf05612 Fix tests to remove submission tests for old moderation system, and amend where possible 2020-07-24 16:59:33 +01:00
jacobtoppm
4384a19f45 Add old moderation message back for consistency 2020-07-24 16:59:33 +01:00
jacobtoppm
ba0c7f154c Fix order of arguments to remove workflow view/url 2020-07-24 16:59:33 +01:00
jacobtoppm
9c804c3fa3 Remove page manager serialization as would require code changes to managers generated from querysets 2020-07-24 16:59:33 +01:00
jacobtoppm
d74aa6f448 Remove print statement 2020-07-24 16:59:33 +01:00
jacobtoppm
3214ca883e Isort 2020-07-24 16:59:33 +01:00
jacobtoppm
fe1ffe1601 flake8 2020-07-24 16:59:33 +01:00
jacobtoppm
e393721e15 Add old, simpler moderation message if workflow only has one step. Add 'compare with live' button to moderation messages 2020-07-24 16:59:33 +01:00
jacobtoppm
ff7db93325 Add workflow messages only if GET request to avoid double banner bug 2020-07-24 16:59:33 +01:00
jacobtoppm
fc1d857f63 Serialize page manager in migrations, and add a data migration to recreate the site's permission based moderation system in the new workflow system by creating a set of default workflows 2020-07-24 16:59:33 +01:00
jacobtoppm
95367505b8 Add schema migrations for workflow models 2020-07-24 16:59:33 +01:00
jacobtoppm
cf404ec600 Refactor GroupApprovalTask to accept multiple groups, in preparation for migration recreating existing moderation functionality 2020-07-24 16:59:33 +01:00
jacobtoppm
226942b3f1 Isort 2020-07-24 16:59:33 +01:00
Karl Hobley
42de571d7a Fix flake8 errors 2020-07-24 16:59:33 +01:00
jacobtoppm
e8978ad3dd Remove debugger 2020-07-24 16:59:33 +01:00
jacobtoppm
03b6b2f665 Make copy mixin methods work with m2m links with through classes with ParentalKeys: these are now checked for, and left for the copying child objects stage of copying 2020-07-24 16:59:33 +01:00
jacobtm
02a706581e Refactor common copy method mixin from Page and TaskState 2020-07-24 16:59:33 +01:00
jacobtm
0d5c2d6a30 Move removal of triggering user from notification recipients outside if condition 2020-07-24 16:59:33 +01:00
jacobtm
b48c281c8c Re-add safe filter to plain text templates 2020-07-24 16:59:33 +01:00
jacobtm
23ccdb836c Add preview link to actions for dashboard panel, and tidy indentation 2020-07-24 16:59:33 +01:00
jacobtm
4380e4c90e Add workflow pages to moderate dashboard panel 2020-07-24 16:59:33 +01:00
jacobtm
db54d567d6 Add dashboard panel showing pages that the user has submitted for moderation, or that are owned by the user. Add helper function to determine the started_at of a successive run of TaskStates - useful when page has been edited multiple times, so the same task has resumed 2020-07-24 16:59:33 +01:00
jacobtm
007526f77f Only show workflow warning that tasks may need re-approval if WAGTAIL_WORKFLOW_REQUIRE_REAPPROVAL_ON_EDIT=True 2020-07-24 16:59:33 +01:00
jacobtm
3040adccda Remove cached_property decorator. May be worth replacing for efficiency, but was leading to outdated workflow states being updated when a page object was referenced multiple times, which is problematic. Fixed WorkflowState.update method to accept a next_task argument that is the same as the current task without failing. Fix test syntax, and add new tests for copied-forward tasks 2020-07-24 16:59:33 +01:00
jacobtm
8a0b1cb971 Add new setting, WAGTAIL_WORKFLOW_REQUIRE_REAPPROVAL_ON_EDIT, which if False will cause copies of previously approved TaskStates (but with page_revision set to the new revision) on saving a revision. Fix mutable argument in copy. 2020-07-24 16:59:33 +01:00
jacobtm
9cbe66fba6 Add a copy method to TaskState, and add a kwarg to WorkflowState.update allowing the next task to start to be specified. Use this to restart a task when the page is edited. 2020-07-24 16:59:33 +01:00
jacobtm
8d9e085394 Add a resume kwarg to cancel, forcing the current task to restart rather than moving back to the beginning of the workflow when cancelled 2020-07-24 16:59:33 +01:00
jacobtm
5cab96e092 Cancel current task state on page revision save, to force a new task state to start with the current revision 2020-07-24 16:59:33 +01:00
jacobtm
f561cb2e12 Add workflow deletion view 2020-07-24 16:59:33 +01:00
jacobtm
ddaa5a6cd8 Remove unused imports 2020-07-24 16:59:33 +01:00
jacobtm
41881f7ff9 Prevent notifications for cancelled then restarted tasks 2020-07-24 16:59:33 +01:00