From cf6b533b5dba231f927f3629f97e69b957c2fb84 Mon Sep 17 00:00:00 2001 From: Logan Hanks Date: Tue, 31 Jul 2012 13:48:46 -0700 Subject: [PATCH] Fix error reporting for app icon uploads. --- r2/r2/controllers/api.py | 4 ---- r2/r2/controllers/reddit_base.py | 3 ++- r2/r2/public/static/js/reddit.js | 1 + r2/r2/templates/utils.html | 15 ++++++++++++++- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/r2/r2/controllers/api.py b/r2/r2/controllers/api.py index fa2a953ab..a949c695e 100755 --- a/r2/r2/controllers/api.py +++ b/r2/r2/controllers/api.py @@ -2939,10 +2939,6 @@ class ApiController(RedditController, OAuth2ResourceController): docs=dict(file=_("an icon (72x72)")))) @api_doc(api_section.apps) def POST_setappicon(self, form, jquery, client, icon_file): - if client: - form_id = 'app-icon-upload-%s' % client._id - else: - form_id = None if not media.can_upload_icon(): form.set_error(errors.NOT_SUPPORTED, '') if not icon_file: diff --git a/r2/r2/controllers/reddit_base.py b/r2/r2/controllers/reddit_base.py index b7b6f29df..3bbe9d11a 100644 --- a/r2/r2/controllers/reddit_base.py +++ b/r2/r2/controllers/reddit_base.py @@ -768,7 +768,8 @@ class MinimalController(BaseController): c.response_content_type = 'text/html' c.response.content = ( '') % filters.websafe_json(data) return c.response diff --git a/r2/r2/public/static/js/reddit.js b/r2/r2/public/static/js/reddit.js index 37858933c..065fbff8d 100644 --- a/r2/r2/public/static/js/reddit.js +++ b/r2/r2/public/static/js/reddit.js @@ -124,6 +124,7 @@ function post_pseudo_form(form, where, block) { } function post_multipart_form(form, where) { + $(form).find(".error").not(".status").hide(); $(form).find(".status").html(reddit.status_msg.submitting).show(); return true; } diff --git a/r2/r2/templates/utils.html b/r2/r2/templates/utils.html index f8e1902e6..603f10c1d 100755 --- a/r2/r2/templates/utils.html +++ b/r2/r2/templates/utils.html @@ -271,16 +271,29 @@ ${unsafe(txt)}
- + + ${error_field('IMAGE_ERROR', '')} %if caller: ${caller.body()} %endif +