diff --git a/r2/r2/models/modaction.py b/r2/r2/models/modaction.py index 64c2c548c..a945a5cfe 100644 --- a/r2/r2/models/modaction.py +++ b/r2/r2/models/modaction.py @@ -166,7 +166,7 @@ class ModAction(tdb_cassandra.UuidThing, Printable): 'permission_moderator_invite': _('set permissions on moderator invitation')} # This stuff won't change - cache_ignore = set(['subreddit', 'target']).union(Printable.cache_ignore) + cache_ignore = set(['subreddit', 'target', 'mod', 'button']).union(Printable.cache_ignore) # Thing properties for Printable @property diff --git a/r2/r2/templates/modaction.xml b/r2/r2/templates/modaction.xml new file mode 100644 index 000000000..531d4e22d --- /dev/null +++ b/r2/r2/templates/modaction.xml @@ -0,0 +1,43 @@ +## The contents of this file are subject to the Common Public Attribution +## License Version 1.0. (the "License"); you may not use this file except in +## compliance with the License. You may obtain a copy of the License at +## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public +## License Version 1.1, but Sections 14 and 15 have been added to cover use of +## software over a computer network and provide for limited attribution for the +## Original Developer. In addition, Exhibit A has been modified to be +## consistent with Exhibit B. +## +## Software distributed under the License is distributed on an "AS IS" basis, +## WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for +## the specific language governing rights and limitations under the License. +## +## The Original Code is reddit. +## +## The Original Developer is the Initial Developer. The Initial Developer of +## the Original Code is reddit Inc. +## +## All portions of the code written by reddit are Copyright (c) 2006-2013 +## reddit Inc. All Rights Reserved. +############################################################################### + +<%! + from r2.lib.template_helpers import add_sr +%> + +<% + title = ('%(subreddit)s: %(mod)s %(action)s' % {'subreddit': thing.sr_name, + 'mod': thing.author.name, + 'action': thing.text}) + title += ' "%s"' % thing.target_title if hasattr(thing, 'target_text') else '' + title += ' (%s)' % thing.details if hasattr(thing, 'details') else '' +%> + + + ${thing._id} + ${title} + ${thing.date.strftime('%a, %d %b %Y %H:%M:%S %z')} + %if hasattr(thing, 'target_text'): + ${add_sr(thing.target_path)} + %endif + ${thing.sr_name} +