github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-04-05 03:00:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

subreddit: Add missing error on stylesheet conflict.

Browse Source
This commit is contained in:
Andre D
2012-09-22 19:13:35 -05:00
committed by Neil Williams
parent bfdcff6008
commit 871ff7eb0c
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
r2/r2/controllers/api.py
View File

@@ -1264,6 +1264,8 @@ class ApiController(RedditController, OAuth2ResourceController):
form.set_inputs(prevstyle=str(wr._id))
ModAction.create(c.site, c.user, 'wikirevise', description)
except ConflictException as e:
c.errors.add(errors.CONFLICT, field="stylesheet_contents")
form.has_errors("stylesheet_contents", errors.CONFLICT)
form.set_html(".status", _('conflict error'))
form.set_html(".errors ul", _('There was a conflict while editing the stylesheet'))
form.find('#conflict_box').show()