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

Edit SR: cast wiki rev IDs to strings on conflict

Browse Source
This commit is contained in:
Chad Birch
2013-09-23 14:13:02 -06:00
parent e66b786288
commit b319b576aa
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1844,7 +1844,11 @@ class ApiController(RedditController, OAuth2ResourceController):
form.has_errors(field, errors.CONFLICT)
form.parent().set_html('.status', error)
form.find('#%s_conflict_box' % field).show()
form.set_inputs(**{id_field_name: e.new_id, '%s_conflict_old' % field: e.your, field: e.new})
form.set_inputs(**{
id_field_name: str(e.new_id),
'%s_conflict_old' % field: e.your,
field: e.new,
})
form.set_html('#%s_conflict_diff' % field, e.htmldiff)
except (tdb_cassandra.NotFound, ValueError):
c.errors.add(errors.BAD_REVISION, field=id_field_name)