subreddit: Add missing error on stylesheet conflict.

andre-d · Sep 28, 2012 · 441ee6c · 441ee6c
1 parent 24e5187
commit 441ee6c
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/r2/r2/controllers/api.py b/r2/r2/controllers/api.py
@@ -1264,6 +1264,8 @@ def POST_subreddit_stylesheet(self, form, jquery,
                     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()