jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes #216

Browse Source
This commit is contained in:
albert
2012-01-06 19:13:54 -05:00
parent 55a9b5d372
commit 4135fb2f8c
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/post.rb
View File

@@ -135,7 +135,7 @@ class Post < ActiveRecord::Base
def medium_file_url def medium_file_url
if has_medium? if has_medium?
if is_flash? if is_flash?
"/images/480x200-flash.png" "/data/preview/480x200-flash.png"
else else
"/data/medium/#{file_path_prefix}#{md5}.jpg" "/data/medium/#{file_path_prefix}#{md5}.jpg"
end end
@@ -154,7 +154,7 @@ class Post < ActiveRecord::Base
def preview_file_url def preview_file_url
if is_flash? if is_flash?
return "/images/150x150-flash.png" return "/data/preview/150x150-flash.png"
end end
if Danbooru.config.ssd_path if Danbooru.config.ssd_path
@@ -677,6 +677,10 @@ class Post < ActiveRecord::Base
relation = relation.where("posts.is_flagged = TRUE") relation = relation.where("posts.is_flagged = TRUE")
elsif q[:status] == "deleted" elsif q[:status] == "deleted"
relation = relation.where("posts.is_deleted = TRUE") relation = relation.where("posts.is_deleted = TRUE")
elsif q[:status] == "all" || q[:status] == "any"
# do nothing
else
relation = relation.where("posts.is_deleted <> TRUE")
end end
if q[:source] if q[:source]

BIN
public/images/150x150-flash.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 15 KiB

BIN
public/images/480x200-flash.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 35 KiB