From 6c62017040d37029a9bd684ecc30be2dec804566 Mon Sep 17 00:00:00 2001 From: Chad Birch Date: Wed, 16 Oct 2013 12:54:46 -0600 Subject: [PATCH] Wiki revisions: convert UUID to string --- r2/r2/controllers/api.py | 2 +- r2/r2/controllers/wiki.py | 2 +- r2/r2/models/wiki.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/r2/r2/controllers/api.py b/r2/r2/controllers/api.py index ffb7b51ff..06f175563 100755 --- a/r2/r2/controllers/api.py +++ b/r2/r2/controllers/api.py @@ -1852,7 +1852,7 @@ class ApiController(RedditController, OAuth2ResourceController): setattr(sr, field, value) if not wr: return True - setattr(sr, id_field_name, str(wikipage.revision)) + setattr(sr, id_field_name, wikipage.revision) ModAction.create(sr, c.user, 'wikirevise', details=wiki.modactions.get(pagename)) return True except ConflictException as e: diff --git a/r2/r2/controllers/wiki.py b/r2/r2/controllers/wiki.py index ca96af4b3..2ebe65123 100644 --- a/r2/r2/controllers/wiki.py +++ b/r2/r2/controllers/wiki.py @@ -345,7 +345,7 @@ class WikiApiController(WikiController): # object. TODO: change this to minimize subreddit get sizes. if page.special: setattr(c.site, ATTRIBUTE_BY_PAGE[page.name], content) - setattr(c.site, "prev_" + ATTRIBUTE_BY_PAGE[page.name] + "_id", str(page.revision)) + setattr(c.site, "prev_" + ATTRIBUTE_BY_PAGE[page.name] + "_id", page.revision) c.site._commit() if page.special or c.is_wiki_mod: diff --git a/r2/r2/models/wiki.py b/r2/r2/models/wiki.py index 0b5e6403d..43284d289 100644 --- a/r2/r2/models/wiki.py +++ b/r2/r2/models/wiki.py @@ -350,7 +350,7 @@ class WikiPage(tdb_cassandra.Thing): self.content = content self.last_edit_by = author self.last_edit_date = wr.date - self.revision = wr._id + self.revision = str(wr._id) self._commit() return wr