Merge lp:~thumper/launchpad/claim-review-into-model-browser-integration into lp:launchpad/db-devel

Proposed by Tim Penhey
Status: Merged
Merged at revision: 8763
Proposed branch: lp:~thumper/launchpad/claim-review-into-model-browser-integration
Merge into: lp:launchpad/db-devel
Prerequisite: lp:~thumper/launchpad/claim-review-into-model-attempt2
Diff against target: 15 lines (+2/-3)
1 file modified
lib/lp/code/browser/branchmergeproposal.py (+2/-3)
To merge this branch: bzr merge lp:~thumper/launchpad/claim-review-into-model-browser-integration
Reviewer Review Type Date Requested Status
Paul Hummer (community) Approve
Review via email: mp+15719@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Tim Penhey (thumper) wrote :

This branch ended up being smaller than I expected, but hey.

tests:
  xx-branch-merge-proposals

Revision history for this message
Paul Hummer (rockstar) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/code/browser/branchmergeproposal.py'
--- lib/lp/code/browser/branchmergeproposal.py 2009-12-07 04:04:13 +0000
+++ lib/lp/code/browser/branchmergeproposal.py 2009-12-07 04:04:14 +0000
@@ -519,9 +519,8 @@
519 def claim_action(self, action, data):519 def claim_action(self, action, data):
520 """Claim this proposal."""520 """Claim this proposal."""
521 request = self.context.getVoteReference(data['review_id'])521 request = self.context.getVoteReference(data['review_id'])
522 if request.reviewer == self.user:522 if request is not None:
523 return523 request.claimReview(self.user)
524 request.reviewer = self.user
525 self.next_url = canonical_url(self.context)524 self.next_url = canonical_url(self.context)
526525
527 @property526 @property

Subscribers

People subscribed via source and target branches

to status/vote changes: