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: Correct incorrect conflict exceptions

Browse Source
This commit is contained in:
Andre D
2012-09-11 20:48:18 -05:00
committed by Neil Williams
parent 024a7d55be
commit d10ca35bbe
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1227,13 +1227,15 @@ class ApiController(RedditController, OAuth2ResourceController):
if op == 'save':
c.site.stylesheet_contents = stylesheet_contents_parsed
try:
c.site.change_css(stylesheet_contents, parsed, prevstyle)
wr = c.site.change_css(stylesheet_contents, parsed, prevstyle)
form.find('.conflict_box').hide()
form.find('.errors').hide()
form.set_html(".status", _('saved'))
form.set_html(".errors ul", "")
description = wiki.modactions.get('config/stylesheet')
ModAction.create(c.site, c.user, 'wikirevise', description)
if wr:
description = wiki.modactions.get('config/stylesheet')
form.set_inputs(prevstyle=str(wr._id))
ModAction.create(c.site, c.user, 'wikirevise', description)
except ConflictException as e:
form.set_html(".status", _('conflict error'))
form.set_html(".errors ul", _('There was a conflict while editing the stylesheet'))
@@ -1443,8 +1445,10 @@ class ApiController(RedditController, OAuth2ResourceController):
except tdb_cassandra.NotFound:
wikipage = wiki.WikiPage.create(sr, pagename)
try:
if wikipage.revise(value, previous=prev, author=c.user.name):
ModAction.create(c.site, c.user, 'wikirevise', details=wiki.modactions.get(pagename))
wr = wikipage.revise(value, previous=prev, author=c.user.name)
if not wr:
return True
ModAction.create(c.site, c.user, 'wikirevise', details=wiki.modactions.get(pagename))
return True
except ConflictException as e:
c.errors.add(errors.CONFLICT, field = field)

3
r2/r2/models/subreddit.py
View File

@@ -363,12 +363,13 @@ class Subreddit(Thing, Printable):
wiki = WikiPage.get(self, 'config/stylesheet')
except tdb_cassandra.NotFound:
wiki = WikiPage.create(self, 'config/stylesheet')
wiki.revise(content, previous=prev, author=author, reason=reason, force=force)
wr = wiki.revise(content, previous=prev, author=author, reason=reason, force=force)
self.stylesheet_contents = parsed
self.stylesheet_hash = md5(parsed).hexdigest()
set_last_modified(self, 'stylesheet_contents')
c.site._commit()
ModAction.create(self, c.user, action='wikirevise', details='Updated subreddit stylesheet')
return wr
def is_special(self, user):
return (user