Workflow needs changes state #6047
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Manage this branch in SquashTest this branch here: https://jacobtoppmworkflow-needs-chang-x6m5l.squash.io |
zerolab
force-pushed
the
feature/workflow
branch
2 times, most recently
from
ad7c74c
to
6c06987
Compare
kaedroho
changed the base branch from
feature/workflow
to
feature/workflow-pre-rebase-5
kaedroho
suggested changes
May 31, 2020
| if WorkflowState.objects.filter(status=self.STATUS_IN_PROGRESS, page=self.page).exclude(pk=self.pk).exists(): | ||
| raise ValidationError(_('There may only be one in progress workflow state per page.')) | ||
| if WorkflowState.objects.filter(Q(status=self.STATUS_IN_PROGRESS) | Q(status=self.STATUS_NEEDS_CHANGES), page=self.page).exclude(pk=self.pk).exists(): | ||
| raise ValidationError(_('There may only be one in progress or needs changes workflow state per page.')) |
There was a problem hiding this comment.
I wonder if we should mention "needs changes" here? As a user, I'd probably think of this state as just a variant of "in progress".
Maybe we should relabel it in STATUS_CHOICES to "In progress (needs changes)"?
There was a problem hiding this comment.
Is a user actually going to see this message though? It seems like as a model level error, it's most relevant for developers, where the distinction is probably more relevant?
kaedroho
reviewed
Jun 10, 2020
… to resume a rejected WorkflowState
…AGTAIL_WORKFLOW_REQUIRE_REAPPROVAL_ON_EDIT in get_next_task logic to determine whether task states created on previous revisions apply or not
…l workflow actions into normal action menu. Adjust page view to cope with new NEEDS_CHANGES state, and add placeholder banner message (which new UI is expected to replace).
…riginal user can cancel the workflow even if the page is locked to them at that workflow step (preparing for locking page to approval groups during workflow)
… string for Python 3.5 compatibility
…in progress and needs changes states only
…ditor to lock page to non-reviewers.
jacobtoppm
force-pushed
the
workflow-needs-changes-state
branch
from
fdeb26f
to
5cac197
Compare
jacobtoppm
changed the base branch from
feature/workflow-pre-rebase-5
to
feature/workflow
jacobtoppm
added a commit
that referenced
this pull request
Jun 15, 2020
Replace WorkflowState STATUS_REJECTED with STATUS_NEEDS_CHANGES, which does not end a workflow, and add cancellation and resubmit to rejector options. Make Workflows lock pages to non-reviewers. Make the linear mode of workflow the default.
zerolab
pushed a commit
that referenced
this pull request
Jun 26, 2020
Replace WorkflowState STATUS_REJECTED with STATUS_NEEDS_CHANGES, which does not end a workflow, and add cancellation and resubmit to rejector options. Make Workflows lock pages to non-reviewers. Make the linear mode of workflow the default.
gasman
pushed a commit
that referenced
this pull request
Jul 8, 2020
Replace WorkflowState STATUS_REJECTED with STATUS_NEEDS_CHANGES, which does not end a workflow, and add cancellation and resubmit to rejector options. Make Workflows lock pages to non-reviewers. Make the linear mode of workflow the default.
gasman
pushed a commit
to gasman/wagtail
that referenced
this pull request
Jul 24, 2020
Replace WorkflowState STATUS_REJECTED with STATUS_NEEDS_CHANGES, which does not end a workflow, and add cancellation and resubmit to rejector options. Make Workflows lock pages to non-reviewers. Make the linear mode of workflow the default.
gasman
pushed a commit
that referenced
this pull request
Jul 24, 2020
Replace WorkflowState STATUS_REJECTED with STATUS_NEEDS_CHANGES, which does not end a workflow, and add cancellation and resubmit to rejector options. Make Workflows lock pages to non-reviewers. Make the linear mode of workflow the default.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes the WorkflowState STATUS_REJECTED to STATUS_NEEDS_CHANGES, and adds the ability to resume a workflow in this state, rather than starting a new one, with the additional options to cancel a workflow, and to restart from scratch.
Removes task state copying between revisions (when set up in linear mode) to prevent swamping the database with unnecessary models, and replacing this by making
WorkflowState'sget_next_taskmethod settings-aware.Makes the linear mode (WAGTAIL_WORKFLOW_REQUIRE_REAPPROVAL_ON_EDIT=False) the default.
Adds the ability to cancel a workflow
Moves workflow actions into the action menu proper.
Adds tests for workflow cancellation and resumption.
Lock page to non-reviewers during workflow, but allow workflow cancellation from any user who would normally be able to (this allows the original author to stop a workflow when submitting accidentally, for instance).