diff options
| author | Magnus Hagander | 2015-04-28 16:05:46 +0000 |
|---|---|---|
| committer | Magnus Hagander | 2015-04-28 16:05:46 +0000 |
| commit | c6e940c1acc2e6c41fe809213a9b9c96a7ce63c2 (patch) | |
| tree | 3e3ee7f2adb95e934fd7db93f8d4857ccd7c1634 /pgcommitfest/commitfest/models.py | |
| parent | 071869e855a8fab2cccc2c8adf48f32ed1acbca6 (diff) | |
Rename "returned with feedback"->"move to next cf", add new "returned with feedback"
Returned with Feedback will now actually close the patch and *not* move it to
the next CF. Since it used to do that, all existing Returned with Feedback patches
are changed to Moved to next CF which does the same thing that Returned with
Feedback used to do. And of course, Moved to next CF is a new option available for
each patch from now on.
Diffstat (limited to 'pgcommitfest/commitfest/models.py')
| -rw-r--r-- | pgcommitfest/commitfest/models.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pgcommitfest/commitfest/models.py b/pgcommitfest/commitfest/models.py index 6035027..23fe1fb 100644 --- a/pgcommitfest/commitfest/models.py +++ b/pgcommitfest/commitfest/models.py @@ -145,23 +145,26 @@ class PatchOnCommitFest(models.Model): STATUS_AUTHOR=2 STATUS_COMMITTER=3 STATUS_COMMITTED=4 - STATUS_RETURNED=5 + STATUS_NEXT=5 STATUS_REJECTED=6 + STATUS_RETURNED=7 _STATUS_CHOICES=( (STATUS_REVIEW, 'Needs review'), (STATUS_AUTHOR, 'Waiting on Author'), (STATUS_COMMITTER, 'Ready for Committer'), (STATUS_COMMITTED, 'Committed'), - (STATUS_RETURNED, 'Returned with Feedback'), + (STATUS_NEXT, 'Moved to next CF'), (STATUS_REJECTED, 'Rejected'), + (STATUS_RETURNED, 'Returned with feedback') ) _STATUS_LABELS=( (STATUS_REVIEW, 'default'), (STATUS_AUTHOR, 'primary'), (STATUS_COMMITTER, 'info'), (STATUS_COMMITTED, 'success'), - (STATUS_RETURNED, 'warning'), + (STATUS_NEXT, 'warning'), (STATUS_REJECTED, 'danger'), + (STATUS_RETURNED, 'danger'), ) OPEN_STATUSES=(STATUS_REVIEW, STATUS_AUTHOR, STATUS_COMMITTER) OPEN_STATUS_CHOICES=[x for x in _STATUS_CHOICES if x[0] in OPEN_STATUSES] |