github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-25 14:58:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Subreddit: Handle previous revision failures

Browse Source
This commit is contained in:
Andre D
2012-09-13 02:55:05 -05:00
committed by Neil Williams
parent a2747b4241
commit 57fb1edd3f
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1255,6 +1255,12 @@ class ApiController(RedditController, OAuth2ResourceController):
form.set_html('#conflict_diff', e.htmldiff)
form.find('.errors').show()
return
except ValueError:
# Revision does not belong to page
return
except tdb_cassandra.NotFound:
# Previous revision not found
return
jquery.apply_stylesheet(stylesheet_contents_parsed)
if op == 'preview':
# try to find a link to use, otherwise give up and
@@ -1467,6 +1473,12 @@ class ApiController(RedditController, OAuth2ResourceController):
form.find('#%s_conflict_box' % field).show()
form.set_inputs(**{'prev_%s_id' % field: e.new_id, '%s_conflict_old' % field: e.your, field: e.new})
form.set_html('#%s_conflict_diff' % field, e.htmldiff)
except ValueError:
# Revision does not belong to page
pass
except tdb_cassandra.NotFound:
# Previous revision not found
pass
return False
# the status button is outside the form -- have to reset by hand