Permalink
Browse files

Merge branch 'release-1.6.x'

  • Loading branch information...
2 parents 3679496 + ce7e998 commit 3942334f8a0193a51d929323cdfecc4f902553a8 @chipx86 committed Apr 1, 2012
Showing with 10 additions and 7 deletions.
  1. +2 −0 AUTHORS
  2. +8 −7 reviewboard/webapi/resources.py
View
2 AUTHORS
@@ -82,6 +82,7 @@ Contributors:
* Jeeva Suresh
* Jeff Lamb
* Jeroen Janssen
+ * Jim Chen
* Joe Heck
* Joe Winter
* Jonathan Ellis
@@ -156,6 +157,7 @@ Contributors:
* Stephen Gallagher
* Steve Milner
* Steve Sutcliffe
+ * Steven MacLeod
* Takeshi Yoshizawa
* Taro MURAOKA
* Tarun Anupoju
View
15 reviewboard/webapi/resources.py
@@ -1142,12 +1142,6 @@ def _get_diff_data(self, request, mimetype, *args, **kwargs):
return resp
- def get_href(self, obj, request, *args, **kwargs):
- """Returns the URL for this object"""
- base = review_request_resource.get_href(
- obj.diffset.history.review_request.get(), request, *args, **kwargs)
- return '%s%s/%s/' % (base, self.uri_name, obj.id)
-
filediff_resource = FileDiffResource()
@@ -5441,7 +5435,14 @@ def get(self, request, *args, **kwargs):
if isinstance(updated_object, ReviewRequest):
user = updated_object.submitter
- summary = _("Review request updated")
+
+ if updated_object.status == ReviewRequest.SUBMITTED:
+ summary = _("Review request submitted")
+ elif updated_object.status == ReviewRequest.DISCARDED:
+ summary = _("Review request discarded")
+ else:
+ summary = _("Review request updated")
+
update_type = "review-request"
elif isinstance(updated_object, DiffSet):
summary = _("Diff updated")

0 comments on commit 3942334

Please sign in to comment.