consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Uses has_filters in all controllers with filters & renames @filter to @current_filter

Browse Source
This commit is contained in:
kikito
2015-09-02 13:21:46 +02:00
parent 83d08b0017
commit ebacc8c9c7
13 changed files with 26 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/controllers/admin/comments_controller.rb
View File

@@ -1,11 +1,11 @@
class Admin::CommentsController < Admin::BaseController class Admin::CommentsController < Admin::BaseController
before_filter :set_valid_filters, only: :index
before_filter :parse_filter, only: :index has_filters %w{all with_confirmed_hide}
before_filter :load_comment, only: [:confirm_hide, :restore] before_filter :load_comment, only: [:confirm_hide, :restore]
def index def index
@comments = Comment.only_hidden.send(@filter).page(params[:page]) @comments = Comment.only_hidden.send(@current_filter).page(params[:page])
end end
def confirm_hide def confirm_hide
@@ -23,13 +23,4 @@ class Admin::CommentsController < Admin::BaseController
@comment = Comment.with_hidden.find(params[:id]) @comment = Comment.with_hidden.find(params[:id])
end end
def set_valid_filters
@valid_filters = %w{all with_confirmed_hide}
end
def parse_filter
@filter = params[:filter]
@filter = 'all' unless @valid_filters.include?(@filter)
end
end end

14
app/controllers/admin/debates_controller.rb
View File

@@ -1,11 +1,10 @@
class Admin::DebatesController < Admin::BaseController class Admin::DebatesController < Admin::BaseController
before_filter :set_valid_filters, only: :index has_filters %w{all with_confirmed_hide}, only: :index
before_filter :parse_filter, only: :index
before_filter :load_debate, only: [:confirm_hide, :restore] before_filter :load_debate, only: [:confirm_hide, :restore]
def index def index
@debates = Debate.only_hidden.send(@filter).page(params[:page]) @debates = Debate.only_hidden.send(@current_filter).page(params[:page])
end end
def confirm_hide def confirm_hide
@@ -24,13 +23,4 @@ class Admin::DebatesController < Admin::BaseController
@debate = Debate.with_hidden.find(params[:id]) @debate = Debate.with_hidden.find(params[:id])
end end
def set_valid_filters
@valid_filters = %w{all with_confirmed_hide}
end
def parse_filter
@filter = params[:filter]
@filter = 'all' unless @valid_filters.include?(@filter)
end
end end

16
app/controllers/admin/organizations_controller.rb
View File

@@ -1,11 +1,11 @@
class Admin::OrganizationsController < Admin::BaseController class Admin::OrganizationsController < Admin::BaseController
before_filter :set_valid_filters, only: :index
before_filter :parse_filter, only: :index has_filters %w{all pending verified rejected}, only: :index
load_and_authorize_resource except: :search load_and_authorize_resource except: :search
def index def index
@organizations = @organizations.send(@filter) @organizations = @organizations.send(@current_filter)
@organizations = @organizations.includes(:user).order(:name, 'users.email').page(params[:page]) @organizations = @organizations.includes(:user).order(:name, 'users.email').page(params[:page])
end end
@@ -23,14 +23,4 @@ class Admin::OrganizationsController < Admin::BaseController
redirect_to request.query_parameters.merge(action: :index) redirect_to request.query_parameters.merge(action: :index)
end end
private
def set_valid_filters
@valid_filters = %w{all pending verified rejected}
end
def parse_filter
@filter = params[:filter]
@filter = 'all' unless @valid_filters.include?(@filter)
end
end end

15
app/controllers/admin/users_controller.rb
View File

