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

fixes #1576

Browse Source 
The "params[:order] ||= params.delete(:sort)" is to support existing
links using sort.
This commit is contained in:
Toks
2013-07-12 13:18:19 -04:00
parent 205904e2e3
commit 46aad0d3f1
10 changed files with 23 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/artist.rb
View File

@@ -272,7 +272,8 @@ class Artist < ActiveRecord::Base
q = q.any_name_matches(params[:name])
end
if params[:sort] == "name"
params[:order] ||= params.delete(:sort)
if params[:order] == "name"
q = q.reorder("name")
else
q = q.reorder("id desc")

3
app/models/artist_version.rb
View File

@@ -31,7 +31,8 @@ class ArtistVersion < ActiveRecord::Base
q = q.where("artist_id = ?", params[:artist_id].to_i)
end
if params[:sort] == "name"
params[:order] ||= params.delete(:sort)
if params[:order] == "name"
q = q.reorder("name")
else
q = q.reorder("id desc")

3
app/models/pool.rb
View File

@@ -62,7 +62,8 @@ class Pool < ActiveRecord::Base
q = q.where("is_active = false")
end
case params[:sort]
params[:order] ||= params.delete(:sort)
case params[:order]
when "name"
q = q.order("name")
when "created_at"

20
app/models/tag.rb
View File

@@ -575,24 +575,14 @@ class Tag < ActiveRecord::Base
q = q.limit(params[:limit].to_i)
end
if params[:order] == "name"
params[:order] ||= params.delete(:sort)
case params[:order]
when "name"
q = q.reorder("name")
elsif params[:order] == "date"
when "date"
q = q.reorder("id desc")
elsif params[:order] == "count"
when "count"
q = q.reorder("post_count desc")
elsif params[:sort] == "date"
q = q.reorder("id desc")
elsif params[:sort] == "name"
q = q.reorder("name")
elsif params[:sort] == "count"
q = q.reorder("post_count desc")
else
q = q.reorder("id desc")
end

5
app/models/wiki_page.rb
View File

@@ -47,9 +47,10 @@ class WikiPage < ActiveRecord::Base
q = q.where("creator_id = (select _.id from users _ where lower(_.name) = ?)", params[:creator_name].tr(" ", "_").mb_chars.downcase)
end
if params[:sort] == "time" || params[:sort] == "Date"
params[:order] ||= params.delete(:sort)
if params[:order] == "time" || params[:order] == "Date"
q = q.order("updated_at desc")
elsif params[:sort] == "title"
elsif params[:order] == "title" || params[:order] == "Name"
q = q.order("title")
end