diff --git a/app/controllers/orgas_controller.rb b/app/controllers/orgas_controller.rb index 7bda9ce0..76b27a03 100644 --- a/app/controllers/orgas_controller.rb +++ b/app/controllers/orgas_controller.rb @@ -38,8 +38,6 @@ class OrgasController < ApplicationController end def show - @search = Orga.search params[:q] - @events_future = Event.moderated.future.tag @orga.name_as_tag @events_past = Event.moderated.past.tag @orga.name_as_tag end diff --git a/app/views/regions/index.html.haml b/app/views/regions/index.html.haml index 8b6b6d4a..8d65d189 100644 --- a/app/views/regions/index.html.haml +++ b/app/views/regions/index.html.haml @@ -9,14 +9,13 @@ %tr %th= link_to t(:all, scope: 'activerecord.attributes.region.name_values'), root_path - %th= link_to 'RSS', events_path(format: :rss, region: :all) + %th= link_to 'RSS', events_path(format: :rss) %th= link_to :webcal, - events_path(protocol: :webcal, format: :ics, region: :all, - only_path: false) + events_path(protocol: :webcal, format: :ics, only_path: false) %th= link_to :iCal, - events_path(format: :ics, region: :all, only_path: false) + events_path(format: :ics, only_path: false) %th= link_to :GeoJSON, - maps_path(format: :json, region: :all, only_path: false) + maps_path(format: :json, only_path: false) %tbody - @regions.find_each do |region| diff --git a/app/views/versions/index.rss.builder b/app/views/versions/index.rss.builder index cf7e42ed..fae64c19 100644 --- a/app/views/versions/index.rss.builder +++ b/app/views/versions/index.rss.builder @@ -3,7 +3,7 @@ Differ.format = Differ::Format::Patch def gen_title t 'layouts.application.title' + - if params[:region].present? && params[:region] != 'all' + if params[:region].present? region = Region.find(params[:region]).name " [#{region}]" else diff --git a/test/controllers/orgas_controller_test.rb b/test/controllers/orgas_controller_test.rb index 146fdbe7..570fac19 100644 --- a/test/controllers/orgas_controller_test.rb +++ b/test/controllers/orgas_controller_test.rb @@ -47,6 +47,7 @@ class OrgasControllerTest < ActionController::TestCase kind_id: @orga.kind_id, name: @orga.name, region_id: @orga.region.id, + description: @orga.description, url: @orga.url }