+ {% for upfile in review_request_details.files.all %}
+
+
+
+
+ {% if draft %}{{upfile.draft_caption}}{% else %}{{upfile.caption}}{% endif %}
+
+
+
+ {% endfor %}
+
+
+
+
diff --git a/reviewboard/templates/reviews/review_request_dlgs.html b/reviewboard/templates/reviews/review_request_dlgs.html
--- a/reviewboard/templates/reviews/review_request_dlgs.html
+++ b/reviewboard/templates/reviews/review_request_dlgs.html
@@ -31,7 +31,7 @@
fields: {% form_dialog_fields upload_screenshot_form %},
success: function(rsp) {
if (!$("#screenshot-thumbnails").length == 0) {
- $.screenshotThumbnail(rsp.screenshot);
+ $.newScreenshotThumbnail(rsp.screenshot);
}
gDraftBanner.show();
@@ -40,6 +40,41 @@
return false;
});
+
+ $("#upload-file-link").click(function() {
+ $("").formDlg({
+ title: "{% trans "Upload File" %}",
+ confirmLabel: "{% trans "Upload" %}",
+ dataStoreObject: gReviewRequest.createUploadedFile(),
+ width: "50em",
+ upload: true,
+ fields: {% form_dialog_fields upload_file_form %},
+ success: function(rsp) {
+ if (!$("#file-list").length == 0) {
+ $.fileDisplay(rsp.uploaded_file);
+ }
+
+ gDraftBanner.show();
+ }
+ });
+
+ return false;
+ });
+
+ $(".file-review").click(function() {
+ $("").formDlg({
+ title: "{% trans "Review File" %}",
+ confirmLabel: "{% trans "Save" %}",
+ dataStoreObject: gReviewRequest.createReview().createFileComment(this.id),
+ upload: false,
+ fields: {% form_dialog_fields comment_file_form %},
+ success: function(rsp) {
+ gReviewBanner.show();
+ }
+ });
+
+ return false;
+ });
});
{% endifuserorperm %}
diff --git a/reviewboard/webapi/resources.py b/reviewboard/webapi/resources.py
--- a/reviewboard/webapi/resources.py
+++ b/reviewboard/webapi/resources.py
@@ -36,12 +36,15 @@ from reviewboard import get_version_string, get_package_version, is_release
from reviewboard.accounts.models import Profile
from reviewboard.diffviewer.diffutils import get_diff_files
from reviewboard.diffviewer.forms import EmptyDiffError
+from reviewboard.filemanager.models import UploadedFile
+from reviewboard.filemanager.forms import UploadFileForm
from reviewboard.reviews.errors import PermissionError
from reviewboard.reviews.forms import UploadDiffForm, UploadScreenshotForm
from reviewboard.reviews.models import Comment, DiffSet, FileDiff, Group, \
Repository, ReviewRequest, \
ReviewRequestDraft, Review, \
- ScreenshotComment, Screenshot
+ ScreenshotComment, Screenshot, \
+ UploadedFileComment
from reviewboard.scmtools.errors import ChangeNumberInUseError, \
EmptyChangeSetError, \
FileNotFoundError, \
@@ -1971,6 +1974,7 @@ class BaseScreenshotResource(WebAPIResource):
},
}
)
+ @webapi_response_errors(DOES_NOT_EXIST, PERMISSION_DENIED)
def update(self, request, caption=None, *args, **kwargs):
"""Updates the screenshot's data.
@@ -2001,6 +2005,29 @@ class BaseScreenshotResource(WebAPIResource):
self.item_result_key: screenshot,
}
+ @webapi_login_required
+ @webapi_response_errors(DOES_NOT_EXIST, PERMISSION_DENIED)
+ def delete(self, request, *args, **kwargs):
+ try:
+ review_request = \
+ review_request_resource.get_object(request, *args, **kwargs)
+ screenshot = screenshot_resource.get_object(request, *args,
+ **kwargs)
+ except ObjectDoesNotExist:
+ return DOES_NOT_EXIST
+
+ try:
+ draft = review_request_draft_resource.prepare_draft(request,
+ review_request)
+ except PermissionDenied:
+ return PERMISSION_DENIED
+
+ draft.screenshots.remove(screenshot)
+ draft.inactive_screenshots.add(screenshot)
+ draft.save()
+
+ return 204, {}
+
class DraftScreenshotResource(BaseScreenshotResource):
"""Provides information on new screenshots being added to a draft of
@@ -2089,6 +2116,242 @@ class DraftScreenshotResource(BaseScreenshotResource):
draft_screenshot_resource = DraftScreenshotResource()
+class BaseUploadedFileResource(WebAPIResource):
+ """A base resource representing uploaded files."""
+ model = UploadedFile
+ name = 'uploaded_file'
+ fields = {
+ 'id': {
+ 'type': int,
+ 'description': 'The numeric ID of the file.',
+ },
+ 'caption': {
+ 'type': str,
+ 'description': "The file's descriptive caption.",
+ },
+ 'title': {
+ 'type': str,
+ 'description': "The path of the file, "
+ "relative to the media directory configured "
+ "on the Review Board server.",
+ },
+ 'url': {
+ 'type': str,
+ 'description': "The URL of the file, for downloading purposes."
+ "an absolute URL (for example, if it is just a "
+ "path), then it's relative to the Review Board "
+ "server's URL.",
+ },
+ 'file_url': {
+ 'type': str,
+ 'description': "The URL of the file object.",
+ },
+ }
+
+ uri_object_key = 'file_id'
+
+ def get_queryset(self, request, review_request_id, *args, **kwargs):
+ return self.model.objects.filter(review_request=review_request_id)
+
+ def serialize_title_field(self, obj):
+ return obj.get_title()
+
+ def serialize_url_field(self, obj):
+ return obj.get_path()
+
+ def serialize_file_url_field(self, obj):
+ return obj.get_absolute_url()
+
+ @webapi_login_required
+ @webapi_response_errors(DOES_NOT_EXIST, PERMISSION_DENIED,
+ INVALID_FORM_DATA)
+ @webapi_request_fields(
+ required={
+ 'path': {
+ 'type': file,
+ 'description': 'The file to upload.',
+ },
+ },
+ optional={
+ 'caption': {
+ 'type': str,
+ 'description': 'The optional caption describing the '
+ 'file.',
+ },
+ },
+ )
+ def create(self, request, *args, **kwargs):
+ """Creates a new file from an uploaded file.
+
+ This accepts any standard file format (including images) and associates
+ it with a draft of a review request.
+
+ It is expected that the client will send the data as part of a
+ :mimetype:`multipart/form-data` mimetype. The file's name
+ and content should be stored in the ``path`` field. A typical request
+ may look like::
+
+ -- SoMe BoUnDaRy
+ Content-Disposition: form-data; name=path; filename="foo.txt"
+
+
+ -- SoMe BoUnDaRy --
+ """
+ try:
+ review_request = \
+ review_request_resource.get_object(request, *args, **kwargs)
+ except ObjectDoesNotExist:
+ return DOES_NOT_EXIST
+
+ if not review_request.is_mutable_by(request.user):
+ return PERMISSION_DENIED
+
+ form_data = request.POST.copy()
+ form = UploadFileForm(form_data, request.FILES)
+
+ if not form.is_valid():
+ return WebAPIResponseFormError(request, form)
+
+ try:
+ upfile = form.create(request.FILES['path'], review_request)
+ except ValueError, e:
+ return INVALID_FORM_DATA, {
+ 'fields': {
+ 'path': [str(e)],
+ },
+ }
+
+ return 201, {
+ self.item_result_key: upfile,
+ }
+
+ @webapi_login_required
+ @webapi_request_fields(
+ optional={
+ 'caption': {
+ 'type': str,
+ 'description': 'The new caption for the file.',
+ },
+ }
+ )
+ def update(self, request, caption=None, *args, **kwargs):
+ """Updates the file's data.
+
+ This allows updating the file in a draft. The caption, currently,
+ is the only thing that can be updated.
+ """
+ try:
+ review_request = \
+ review_request_resource.get_object(request, *args, **kwargs)
+ upfile = uploaded_file_resource.get_object(request, *args,
+ **kwargs)
+ except ObjectDoesNotExist:
+ return DOES_NOT_EXIST
+
+ if not review_request.is_mutable_by(request.user):
+ return PERMISSION_DENIED
+
+ try:
+ review_request_draft_resource.prepare_draft(request,
+ review_request)
+ except PermissionDenied:
+ return PERMISSION_DENIED
+
+ upfile.draft_caption = caption
+ upfile.save()
+
+ return 200, {
+ self.item_result_key: screenshot,
+ }
+
+
+class DraftUploadedFileResource(BaseUploadedFileResource):
+ """Provides information on new uploaded files being added to a draft of
+ a review request.
+
+ These are files that will be shown once the pending review request
+ draft is published.
+ """
+ name = 'draft_files'
+ uri_name = 'files'
+ model_parent_key = 'drafts'
+ allowed_methods = ('GET', 'DELETE', 'POST', 'PUT',)
+
+ def get_queryset(self, request, review_request_id, *args, **kwargs):
+ try:
+ draft = review_request_draft_resource.get_object(
+ request, review_request_id, *args, **kwargs)
+
+ inactive_ids = \
+ draft.inactive_files.values_list('pk', flat=True)
+
+ q = Q(review_request=review_request_id) | Q(drafts=draft)
+ query = self.model.objects.filter(q)
+ query = query.exclude(pk__in=inactive_ids)
+ return query
+ except ObjectDoesNotExist:
+ return self.model.objects.none()
+
+ def serialize_caption_field(self, obj):
+ return obj.draft_caption or obj.caption
+
+ @webapi_login_required
+ @augment_method_from(WebAPIResource)
+ def get(self, *args, **kwargs):
+ pass
+
+ @webapi_login_required
+ @augment_method_from(WebAPIResource)
+ def delete(self, *args, **kwargs):
+ """Deletes the file from the draft.
+
+ This will remove the screenshot from the draft review request.
+ This cannot be undone.
+
+ This can be used to remove old files that were previously
+ shown, as well as newly added files that were part of the
+ draft.
+
+ Instead of a payload response on success, this will return :http:`204`.
+ """
+ pass
+
+ @webapi_login_required
+ @augment_method_from(WebAPIResource)
+ def get_list(self, *args, **kwargs):
+ """Returns a list of draft files.
+
+ Each screenshot in this list is an uploaded screenshot that will
+ be shown in the final review request. These may include newly
+ uploaded files or files that were already part of the
+ existing review request. In the latter case, existing files
+ are shown so that their captions can be added.
+ """
+ pass
+
+ def _get_list_impl(self, request, *args, **kwargs):
+ """Returns the list of files on this draft.
+
+ This is a specialized version of the standard get_list function
+ that uses this resource to serialize the children, in order to
+ guarantee that we'll be able to identify them as files that are
+ part of the draft.
+ """
+ return WebAPIResponsePaginated(
+ request,
+ queryset=self.get_queryset(request, is_list=True,
+ *args, **kwargs),
+ results_key=self.list_result_key,
+ serialize_object_func=
+ lambda obj: self.serialize_object(obj, request=request,
+ *args, **kwargs),
+ extra_data={
+ 'links': self.get_links(self.list_child_resources,
+ request=request, *args, **kwargs),
+ })
+
+draft_uploaded_file_resource = DraftUploadedFileResource()
+
class ReviewRequestDraftResource(WebAPIResource):
"""An editable draft of a review request.
@@ -2177,6 +2440,7 @@ class ReviewRequestDraftResource(WebAPIResource):
item_child_resources = [
draft_screenshot_resource,
+ draft_uploaded_file_resource
]
@classmethod
@@ -2616,7 +2880,6 @@ class ScreenshotCommentResource(BaseScreenshotCommentResource):
screenshot_comment_resource = ScreenshotCommentResource()
-
class ReviewScreenshotCommentResource(BaseScreenshotCommentResource):
"""Provides information on screenshots comments made on a review.
@@ -2779,7 +3042,6 @@ class ReviewScreenshotCommentResource(BaseScreenshotCommentResource):
review_screenshot_comment_resource = ReviewScreenshotCommentResource()
-
class ReviewReplyScreenshotCommentResource(BaseScreenshotCommentResource):
"""Provides information on replies to screenshot comments made on a
review reply.
@@ -2936,6 +3198,376 @@ review_reply_screenshot_comment_resource = \
ReviewReplyScreenshotCommentResource()
+class BaseFileCommentResource(WebAPIResource):
+ """A base resource for file comments."""
+ model = UploadedFileComment
+ name = 'file_comment'
+ fields = {
+ 'id': {
+ 'type': int,
+ 'description': 'The numeric ID of the comment.',
+ },
+ 'upfile': {
+ 'type': 'reviewboard.webapi.resources.UploadedFileResource',
+ 'description': 'The file the comment was made on.',
+ },
+ 'text': {
+ 'type': str,
+ 'description': 'The comment text.',
+ },
+ 'timestamp': {
+ 'type': str,
+ 'description': 'The date and time that the comment was made '
+ '(in YYYY-MM-DD HH:MM:SS format).',
+ },
+ 'public': {
+ 'type': bool,
+ 'description': 'Whether or not the comment is part of a public '
+ 'review.',
+ },
+ 'user': {
+ 'type': 'reviewboard.webapi.resources.UserResource',
+ 'description': 'The user who made the comment.',
+ },
+ }
+
+ uri_object_key = 'comment_id'
+
+ allowed_methods = ('GET',)
+
+ def get_queryset(self, request, review_request_id, *args, **kwargs):
+ return self.model.objects.filter(
+ file__review_request=review_request_id,
+ review__isnull=False)
+
+ def serialize_public_field(self, obj):
+ return obj.review.get().public
+
+ def serialize_timesince_field(self, obj):
+ return timesince(obj.timestamp)
+
+ def serialize_user_field(self, obj):
+ return obj.review.get().user
+
+ @augment_method_from(WebAPIResource)
+ def get(self, *args, **kwargs):
+ """Returns information on the comment.
+
+ This contains the comment text, time the comment was made,
+ and the location of the comment region on the screenshot, amongst
+ other information. It can be used to reconstruct the exact
+ position of the comment for use as an overlay on the screenshot.
+ """
+ pass
+
+
+class FileCommentResource(BaseFileCommentResource):
+ """Provides information on filess comments made on a review request.
+
+ The list of comments cannot be modified from this resource. It's meant
+ purely as a way to see existing comments that were made on a diff. These
+ comments will span all public reviews.
+ """
+ model_parent_key = 'uploaded_file'
+ uri_object_key = None
+
+ def get_queryset(self, request, review_request_id, file_id,
+ *args, **kwargs):
+ q = super(FileCommentResource, self).get_queryset(
+ request, review_request_id, *args, **kwargs)
+ q = q.filter(upfile=file_id)
+ return q
+
+ @augment_method_from(BaseFileCommentResource)
+ def get_list(self, *args, **kwargs):
+ """Returns the list of screenshot comments on a file.
+
+ This list of comments will cover all comments made on this
+ file from all reviews.
+ """
+ pass
+
+file_comment_resource = FileCommentResource()
+
+class ReviewFileCommentResource(BaseFileCommentResource):
+ """Provides information on file comments made on a review.
+
+ If the review is a draft, then comments can be added, deleted, or
+ changed on this list. However, if the review is already published,
+ then no changes can be made.
+ """
+ allowed_methods = ('GET', 'POST', 'PUT', 'DELETE')
+ model_parent_key = 'review'
+
+ def get_queryset(self, request, review_request_id, review_id,
+ *args, **kwargs):
+ q = super(ReviewFileCommentResource, self).get_queryset(
+ request, review_request_id, *args, **kwargs)
+ return q.filter(review=review_id)
+
+ def has_delete_permissions(self, request, comment, *args, **kwargs):
+ review = comment.review.get()
+ return not review.public and review.user == request.user
+
+ @webapi_login_required
+ @webapi_request_fields(
+ required = {
+ 'file_id': {
+ 'type': int,
+ 'description': 'The ID of the file being commented on.',
+ },
+ 'text': {
+ 'type': str,
+ 'description': 'The comment text.',
+ },
+ },
+ )
+ def create(self, request, file_id, text,
+ *args, **kwargs):
+ """Creates a file comment on a review.
+
+ This will create a new comment on a file as part of a review.
+ The comment contains text and dimensions for the area being commented
+ on.
+ """
+ try:
+ review_request = \
+ review_request_resource.get_object(request, *args, **kwargs)
+ review = review_resource.get_object(request, *args, **kwargs)
+ except ObjectDoesNotExist:
+ return DOES_NOT_EXIST
+
+ if not review_resource.has_modify_permissions(request, review):
+ return PERMISSION_DENIED
+
+ try:
+ upfile = UploadedFile.objects.get(pk=file_id,
+ review_request=review_request)
+ except ObjectDoesNotExist:
+ return INVALID_FORM_DATA, {
+ 'fields': {
+ 'file_id': ['This is not a valid file ID'],
+ }
+ }
+
+ new_comment = self.model(upfile=upfile, text=text)
+ new_comment.save()
+
+ review.file_comments.add(new_comment)
+ review.save()
+
+ return 201, {
+ self.item_result_key: new_comment,
+ }
+
+ @webapi_login_required
+ @webapi_response_errors(DOES_NOT_EXIST, PERMISSION_DENIED)
+ @webapi_request_fields(
+ optional = {
+ 'text': {
+ 'type': str,
+ 'description': 'The comment text.',
+ },
+ },
+ )
+ def update(self, request, *args, **kwargs):
+ """Updates a file comment.
+
+ This can update the text or region of an existing comment. It
+ can only be done for comments that are part of a draft review.
+ """
+ try:
+ review_request_resource.get_object(request, *args, **kwargs)
+ review = review_resource.get_object(request, *args, **kwargs)
+ file_comment = self.get_object(request, *args, **kwargs)
+ except ObjectDoesNotExist:
+ return DOES_NOT_EXIST
+
+ if not review_resource.has_modify_permissions(request, review):
+ return PERMISSION_DENIED
+
+ for field in ('text'):
+ value = kwargs.get(field, None)
+
+ if value is not None:
+ setattr(file_comment, field, value)
+
+ file_comment.save()
+
+ return 200, {
+ self.item_result_key: file_comment,
+ }
+
+ @augment_method_from(BaseFileCommentResource)
+ def delete(self, *args, **kwargs):
+ """Deletes the comment.
+
+ This will remove the comment from the review. This cannot be undone.
+
+ Only comments on draft reviews can be deleted. Attempting to delete
+ a published comment will return a Permission Denied error.
+
+ Instead of a payload response on success, this will return :http:`204`.
+ """
+ pass
+
+ @augment_method_from(BaseFileCommentResource)
+ def get_list(self, *args, **kwargs):
+ """Returns the list of file comments made on a review."""
+ pass
+
+review_file_comment_resource = ReviewFileCommentResource()
+
+class ReviewReplyFileCommentResource(BaseFileCommentResource):
+ """Provides information on replies to file comments made on a
+ review reply.
+
+ If the reply is a draft, then comments can be added, deleted, or
+ changed on this list. However, if the reply is already published,
+ then no changed can be made.
+ """
+ allowed_methods = ('GET', 'POST', 'PUT', 'DELETE')
+ model_parent_key = 'review'
+ fields = dict({
+ 'reply_to': {
+ 'type': ReviewFileCommentResource,
+ 'description': 'The comment being replied to.',
+ },
+ }, **BaseFileCommentResource.fields)
+
+ def get_queryset(self, request, review_request_id, review_id, reply_id,
+ *args, **kwargs):
+ q = super(ReviewReplyFileCommentResource, self).get_queryset(
+ request, review_request_id, *args, **kwargs)
+ q = q.filter(review=reply_id, review__base_reply_to=review_id)
+ return q
+
+ @webapi_login_required
+ @webapi_response_errors(DOES_NOT_EXIST, INVALID_FORM_DATA,
+ PERMISSION_DENIED)
+ @webapi_request_fields(
+ required = {
+ 'reply_to_id': {
+ 'type': int,
+ 'description': 'The ID of the comment being replied to.',
+ },
+ 'text': {
+ 'type': str,
+ 'description': 'The comment text.',
+ },
+ },
+ )
+ def create(self, request, reply_to_id, text, *args, **kwargs):
+ """Creates a reply to a file comment on a review.
+
+ This will create a reply to a file comment on a review.
+ The new comment will contain the same dimensions of the comment
+ being replied to, but may contain new text.
+ """
+ try:
+ review_request_resource.get_object(request, *args, **kwargs)
+ reply = review_reply_resource.get_object(request, *args, **kwargs)
+ except ObjectDoesNotExist:
+ return DOES_NOT_EXIST
+
+ if not review_reply_resource.has_modify_permissions(request, reply):
+ return PERMISSION_DENIED
+
+ try:
+ comment = review_file_comment_resource.get_object(
+ request,
+ comment_id=reply_to_id,
+ *args, **kwargs)
+ except ObjectDoesNotExist:
+ return INVALID_FORM_DATA, {
+ 'fields': {
+ 'reply_to_id': ['This is not a valid file '
+ 'comment ID'],
+ }
+ }
+
+ new_comment = self.model(upfile=comment.upfile,
+ text=text)
+ new_comment.save()
+
+ reply.file_comments.add(new_comment)
+ reply.save()
+
+ return 201, {
+ self.item_result_key: new_comment,
+ }
+
+ @webapi_login_required
+ @webapi_response_errors(DOES_NOT_EXIST, PERMISSION_DENIED)
+ @webapi_request_fields(
+ required = {
+ 'text': {
+ 'type': str,
+ 'description': 'The new comment text.',
+ },
+ },
+ )
+ def update(self, request, *args, **kwargs):
+ """Updates a reply to a file comment.
+
+ This can only update the text in the comment. The comment being
+ replied to cannot change.
+ """
+ try:
+ review_request_resource.get_object(request, *args, **kwargs)
+ reply = review_reply_resource.get_object(request, *args, **kwargs)
+ file_comment = self.get_object(request, *args, **kwargs)
+ except ObjectDoesNotExist:
+ return DOES_NOT_EXIST
+
+ if not review_reply_resource.has_modify_permissions(request, reply):
+ return PERMISSION_DENIED
+
+ for field in ('text',):
+ value = kwargs.get(field, None)
+
+ if value is not None:
+ setattr(file_comment, field, value)
+
+ file_comment.save()
+
+ return 200, {
+ self.item_result_key: file_comment,
+ }
+
+ @augment_method_from(BaseFileCommentResource)
+ def delete(self, *args, **kwargs):
+ """Deletes a file comment from a draft reply.
+
+ This will remove the comment from the reply. This cannot be undone.
+
+ Only comments on draft replies can be deleted. Attempting to delete
+ a published comment will return a Permission Denied error.
+
+ Instead of a payload response, this will return :http:`204`.
+ """
+ pass
+
+ @augment_method_from(BaseFileCommentResource)
+ def get(self, *args, **kwargs):
+ """Returns information on a reply to a file comment.
+
+ Much of the information will be identical to that of the comment
+ being replied to.
+ """
+ pass
+
+ @augment_method_from(BaseFileCommentResource)
+ def get_list(self, *args, **kwargs):
+ """Returns the list of replies to file comments made on a
+ review reply.
+ """
+ pass
+
+review_reply_file_comment_resource = \
+ ReviewReplyFileCommentResource()
+
+
class BaseReviewResource(WebAPIResource):
"""Base class for review resources.
@@ -3244,6 +3876,7 @@ class ReviewReplyResource(BaseReviewResource):
item_child_resources = [
review_reply_diff_comment_resource,
review_reply_screenshot_comment_resource,
+ review_reply_file_comment_resource,
]
list_child_resources = [
@@ -3453,6 +4086,7 @@ class ReviewResource(BaseReviewResource):
review_diff_comment_resource,
review_reply_resource,
review_screenshot_comment_resource,
+ review_file_comment_resource,
]
list_child_resources = [
@@ -3529,6 +4163,85 @@ class ScreenshotResource(BaseScreenshotResource):
"""
pass
+ @augment_method_from(BaseScreenshotResource)
+ def delete(self, *args, **kwargs):
+ """Deletes the screenshot.
+
+ This will remove the screenshot from the draft review request.
+ This cannot be undone.
+
+ Deleting a screenshot will automatically create a new review request
+ draft, if one doesn't already exist. The screenshot won't be actually
+ removed until the review request draft is published.
+
+ This can be used to remove old screenshots that were previously
+ shown, as well as newly added screenshots that were part of the
+ draft.
+
+ Instead of a payload response on success, this will return :http:`204`.
+ """
+ pass
+
+screenshot_resource = ScreenshotResource()
+
+
+class UploadedFileResource(BaseUploadedFileResource):
+ """A resource representing a screenshot on a review request."""
+ model_parent_key = 'review_request'
+
+ item_child_resources = [
+ file_comment_resource,
+ ]
+
+ allowed_methods = ('GET', 'POST', 'PUT', 'DELETE')
+
+ @augment_method_from(BaseUploadedFileResource)
+ def get_list(self, *args, **kwargs):
+ """Returns a list of screenshots on the review request.
+
+ Each screenshot in this list is an uploaded screenshot that is
+ shown on the review request.
+ """
+ pass
+
+ @augment_method_from(BaseUploadedFileResource)
+ def create(self, request, *args, **kwargs):
+ """Creates a new screenshot from an uploaded file.
+
+ This accepts any standard image format (PNG, GIF, JPEG) and associates
+ it with a draft of a review request.
+
+ Creating a new screenshot will automatically create a new review
+ request draft, if one doesn't already exist. This screenshot will
+ be part of that draft, and will be shown on the review request
+ when it's next published.
+
+ It is expected that the client will send the data as part of a
+ :mimetype:`multipart/form-data` mimetype. The screenshot's name
+ and content should be stored in the ``path`` field. A typical request
+ may look like::
+
+ -- SoMe BoUnDaRy
+ Content-Disposition: form-data; name=path; filename="foo.png"
+
+
+ -- SoMe BoUnDaRy --
+ """
+ pass
+
+ @augment_method_from(BaseUploadedFileResource)
+ def update(self, request, caption=None, *args, **kwargs):
+ """Updates the screenshot's data.
+
+ This allows updating the screenshot. The caption, currently,
+ is the only thing that can be updated.
+
+ Updating a screenshot will automatically create a new review request
+ draft, if one doesn't already exist. The updates won't be public
+ until the review request draft is published.
+ """
+ pass
+
@webapi_login_required
@augment_method_from(WebAPIResource)
def delete(self, *args, **kwargs):
@@ -3549,7 +4262,7 @@ class ScreenshotResource(BaseScreenshotResource):
"""
pass
-screenshot_resource = ScreenshotResource()
+uploaded_file_resource = UploadedFileResource()
class ReviewRequestLastUpdateResource(WebAPIResource):
@@ -3738,6 +4451,7 @@ class ReviewRequestResource(WebAPIResource):
review_request_last_update_resource,
review_resource,
screenshot_resource,
+ uploaded_file_resource
]
allowed_methods = ('GET', 'POST', 'PUT', 'DELETE')
@@ -4330,9 +5044,15 @@ register_resource_for_model(
register_resource_for_model(ReviewRequest, review_request_resource)
register_resource_for_model(ReviewRequestDraft, review_request_draft_resource)
register_resource_for_model(Screenshot, screenshot_resource)
+register_resource_for_model(UploadedFile, uploaded_file_resource)
register_resource_for_model(
ScreenshotComment,
lambda obj: obj.review.get().is_reply() and
review_reply_screenshot_comment_resource or
review_screenshot_comment_resource)
+register_resource_for_model(
+ UploadedFileComment,
+ lambda obj: obj.review.get().is_reply() and
+ review_reply_file_comment_resource or
+ review_file_comment_resource)
register_resource_for_model(User, user_resource)
diff --git a/webtests/tests.py b/webtests/tests.py
--- a/webtests/tests.py
+++ b/webtests/tests.py
@@ -25,7 +25,8 @@ def create_screenshot(r, caption=""):
class SeleniumUnitTest(testcases.SeleniumUnitTest):
- fixtures = ['test_users', 'test_reviewrequests', 'test_scmtools']
+ fixtures = ['test_users', 'test_reviewrequests', 'test_scmtools',
+ 'test_site']
def setUp(self):
super(SeleniumUnitTest, self).setUp()
@@ -113,12 +114,12 @@ class DiffTests(SeleniumUnitTest):
f = open(diff_filename, "r")
self.client.login(username="grumpy", password="grumpy")
response = self.client.post(
- '/api/json/reviewrequests/%s/diff/new/' % r.id, {
+ '/api/review-requests/%s/diffs/' % r.id, {
'path': f,
'basedir': '/trunk',
}
)
- self.assertEqual(response.status_code, 200)
+ self.assertEqual(response.status_code, 201)
self.assertTrue('"ok"' in response.content)
f.close()
@@ -174,6 +175,7 @@ class DiffCommentTests(SeleniumUnitTest):
self.open_comment_box(file.id, first_line, last_line)
self.selenium.type_keys('comment_text', comment_text)
self.selenium.click('comment_save')
+ self.wait_for_visible('review-banner')
self.selenium.click('review-banner-publish')
self.selenium.wait_for_page_to_load("6000")
@@ -266,7 +268,7 @@ class DiffCommentTests(SeleniumUnitTest):
self.wait_for_ajax_finish()
time.sleep(0.25) # It will be animating, so wait.
- self.assertEqual(r.reviews.count(), 0)
+ self.assertEqual(r.reviews.count(), 1)
def open_comment_box(self, file_id, first_line, last_line):
first_line_locator = self.build_line_locator(file_id, first_line)
@@ -400,7 +402,7 @@ class ReviewRequestTests(SeleniumUnitTest):
summary = 'My new summary'
branch = 'mybranch'
- bugs_closed = '123, 789'
+ bugs_closed = '123,789'
target_groups = 'devgroup'
target_people = 'grumpy'
description = 'My new description'
@@ -539,8 +541,10 @@ class ReviewRequestTests(SeleniumUnitTest):
# This is a test for bug #1586
def test_linkified_text_for_non_editable_description(self):
"""Testing linkified text in non-editable description"""
- r = ReviewRequest.objects.filter(public=True, status='P')\
- .exclude(submitter=self.user)[0]
+ q = ReviewRequest.objects.filter(public=True, status='P',
+ local_site=None)
+ q = q.exclude(submitter=self.user)
+ r = q[0]
r.description = "Testing linkified text\n\n/r/123"
r.save()
transaction.commit()
@@ -741,7 +745,8 @@ class ReviewTests(SeleniumUnitTest):
self.assertTrue(self.selenium.is_visible('review-banner'))
def _click_discard(self):
- self._click_dlg_button('Discard Review', reloads_page=True)
+ self._click_dlg_button('Discard Review')
+ self.assertFalse(self.selenium.is_visible('review-banner'))
class ReviewGroupTests(SeleniumUnitTest):
@@ -963,7 +968,7 @@ class ScreenshotTests(SeleniumUnitTest):
self.selenium.open(r.get_absolute_url())
self.selenium.click('css=.screenshot-caption '
'img[alt="Delete Screenshot"]')
- self.selenium.wait_for_page_to_load("6000")
+ self.wait_for_ajax_finish()
draft = r.get_draft(self.user)
self.assertNotEqual(draft, None)
@@ -1022,7 +1027,7 @@ class ScreenshotCommentTests(SeleniumUnitTest):
self.selenium.click('comment_delete')
self.wait_for_ajax_finish()
- self.assertEqual(r.reviews.count(), 0)
+ self.assertEqual(r.reviews.count(), 1)
def _get_review_request(self):
r = ReviewRequest.objects.filter(public=True, status='P',
+