github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-29 00:38:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move more stylesheet properties into BaseSite.

Browse Source 
This fixes stylesheet usage on FakeSubreddits.
This commit is contained in:
Max Goodman
2013-04-23 22:02:44 -07:00
parent 79c5508c49
commit a3381ab238
1 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
r2/r2/models/subreddit.py
View File

@@ -149,6 +149,30 @@ class BaseSite(object):
from r2.models import ModAction
return ModAction.get_actions(srs, mod=mod, action=action)
@property
def stylesheet_is_static(self):
"""Is the subreddit using the newer static file based stylesheets?"""
return g.static_stylesheet_bucket and len(self.stylesheet_hash) == 27
static_stylesheet_prefix = "subreddit-stylesheet/"
@property
def static_stylesheet_name(self):
return "".join((self.static_stylesheet_prefix,
self.stylesheet_hash,
".css"))
@property
def stylesheet_url(self):
from r2.lib.template_helpers import static, get_domain
if self.stylesheet_is_static:
return static(self.static_stylesheet_name, kind='sr_stylesheet')
else:
return "http://%s/stylesheet.css?v=%s" % (get_domain(cname=False,
subreddit=True),
self.stylesheet_hash)
class SubredditExists(Exception): pass
@@ -324,30 +348,6 @@ class Subreddit(Thing, Printable, BaseSite):
(r._thing2_id, r.get_permissions())
for r in self.each_moderator_invite())
@property
def stylesheet_is_static(self):
"""Is the subreddit using the newer static file based stylesheets?"""
return g.static_stylesheet_bucket and len(self.stylesheet_hash) == 27
static_stylesheet_prefix = "subreddit-stylesheet/"
@property
def static_stylesheet_name(self):
return "".join((self.static_stylesheet_prefix,
self.stylesheet_hash,
".css"))
@property
def stylesheet_url(self):
from r2.lib.template_helpers import static, get_domain
if self.stylesheet_is_static:
return static(self.static_stylesheet_name, kind='sr_stylesheet')
else:
return "http://%s/stylesheet.css?v=%s" % (get_domain(cname=False,
subreddit=True),
self.stylesheet_hash)
@property
def stylesheet_contents_user(self):
try: