Merge lp:~thumper/launchpad/fix-date-review-requested into lp:launchpad/db-devel
Proposed by
Tim Penhey
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Tim Penhey | ||||
Approved revision: | not available | ||||
Merged at revision: | not available | ||||
Proposed branch: | lp:~thumper/launchpad/fix-date-review-requested | ||||
Merge into: | lp:launchpad/db-devel | ||||
Diff against target: |
131 lines (+71/-3) 4 files modified
lib/lp/code/browser/branchmergeproposallisting.py (+19/-1) lib/lp/code/browser/tests/test_branchmergeproposallisting.py (+45/-1) lib/lp/code/model/branchmergeproposal.py (+0/-1) lib/lp/code/model/tests/test_branchmergeproposals.py (+7/-0) |
||||
To merge this branch: | bzr merge lp:~thumper/launchpad/fix-date-review-requested | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Guilherme Salgado (community) | release-critical | Approve | |
Brad Crittenden (community) | code | Approve | |
Review via email:
|
To post a comment you must log in.
Followed up on the outage last night for the Bazaar team. The active reviews page always expected the date_review_ requested to be non-None.
However there are some edge cases where the proposal may be Approved but not reviewed. In this case it makes sense that the date_review_ requested is None. The browser class has been updated to effectively coalesce the sort order to choose date_review_ requested, and if that is None, use date_reviewed.
Also fixes the model level code where setting a branch to work in progress doesn't reset the date_review_ requested so as to protect against accidental setting.
Tests: geProposalListi ngItem ortingTest geProposalReque stReview
TestBranchMer
ActiveReviewS
TestBranchMer