From b319b576aaf91685177a983738e4d27bc2959fcc Mon Sep 17 00:00:00 2001 From: Chad Birch Date: Mon, 23 Sep 2013 14:13:02 -0600 Subject: [PATCH] Edit SR: cast wiki rev IDs to strings on conflict --- r2/r2/controllers/api.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/r2/r2/controllers/api.py b/r2/r2/controllers/api.py index 94da3b7a7..e26122d57 100755 --- a/r2/r2/controllers/api.py +++ b/r2/r2/controllers/api.py @@ -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)