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

fixes to user search

Browse Source
This commit is contained in:
albert
2013-02-21 12:42:41 -05:00
parent 762bbd2caf
commit 78f1d0f69a
24 changed files with 48 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/advertisements_controller.rb
View File

@@ -13,7 +13,7 @@ class AdvertisementsController < ApplicationController
end
def index
@advertisements = Advertisement.all
@advertisements = Advertisement.order("id desc").all
@start_date = 1.month.ago.to_date
@end_date = Date.today
end

2
app/controllers/artist_versions_controller.rb
View File

@@ -2,7 +2,7 @@ class ArtistVersionsController < ApplicationController
respond_to :html, :xml, :json
def index
@artist_versions = ArtistVersion.search(params[:search]).paginate(params[:page])
@artist_versions = ArtistVersion.search(params[:search]).order("id desc").paginate(params[:page])
respond_with(@artist_versions)
end
end

2
app/controllers/artists_controller.rb
View File

@@ -18,7 +18,7 @@ class ArtistsController < ApplicationController
end
def index
@artists = Artist.search(params[:search]).paginate(params[:page])
@artists = Artist.search(params[:search]).order("id desc").paginate(params[:page])
respond_with(@artists) do |format|
format.xml do
render :xml => @artists.to_xml(:include => [:urls])

2
app/controllers/bans_controller.rb
View File

@@ -10,7 +10,7 @@ class BansController < ApplicationController
end
def index
@search = Ban.search(params[:search])
@search = Ban.search(params[:search]).order("id desc")
@bans = @search.paginate(params[:page])
end

2
app/controllers/dmails_controller.rb
View File

@@ -15,7 +15,7 @@ class DmailsController < ApplicationController
def index
@search = Dmail.visible.search(params[:search])
@dmails = @search.paginate(params[:page]).order("dmails.created_at desc")
@dmails = @search.order("dmails.created_at desc").paginate(params[:page])
respond_with(@dmails)
end

2
app/controllers/forum_posts_controller.rb
View File

@@ -17,7 +17,7 @@ class ForumPostsController < ApplicationController
def index
@search = ForumPost.active.search(params[:search])
@forum_posts = @search.paginate(params[:page]).order("forum_posts.id DESC")
@forum_posts = @search.order("forum_posts.id DESC").paginate(params[:page])
respond_with(@forum_posts)
end

2
app/controllers/forum_topics_controller.rb
View File

@@ -19,7 +19,7 @@ class ForumTopicsController < ApplicationController
def index
@search = ForumTopic.active.search(params[:search])
@forum_topics = @search.paginate(params[:page]).order("is_sticky DESC, updated_at DESC")
@forum_topics = @search.order("is_sticky DESC, updated_at DESC").paginate(params[:page])
respond_with(@forum_topics)
end

2
app/controllers/ip_bans_controller.rb
View File

@@ -12,7 +12,7 @@ class IpBansController < ApplicationController
def index
@search = IpBan.search(params[:search])
@ip_bans = @search.paginate(params[:page])
@ip_bans = @search.order("id desc").paginate(params[:page])
end
def destroy

2
app/controllers/janitor_trials_controller.rb
View File

@@ -14,7 +14,7 @@ class JanitorTrialsController < ApplicationController
def index
@search = JanitorTrial.search(params[:search])
@janitor_trials = @search.paginate(params[:page])
@janitor_trials = @search.order("id desc").paginate(params[:page])
respond_with(@janitor_trials)
end

2
app/controllers/news_updates_controller.rb
View File

@@ -3,7 +3,7 @@ class NewsUpdatesController < ApplicationController
respond_to :html
def index
@news_updates = NewsUpdate.paginate(params[:page])
@news_updates = NewsUpdate.order("id desc").paginate(params[:page])
respond_with(@news_updates)
end

2
app/controllers/notes_controller.rb
View File

@@ -64,7 +64,7 @@ private
def index_by_note
@search = Note.search(params[:search])
@notes = @search.paginate(params[:page])
@notes = @search.order("id desc").paginate(params[:page])
respond_with(@notes) do |format|
format.html {render :action => "index_by_note"}
end

2
app/controllers/pools_controller.rb
View File

@@ -16,7 +16,7 @@ class PoolsController < ApplicationController
def index
@search = Pool.active.search(params[:search])
@pools = @search.paginate(params[:page]).order("updated_at desc")
@pools = @search.order("updated_at desc").paginate(params[:page])
respond_with(@pools)
end

2
app/controllers/post_appeals_controller.rb
View File

@@ -9,7 +9,7 @@ class PostAppealsController < ApplicationController
end
def index
@search = PostAppeal.search(params[:search]).order("id desc")
@search = PostAppeal.order("id desc").search(params[:search])
@post_appeals = @search.paginate(params[:page])
end

2
app/controllers/post_flags_controller.rb
View File

@@ -9,7 +9,7 @@ class PostFlagsController < ApplicationController
end
def index
@search = PostFlag.search(params[:search]).order("id desc")
@search = PostFlag.order("id desc").search(params[:search])
@post_flags = @search.paginate(params[:page])
end

2
app/controllers/tag_subscriptions_controller.rb
View File

@@ -16,7 +16,7 @@ class TagSubscriptionsController < ApplicationController
def index
@user = CurrentUser.user
@search = TagSubscription.owned_by(@user).search(params[:search])
@search = TagSubscription.owned_by(@user).order("name").search(params[:search])
@tag_subscriptions = @search.paginate(params[:page])
respond_with(@tag_subscriptions)
end

2
app/controllers/users_controller.rb
View File

@@ -16,7 +16,7 @@ class UsersController < ApplicationController
def index
@search = User.search(params[:search])
@users = @search.paginate(params[:page]).order("users.name")
@users = @search.order("users.id desc").paginate(params[:page])
respond_with(@users)
end

2
app/controllers/wiki_page_versions_controller.rb
View File

@@ -3,7 +3,7 @@ class WikiPageVersionsController < ApplicationController
def index
@search = WikiPageVersion.search(params[:search])
@wiki_page_versions = @search.paginate(params[:page])
@wiki_page_versions = @search.order("id desc").paginate(params[:page])
respond_with(@wiki_page_versions)
end

2
app/controllers/wiki_pages_controller.rb
View File

@@ -16,7 +16,7 @@ class WikiPagesController < ApplicationController
def index
@search = WikiPage.search(params[:search])
@wiki_pages = @search.paginate(params[:page])
@wiki_pages = @search.order("id desc").paginate(params[:page])
respond_with(@wiki_pages) do |format|
format.html do
if @wiki_pages.count == 1