diff --git a/app/controllers/admin/comments_controller.rb b/app/controllers/admin/comments_controller.rb index 4c385b5d4..49dbc2889 100644 --- a/app/controllers/admin/comments_controller.rb +++ b/app/controllers/admin/comments_controller.rb @@ -1,7 +1,7 @@ class Admin::CommentsController < Admin::BaseController def index - @comments = Comment.only_hidden + @comments = Comment.only_hidden.page(params[:page]) end def restore diff --git a/app/controllers/admin/debates_controller.rb b/app/controllers/admin/debates_controller.rb index a37744f71..9f2f21f62 100644 --- a/app/controllers/admin/debates_controller.rb +++ b/app/controllers/admin/debates_controller.rb @@ -1,7 +1,7 @@ class Admin::DebatesController < Admin::BaseController def index - @debates = Debate.only_hidden + @debates = Debate.only_hidden.page(params[:page]) end def show diff --git a/app/controllers/admin/organizations_controller.rb b/app/controllers/admin/organizations_controller.rb index c7e3c159c..19003ad3a 100644 --- a/app/controllers/admin/organizations_controller.rb +++ b/app/controllers/admin/organizations_controller.rb @@ -6,17 +6,17 @@ class Admin::OrganizationsController < Admin::BaseController def index @organizations = @organizations.send(@filter) - @organizations = @organizations.includes(:user).order(:name, 'users.email') + @organizations = @organizations.includes(:user).order(:name, 'users.email').page(params[:page]) end def verify @organization.verify - redirect_to action: :index, filter: @filter + redirect_to request.query_parameters.merge(action: :index) end def reject @organization.reject - redirect_to action: :index, filter: @filter + redirect_to request.query_parameters.merge(action: :index) end private diff --git a/app/controllers/admin/tags_controller.rb b/app/controllers/admin/tags_controller.rb index 03cfeb64f..5655b0f8a 100644 --- a/app/controllers/admin/tags_controller.rb +++ b/app/controllers/admin/tags_controller.rb @@ -4,7 +4,7 @@ class Admin::TagsController < Admin::BaseController respond_to :html, :js def index - @tags = ActsAsTaggableOn::Tag.order(featured: :desc) + @tags = ActsAsTaggableOn::Tag.order(featured: :desc).page(params[:page]) @tag = ActsAsTaggableOn::Tag.new end diff --git a/app/controllers/debates_controller.rb b/app/controllers/debates_controller.rb index 4f56b45ab..c30f02233 100644 --- a/app/controllers/debates_controller.rb +++ b/app/controllers/debates_controller.rb @@ -5,13 +5,13 @@ class DebatesController < ApplicationController respond_to :html, :js def index - @debates = Debate.includes(:tags).search(params) + @debates = Debate.includes(:tags).search(params).page(params[:page]) set_debate_votes(@debates) end def show set_debate_votes(@debate) - @comments = @debate.root_comments.with_hidden.recent + @comments = @debate.root_comments.with_hidden.recent.page(params[:page]) end def new diff --git a/app/models/debate.rb b/app/models/debate.rb index 7d39384d5..bd7936e73 100644 --- a/app/models/debate.rb +++ b/app/models/debate.rb @@ -1,7 +1,7 @@ require 'numeric' class Debate < ActiveRecord::Base include ActsAsParanoidAliases - default_scope { order('created_at DESC') } + default_scope { order(created_at: :desc) } apply_simple_captcha TITLE_LENGTH = Debate.columns.find { |c| c.name == 'title' }.limit diff --git a/app/views/admin/comments/index.html.erb b/app/views/admin/comments/index.html.erb index c8c7faa8e..5a0b8f967 100644 --- a/app/views/admin/comments/index.html.erb +++ b/app/views/admin/comments/index.html.erb @@ -1,5 +1,7 @@
+ <%= t('admin.organizations.index.filter') %>: -
- <%= t('admin.organizations.index.filter') %>: - - <% @valid_filters.each do |filter| %> - <% if @filter == filter %> - <%= t("admin.organizations.index.filters.#{filter}") %> - <% else %> - <%= link_to t("admin.organizations.index.filters.#{filter}"), - admin_organizations_path(filter: filter) %> - <% end %> + <% @valid_filters.each do |filter| %> + <% if @filter == filter %> + <%= t("admin.organizations.index.filters.#{filter}") %> + <% else %> + <%= link_to t("admin.organizations.index.filters.#{filter}"), + admin_organizations_path(filter: filter) %> <% end %> -
- -| <%= organization.name %> | -<%= organization.email %> | -<%= organization.phone_number %> | - <% if organization.verified? %> -<%= t('admin.organizations.index.verified') %> | - <% end %> - <% if can? :verify, organization %> -<%= link_to t('admin.organizations.index.verify'), - verify_admin_organization_path(organization, filter: @filter), - method: :put - %> - | - <% end %> - <% if organization.rejected? %> -<%= t('admin.organizations.index.rejected') %> | - <% end %> - <% if can? :reject, organization %> -<%= link_to t('admin.organizations.index.reject'), - reject_admin_organization_path(organization, filter: @filter), - method: :put - %> - | - <% end %> -
| <%= organization.name %> | +<%= organization.email %> | +<%= organization.phone_number %> | + <% if organization.verified? %> +<%= t('admin.organizations.index.verified') %> | + <% end %> + <% if can? :verify, organization %> +<%= link_to t('admin.organizations.index.verify'), + verify_admin_organization_path(organization, request.query_parameters), + method: :put + %> + | + <% end %> + <% if organization.rejected? %> +<%= t('admin.organizations.index.rejected') %> | + <% end %> + <% if can? :reject, organization %> +<%= link_to t('admin.organizations.index.reject'), + reject_admin_organization_path(organization, request.query_parameters), + method: :put + %> + | + <% end %> +