@@ -1,11 +1,11 @@
class Admin::UsersController < Admin::BaseController class Admin::UsersController < Admin::BaseController
before_filter :set_valid_filters, only: :index
before_filter :parse_filter, only: :index has_filters %w{all with_confirmed_hide}, only: :index
before_filter :load_user, only: [:confirm_hide, :restore] before_filter :load_user, only: [:confirm_hide, :restore]
def index def index
@users = User.only_hidden.send(@filter).page(params[:page]) @users = User.only_hidden.send(@current_filter).page(params[:page])
end end
def show def show
@@ -30,13 +30,4 @@ class Admin::UsersController < Admin::BaseController
@user = User.with_hidden.find(params[:id]) @user = User.with_hidden.find(params[:id])
end end
def set_valid_filters
@valid_filters = %w{all with_confirmed_hide}
end
def parse_filter
@filter = params[:filter]
@filter = 'all' unless @valid_filters.include?(@filter)
end
end end

2
app/controllers/application_controller.rb
View File

@@ -1,6 +1,8 @@
require "application_responder" require "application_responder"
class ApplicationController < ActionController::Base class ApplicationController < ActionController::Base
include HasFilters
before_filter :authenticate_http_basic before_filter :authenticate_http_basic
before_filter :authenticate_user!, unless: :devise_controller?, if: :beta_site? before_filter :authenticate_user!, unless: :devise_controller?, if: :beta_site?

15
app/controllers/moderation/comments_controller.rb
View File

@@ -1,12 +1,12 @@
class Moderation::CommentsController < Moderation::BaseController class Moderation::CommentsController < Moderation::BaseController
before_filter :set_valid_filters, only: :index
before_filter :parse_filter, only: :index has_filters %w{all pending_flag_review with_ignored_flag}, only: :index
before_filter :load_comments, only: :index before_filter :load_comments, only: :index
load_and_authorize_resource load_and_authorize_resource
def index def index
@comments = @comments.send(@filter) @comments = @comments.send(@current_filter)
@comments = @comments.page(params[:page]) @comments = @comments.page(params[:page])
end end
@@ -30,13 +30,4 @@ class Moderation::CommentsController < Moderation::BaseController
@comments = Comment.accessible_by(current_ability, :hide).flagged.sorted_for_moderation.includes(:commentable) @comments = Comment.accessible_by(current_ability, :hide).flagged.sorted_for_moderation.includes(:commentable)
end end
def set_valid_filters
@valid_filters = %w{all pending_flag_review with_ignored_flag}
end
def parse_filter
@filter = params[:filter]
@filter = 'all' unless @valid_filters.include?(@filter)
end
end end

17
app/controllers/moderation/debates_controller.rb
View File

@@ -1,13 +1,13 @@
class Moderation::DebatesController < Moderation::BaseController class Moderation::DebatesController < Moderation::BaseController
before_filter :set_valid_filters, only: :index
before_filter :parse_filter, only: :index has_filters %w{all pending_flag_review with_ignored_flag}, only: :index
before_filter :load_debates, only: :index before_filter :load_debates, only: :index
load_and_authorize_resource load_and_authorize_resource
def index def index
@debates = @debates.send(@filter) @debates = @debates.send(@current_filter).page(params[:page])
@debates = @debates.page(params[:page])
end end
def hide def hide
@@ -30,13 +30,4 @@ class Moderation::DebatesController < Moderation::BaseController
@debates = Debate.accessible_by(current_ability, :hide).flagged.sorted_for_moderation @debates = Debate.accessible_by(current_ability, :hide).flagged.sorted_for_moderation
end end
def set_valid_filters
@valid_filters = %w{all pending_flag_review with_ignored_flag}
end
def parse_filter
@filter = params[:filter]
@filter = 'all' unless @valid_filters.include?(@filter)
end
end end

2
app/views/admin/comments/index.html.erb
View File

@@ -4,7 +4,7 @@
<dt><%= t("admin.comments.index.filter") %>:</dt> <dt><%= t("admin.comments.index.filter") %>:</dt>
<% @valid_filters.each do |filter| %> <% @valid_filters.each do |filter| %>
<% if @filter == filter %> <% if @current_filter == filter %>
<dd class="active"><%= t("admin.comments.index.filters.#{filter}") %></dd> <dd class="active"><%= t("admin.comments.index.filters.#{filter}") %></dd>
<% else %> <% else %>
<dd><%= link_to t("admin.comments.index.filters.#{filter}"), <dd><%= link_to t("admin.comments.index.filters.#{filter}"),

