github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-26 21:53:51 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Change param asc to ascending

Browse Source 
For consistency, change param asc to ascending:

https://meta.discourse.org/t/make-admin-users-list-sortable-suggestion/47649/17?u=oblakeerickson
This commit is contained in:
Blake Erickson 2017-02-25 09:13:31 -07:00
parent 0a41da6bad
commit e9d5c3265c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/admin_user_index_query.rb
View File

@ -27,7 +27,7 @@ class AdminUserIndexQuery
end end
def custom_direction def custom_direction
asc = params[:asc] asc = params[:ascending]
asc.present? && asc ? "ASC" : "DESC" asc.present? && asc ? "ASC" : "DESC"
end end

6
spec/components/admin_user_index_query_spec.rb
View File

@ -28,7 +28,7 @@ describe AdminUserIndexQuery do
end end
it "allows custom ordering asc" do it "allows custom ordering asc" do
query = ::AdminUserIndexQuery.new({ order: "trust_level", asc: true }) query = ::AdminUserIndexQuery.new({ order: "trust_level", ascending: true })
expect(query.find_users_query.to_sql).to match("trust_level ASC" ) expect(query.find_users_query.to_sql).to match("trust_level ASC" )
end end
@ -38,7 +38,7 @@ describe AdminUserIndexQuery do
end end
it "allows custom ordering and direction for stats" do it "allows custom ordering and direction for stats" do
query = ::AdminUserIndexQuery.new({ order: "topics_entered", asc: true }) query = ::AdminUserIndexQuery.new({ order: "topics_entered", ascending: true })
expect(query.find_users_query.to_sql).to match("topics_entered ASC") expect(query.find_users_query.to_sql).to match("topics_entered ASC")
end end
end end
@ -91,7 +91,7 @@ describe AdminUserIndexQuery do
end end
it "shows nil values first with asc" do it "shows nil values first with asc" do
users = ::AdminUserIndexQuery.new({ order: "last_emailed_at", asc: true }).find_users users = ::AdminUserIndexQuery.new({ order: "last_emailed_at", ascending: true }).find_users
expect(users.count).to eq(2) expect(users.count).to eq(2)
expect(users.first.username).to eq("system") expect(users.first.username).to eq("system")