diff options
author | luxagraf <sng@luxagraf.net> | 2011-01-20 11:31:33 -0600 |
---|---|---|
committer | luxagraf <sng@luxagraf.net> | 2011-01-20 11:31:33 -0600 |
commit | 5a358a9ad5fc93c0db894e5e075b992f8b4e0cbd (patch) | |
tree | 51b75c02f8a2467443956f9ed63c998fdd1ff31d /apps | |
parent | d594e5dac52b2c3c4b8e462aa6f2c11d30165d28 (diff) | |
parent | 40fdd2a51a8ef3eaa9571970ca0cd440d60ce762 (diff) |
Merge branch 'master' of http://git.luxagraf.net/luxagraf
Conflicts:
apps/blog/models.py
Diffstat (limited to 'apps')
-rw-r--r-- | apps/blog/models.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/blog/models.py b/apps/blog/models.py index 1026dc0..85f105f 100644 --- a/apps/blog/models.py +++ b/apps/blog/models.py @@ -21,7 +21,7 @@ def get_tn_path(self, filename): def image_url_replace(str): str = str.replace('[[base_url]]', settings.IMAGES_URL) - #print str + print str return str def markdown_processor(md): @@ -115,8 +115,8 @@ class Entry(models.Model): return self.enable_comments and datetime.datetime.today() - datetime.timedelta(30) <= self.pub_date def get_thumbnail_url(self): - image_dir, img = self.thumbnail.url.split('post-thumbnail/')[1].split('/') - return '%spost-thumbnail/%s/%s' %(settings.IMAGES_URL, image_dir, img) + image_dir, img = self.thumbnail.url.split('post-thumbs/')[1].split('/') + return '%spost-thumbs/%s/%s' %(settings.IMAGES_URL, image_dir, img) def get_image_url(self): image_dir, img = self.image.url.split('post-images/')[1].split('/') |