diff --git a/app/controllers/orgas_controller.rb b/app/controllers/orgas_controller.rb index 76b27a03..84bed9fb 100644 --- a/app/controllers/orgas_controller.rb +++ b/app/controllers/orgas_controller.rb @@ -9,8 +9,8 @@ class OrgasController < ApplicationController unless: :check_secret def index - @search = apply_scopes(Orga.moderated).includes(:kind, :region) - .search params[:q] + @unfiltered_orgas = apply_scopes(Orga.moderated).includes(:kind, :region) + @search = @unfiltered_orgas.search params[:q] @search.sorts = 'updated_at desc' if @search.sorts.empty? @orgas = @search.result.page params[:page] end diff --git a/app/views/orgas/_types.haml b/app/views/orgas/_types.haml index a243ed6d..ef28f53e 100644 --- a/app/views/orgas/_types.haml +++ b/app/views/orgas/_types.haml @@ -5,13 +5,13 @@ - Kind.all.each do |kind| - p[:kind_id_eq] = kind.id %li{ title: Kind.human_attribute_name("name_#{kind.name}") } - = link_to orgas_url(q: p) do + = link_to orgas_url(q: p, region: params[:region]) do %em.fa{ class: "fa-#{kind.icon}" } - = Orga.moderated.region(params[:region] || 'all').kind(kind).count + = @unfiltered_orgas.kind(kind).count %li - p[:kind_id_eq] = params[:q][:kind_id_eq] - p[:active_eq] = true - = link_to orgas_url(q: p) do + = link_to orgas_url(q: p, region: params[:region]) do %em.fa.fa-heartbeat - = Orga.moderated.active.region(params[:region] || 'all').count + = @unfiltered_orgas.active.count