From 3387a38bda0f50c0cc2ed73145b452ccc58cd549 Mon Sep 17 00:00:00 2001 From: echarp Date: Thu, 22 Oct 2015 22:03:18 +0200 Subject: [PATCH] The link between events and organisations is not based on a "tagified" orga's name. Space, quote and asterisk are replaced with a dash. Colons are removed. Close #3 --- app/controllers/orgas_controller.rb | 4 ++-- app/models/orga.rb | 4 ++++ app/views/orgas/show.html.haml | 5 +++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/controllers/orgas_controller.rb b/app/controllers/orgas_controller.rb index b588d296..6facc582 100644 --- a/app/controllers/orgas_controller.rb +++ b/app/controllers/orgas_controller.rb @@ -37,8 +37,8 @@ class OrgasController < ApplicationController def show @search = Orga.search params[:q] - @events_future = Event.moderated.future.tag @orga.name - @events_past = Event.moderated.past.tag @orga.name + @events_future = Event.moderated.future.tag @orga.name_as_tag + @events_past = Event.moderated.past.tag @orga.name_as_tag end # PATCH/PUT /orgas/1 diff --git a/app/models/orga.rb b/app/models/orga.rb index b1570622..6ee28bc5 100644 --- a/app/models/orga.rb +++ b/app/models/orga.rb @@ -45,4 +45,8 @@ class Orga < ActiveRecord::Base def send_secret OrgaMailer.create(self).deliver_now! end + + def name_as_tag + name.gsub(/[\s\*']/, '-').delete ':' + end end diff --git a/app/views/orgas/show.html.haml b/app/views/orgas/show.html.haml index f85528cf..fd208da9 100644 --- a/app/views/orgas/show.html.haml +++ b/app/views/orgas/show.html.haml @@ -96,5 +96,6 @@ %dt= t '.past' %dd= t '.count', count: @events_past.count -.events#map{ data: { url: maps_path(format: :json, tag: @orga.name, - future: false) } } +.events#map{ title: @orga.name_as_tag, + data: { url: maps_path(format: :json, tag: @orga.name_as_tag, + future: false) } }