Fix #1007 -- small improvements to training request workflow #1030
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
Until now, pending requests can't be matched with a person and accepted requests must be matched with a person. Now, pending requests can't be matched with a *training* and accepted requests may or may not be matched with a training. It doesn't matter whether a request is matched with a person.
because it's unaligned with other buttons due to using custom layout.
chrismedrela
changed the title
7 tasks
|
Looks good to me - please merge when you're ready. |
gvwilson
reviewed
Oct 6, 2016
| ('p', 'Pending'), # initial state | ||
| ('a', 'Accepted'), # state after matching a Person record | ||
| ('d', 'Discarded'), | ||
| ) | ||
| ] |
There was a problem hiding this comment.
why a list rather than a tuple?
There was a problem hiding this comment.
Because here it's more readable to write:
[('', 'Pending or accepted')] + TrainingRequest.STATES
rather than
(('', 'Pending or accepted'),) + TrainingRequest.STATES
| if self.state == 'p' and self.person is not None \ | ||
| and self.person.get_training_tasks().exists(): | ||
| raise ValidationError({'state': 'Pending training request cannot ' | ||
| 'be matched with a training.'}) |
| ('p', 'Pending'), # initial state | ||
| ('a', 'Accepted'), # state after matching a Person record | ||
| ('d', 'Discarded'), | ||
| ) | ||
| ] |
There was a problem hiding this comment.
Why a list rather than a tuple?
gvwilson
reviewed
Oct 6, 2016
| raise ValidationError({'person': 'Pending training requests cannot ' | ||
| 'be matched to a person.'}) | ||
| if self.state == 'p' and self.person is not None \ | ||
| and self.person.get_training_tasks().exists(): |
|
Looks good to me - please merge when you're ready. |
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.
No description provided.