2
app/views/admin/debates/index.html.erb
View File

@@ -4,7 +4,7 @@
<dt><%= t("admin.debates.index.filter") %>:</dt> <dt><%= t("admin.debates.index.filter") %>:</dt>
<% @valid_filters.each do |filter| %> <% @valid_filters.each do |filter| %>
<% if @filter == filter %> <% if @current_filter == filter %>
<dd class="active"><%= t("admin.debates.index.filters.#{filter}") %></dd> <dd class="active"><%= t("admin.debates.index.filters.#{filter}") %></dd>
<% else %> <% else %>
<dd><%= link_to t("admin.debates.index.filters.#{filter}"), <dd><%= link_to t("admin.debates.index.filters.#{filter}"),

2
app/views/admin/organizations/index.html.erb
View File

@@ -17,7 +17,7 @@
<dt><%= t("admin.organizations.index.filter") %>:</dt> <dt><%= t("admin.organizations.index.filter") %>:</dt>
<% @valid_filters.each do |filter| %> <% @valid_filters.each do |filter| %>
<% if @filter == filter %> <% if @current_filter == filter %>
<dd class="active"><%= t("admin.organizations.index.filters.#{filter}") %></dd> <dd class="active"><%= t("admin.organizations.index.filters.#{filter}") %></dd>
<% else %> <% else %>
<dd><%= link_to t("admin.organizations.index.filters.#{filter}"), <dd><%= link_to t("admin.organizations.index.filters.#{filter}"),

2
app/views/admin/users/index.html.erb
View File

@@ -4,7 +4,7 @@
<dt><%= t("admin.users.index.filter") %>:</dt> <dt><%= t("admin.users.index.filter") %>:</dt>
<% @valid_filters.each do |filter| %> <% @valid_filters.each do |filter| %>
<% if @filter == filter %> <% if @current_filter == filter %>
<dd class="active"><%= t("admin.users.index.filters.#{filter}") %></dd> <dd class="active"><%= t("admin.users.index.filters.#{filter}") %></dd>
<% else %> <% else %>
<dd><%= link_to t("admin.users.index.filters.#{filter}"), <dd><%= link_to t("admin.users.index.filters.#{filter}"),

2
app/views/moderation/comments/index.html.erb
View File

@@ -4,7 +4,7 @@
<dt><%= t("moderation.comments.index.filter") %>:</dt> <dt><%= t("moderation.comments.index.filter") %>:</dt>
<% @valid_filters.each do |filter| %> <% @valid_filters.each do |filter| %>
<% if @filter == filter %> <% if @current_filter == filter %>
<dd class="active"><%= t("moderation.comments.index.filters.#{filter}") %></dd> <dd class="active"><%= t("moderation.comments.index.filters.#{filter}") %></dd>
<% else %> <% else %>
<dd><%= link_to t("moderation.comments.index.filters.#{filter}"), <dd><%= link_to t("moderation.comments.index.filters.#{filter}"),

2
app/views/moderation/debates/index.html.erb
View File

@@ -4,7 +4,7 @@
<dt><%= t("moderation.debates.index.filter") %>:</dt> <dt><%= t("moderation.debates.index.filter") %>:</dt>
<% @valid_filters.each do |filter| %> <% @valid_filters.each do |filter| %>
<% if @filter == filter %> <% if @current_filter == filter %>
<dd class="active"><%= t("moderation.debates.index.filters.#{filter}") %></dd> <dd class="active"><%= t("moderation.debates.index.filters.#{filter}") %></dd>
<% else %> <% else %>
<dd><%= link_to t("moderation.debates.index.filters.#{filter}"), <dd><%= link_to t("moderation.debates.index.filters.#{filter}"),