From a14b32075e3107b812fc20d7be17975a0363aaed Mon Sep 17 00:00:00 2001 From: echarp Date: Fri, 19 Apr 2019 14:05:07 +0200 Subject: [PATCH] =?UTF-8?q?Removing=20the=20"libre=20en=20f=C3=AAte"=20flo?= =?UTF-8?q?wer=20from=20the=20main=20agenda=20display,=20to=20accelerate?= =?UTF-8?q?=20display?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/events_helper.rb | 3 +-- app/models/event.rb | 1 - app/views/events/_event.haml | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index edc43d58..eab6ac48 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -3,8 +3,7 @@ module EventsHelper def set_events_meta set_meta_tags \ description: t('layouts.application.subtitle'), - keywords: @events.map(&:tags).join(', ').split.group_by { |i| i } - .reject { |_k, v| v.size < 2 }.map { |k, _v| k }, + keywords: params[:tag], DC: { title: t('layouts.application.title'), subject: t('layouts.application.subtitle'), diff --git a/app/models/event.rb b/app/models/event.rb index eb3ad9ec..644e0d17 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -56,7 +56,6 @@ class Event < ApplicationRecord where '? <= end_time and start_time <= ?', start_date.to_date.beginning_of_month.beginning_of_week, start_date.to_date.end_of_month.end_of_week.end_of_day - includes :tags end) scope :period, (lambda do |year, week| start_date = Date.commercial(year.to_i, week.to_i) diff --git a/app/views/events/_event.haml b/app/views/events/_event.haml index 08cdc54b..39940796 100644 --- a/app/views/events/_event.haml +++ b/app/views/events/_event.haml @@ -1,8 +1,6 @@ %li.event{ title: display_date(event) } - if event.locality? %em.locality.fa.fa-globe - - if event.tags.any? { |t| t.name.include? 'libre-en-fete' } - = image_tag 'lef-small.png', alt: 'LEF', width: 16, height: 16 = link_to event do %strong.city{ title: event.address }= event.city = event.title