From e36e37c66ca086c866139a05a1a352abbd370484 Mon Sep 17 00:00:00 2001 From: echarp Date: Sun, 17 Nov 2019 12:56:11 +0100 Subject: [PATCH] Upgraded from render file to render template (render file will be deprecated) --- app/views/event_mailer/accept.text.haml | 4 ++-- app/views/event_mailer/destroy.text.haml | 2 +- app/views/event_mailer/update.text.haml | 4 ++-- app/views/events/cancel.html.haml | 2 +- app/views/events/edit.html.haml | 2 +- app/views/events/new.html.haml | 2 +- app/views/moderation_mailer/accept.text.haml | 2 +- app/views/moderation_mailer/create.text.haml | 2 +- app/views/moderation_mailer/destroy.text.haml | 2 +- app/views/moderation_mailer/update.text.haml | 4 ++-- app/views/moderationorga_mailer/accept.text.haml | 2 +- app/views/moderationorga_mailer/create.text.haml | 2 +- app/views/moderationorga_mailer/destroy.text.haml | 2 +- app/views/moderationorga_mailer/update.text.haml | 4 ++-- app/views/moderations/edit.html.haml | 2 +- app/views/moderations/index.html.haml | 2 +- app/views/moderations/refuse.html.haml | 2 +- app/views/moderations/validate.html.haml | 4 ++-- app/views/notes/new.html.haml | 8 ++++---- app/views/orga_mailer/accept.text.haml | 2 +- app/views/orga_mailer/destroy.text.haml | 2 +- app/views/orga_mailer/update.text.haml | 4 ++-- app/views/orgas/cancel.html.haml | 2 +- app/views/orgas/validate.html.haml | 2 +- 24 files changed, 33 insertions(+), 33 deletions(-) diff --git a/app/views/event_mailer/accept.text.haml b/app/views/event_mailer/accept.text.haml index 443affb7..dd816c2d 100644 --- a/app/views/event_mailer/accept.text.haml +++ b/app/views/event_mailer/accept.text.haml @@ -10,7 +10,7 @@ = surround '<'.html_safe, '>'.html_safe do = cancel_event_url @event, secret: @event.secret \ -- if @event.repeat > 0 && !@event.event_id +- if @event.repeat.positive? && !@event.event_id = t '.repeat_helper', count: @event.repeat - @event.events.each do |e| = e @@ -20,6 +20,6 @@ = cancel_event_url e, secret: e.secret \ != t '.reminder' -= render file: '/events/show' += render template: '/events/show' \ != t '.signature' diff --git a/app/views/event_mailer/destroy.text.haml b/app/views/event_mailer/destroy.text.haml index f28f122e..dbcb7f3b 100644 --- a/app/views/event_mailer/destroy.text.haml +++ b/app/views/event_mailer/destroy.text.haml @@ -5,6 +5,6 @@ != t '.reclamation' \ != t '.reminder' -= render file: '/events/show' += render template: '/events/show' \ != t '.signature' diff --git a/app/views/event_mailer/update.text.haml b/app/views/event_mailer/update.text.haml index 8e59c7c4..841b5f1e 100644 --- a/app/views/event_mailer/update.text.haml +++ b/app/views/event_mailer/update.text.haml @@ -1,12 +1,12 @@ != t '.body', subject: @event.title, author: @current_user || t('.submitter') :ruby - new = render file: '/events/show' + new = render template: '/events/show' former = @event @event = @event.paper_trail.previous_version || @event - prev = render file: '/events/show' + prev = render template: '/events/show' @event = former require 'differ/format/patch' diff --git a/app/views/events/cancel.html.haml b/app/views/events/cancel.html.haml index 16b6a81c..3eb32ba5 100644 --- a/app/views/events/cancel.html.haml +++ b/app/views/events/cancel.html.haml @@ -24,4 +24,4 @@ %fieldset %legend= Event.model_name.human - = render file: '/events/show' + = render template: '/events/show' diff --git a/app/views/events/edit.html.haml b/app/views/events/edit.html.haml index a81fded0..5b67bd5a 100644 --- a/app/views/events/edit.html.haml +++ b/app/views/events/edit.html.haml @@ -11,7 +11,7 @@ %legend %em.fa.fa-eye = t '.preview' - = render file: '/events/show' + = render template: '/events/show' %fieldset %legend diff --git a/app/views/events/new.html.haml b/app/views/events/new.html.haml index 3f141a6f..cd21465a 100644 --- a/app/views/events/new.html.haml +++ b/app/views/events/new.html.haml @@ -7,7 +7,7 @@ %legend %em.fa.fa-eye = t '.preview' - = render file: '/events/show' + = render template: '/events/show' - else :markdown diff --git a/app/views/moderation_mailer/accept.text.haml b/app/views/moderation_mailer/accept.text.haml index 9b408254..ddd70946 100644 --- a/app/views/moderation_mailer/accept.text.haml +++ b/app/views/moderation_mailer/accept.text.haml @@ -1,7 +1,7 @@ != t '.body', author: @current_user \ != t '.reminder' -= render file: '/events/show' += render template: '/events/show' \ != t '.access' = surround '<'.html_safe, '>'.html_safe do diff --git a/app/views/moderation_mailer/create.text.haml b/app/views/moderation_mailer/create.text.haml index 7267d199..8da33149 100644 --- a/app/views/moderation_mailer/create.text.haml +++ b/app/views/moderation_mailer/create.text.haml @@ -3,6 +3,6 @@ = surround '<'.html_safe, '>'.html_safe do = moderations_url \ -= render file: '/events/show' += render template: '/events/show' \ != t '.signature' diff --git a/app/views/moderation_mailer/destroy.text.haml b/app/views/moderation_mailer/destroy.text.haml index 984dee06..1fbdafb4 100644 --- a/app/views/moderation_mailer/destroy.text.haml +++ b/app/views/moderation_mailer/destroy.text.haml @@ -3,6 +3,6 @@ = @event.reason \ != t '.reminder' -= render file: '/events/show' += render template: '/events/show' \ != t '.signature' diff --git a/app/views/moderation_mailer/update.text.haml b/app/views/moderation_mailer/update.text.haml index 99ac5568..b850299d 100644 --- a/app/views/moderation_mailer/update.text.haml +++ b/app/views/moderation_mailer/update.text.haml @@ -1,12 +1,12 @@ != t '.body', subject: @event.title, author: @current_user || t('.submitter') :ruby - new = render file: '/events/show' + new = render template: '/events/show' former = @event @event = @event.paper_trail.previous_version || @event - prev = render file: '/events/show' + prev = render template: '/events/show' @event = former require 'differ/format/patch' diff --git a/app/views/moderationorga_mailer/accept.text.haml b/app/views/moderationorga_mailer/accept.text.haml index 5b40b2ee..0c7e3709 100644 --- a/app/views/moderationorga_mailer/accept.text.haml +++ b/app/views/moderationorga_mailer/accept.text.haml @@ -1,7 +1,7 @@ != t '.body', author: @current_user \ != t '.reminder' -= render file: '/orgas/show' += render template: '/orgas/show' \ != t '.access' = surround '<'.html_safe, '>'.html_safe do diff --git a/app/views/moderationorga_mailer/create.text.haml b/app/views/moderationorga_mailer/create.text.haml index 6d67be81..faca740c 100644 --- a/app/views/moderationorga_mailer/create.text.haml +++ b/app/views/moderationorga_mailer/create.text.haml @@ -2,6 +2,6 @@ = surround '<'.html_safe, '>'.html_safe do = moderations_url \ -= render file: '/orgas/show' += render template: '/orgas/show' \ != t '.signature' diff --git a/app/views/moderationorga_mailer/destroy.text.haml b/app/views/moderationorga_mailer/destroy.text.haml index 95c4d17b..016ca44b 100644 --- a/app/views/moderationorga_mailer/destroy.text.haml +++ b/app/views/moderationorga_mailer/destroy.text.haml @@ -1,6 +1,6 @@ != t '.body', subject: @orga.name, author: @current_user \ != t '.reminder' -= render file: '/orgas/show' += render template: '/orgas/show' \ != t '.signature' diff --git a/app/views/moderationorga_mailer/update.text.haml b/app/views/moderationorga_mailer/update.text.haml index 9a686d09..3bb6e0ea 100644 --- a/app/views/moderationorga_mailer/update.text.haml +++ b/app/views/moderationorga_mailer/update.text.haml @@ -1,12 +1,12 @@ != t '.body', subject: @orga.name, author: @current_user || t('.submitter') :ruby - new = render file: '/orgas/show' + new = render template: '/orgas/show' former = @orga @orga = @orga.paper_trail.previous_version || @orga - prev = render file: '/orgas/show' + prev = render template: '/orgas/show' @orga = former require 'differ/format/patch' diff --git a/app/views/moderations/edit.html.haml b/app/views/moderations/edit.html.haml index 3f76ec97..97a5b75b 100644 --- a/app/views/moderations/edit.html.haml +++ b/app/views/moderations/edit.html.haml @@ -11,7 +11,7 @@ %legend %em.fa.fa-eye = t '.preview' - = render file: '/events/show' + = render template: '/events/show' %fieldset %legend diff --git a/app/views/moderations/index.html.haml b/app/views/moderations/index.html.haml index 5254d76b..1751cd95 100644 --- a/app/views/moderations/index.html.haml +++ b/app/views/moderations/index.html.haml @@ -82,7 +82,7 @@ %tr %td.empty/ %td.note(colspan="5") - = raw note.contents + = note.contents %em.author = t '.posted_by', author: "#{note.author.firstname} #{note.author.lastname}", diff --git a/app/views/moderations/refuse.html.haml b/app/views/moderations/refuse.html.haml index e4b9af78..b849c809 100644 --- a/app/views/moderations/refuse.html.haml +++ b/app/views/moderations/refuse.html.haml @@ -36,4 +36,4 @@ %legend %em.fa.fa-calendar = Event.model_name.human - = render file: '/events/show' + = render template: '/events/show' diff --git a/app/views/moderations/validate.html.haml b/app/views/moderations/validate.html.haml index 290b63d9..199f9164 100644 --- a/app/views/moderations/validate.html.haml +++ b/app/views/moderations/validate.html.haml @@ -25,7 +25,7 @@ = @event.to_tweet -- if @event.repeat > 0 +- if @event.repeat.positive? %fieldset %legend %em.fa.fa-repeat @@ -41,4 +41,4 @@ %legend %em.fa.fa-calendar = Event.model_name.human - = render file: '/events/show' + = render template: '/events/show' diff --git a/app/views/notes/new.html.haml b/app/views/notes/new.html.haml index 0ffdaaf4..e9f93c18 100644 --- a/app/views/notes/new.html.haml +++ b/app/views/notes/new.html.haml @@ -3,12 +3,12 @@ %em.fa.fa-bullhorn - else %em.fa.fa-paperclip - =t '.title' + = t '.title' %fieldset - %legend=t '.title' + %legend= t '.title' = render 'form' %fieldset - %legend=t '.event' - = render file: '/events/show' + %legend= t '.event' + = render template: '/events/show' diff --git a/app/views/orga_mailer/accept.text.haml b/app/views/orga_mailer/accept.text.haml index e4be0a49..09a34918 100644 --- a/app/views/orga_mailer/accept.text.haml +++ b/app/views/orga_mailer/accept.text.haml @@ -1,6 +1,6 @@ != t '.body', author: @current_user \ -= render file: '/orgas/show' += render template: '/orgas/show' \ != t '.access' = surround '<'.html_safe, '>'.html_safe do diff --git a/app/views/orga_mailer/destroy.text.haml b/app/views/orga_mailer/destroy.text.haml index c2d0b7ff..87818934 100644 --- a/app/views/orga_mailer/destroy.text.haml +++ b/app/views/orga_mailer/destroy.text.haml @@ -5,6 +5,6 @@ != t '.reclamation' \ != t '.reminder' -= render file: '/orgas/show' += render template: '/orgas/show' \ != t '.signature' diff --git a/app/views/orga_mailer/update.text.haml b/app/views/orga_mailer/update.text.haml index 42a94b72..606dd31f 100644 --- a/app/views/orga_mailer/update.text.haml +++ b/app/views/orga_mailer/update.text.haml @@ -1,12 +1,12 @@ != t '.body', subject: @orga.name, author: @current_user || t('.submitter') :ruby - new = render file: '/orgas/show' + new = render template: '/orgas/show' former = @orga @orga = @orga.paper_trail.previous_version - prev = render file: '/orgas/show' + prev = render template: '/orgas/show' @orga = former require 'differ/format/patch' diff --git a/app/views/orgas/cancel.html.haml b/app/views/orgas/cancel.html.haml index 88043cbd..2dd05e6a 100644 --- a/app/views/orgas/cancel.html.haml +++ b/app/views/orgas/cancel.html.haml @@ -20,4 +20,4 @@ %fieldset %legend= Orga.model_name.human - = render file: '/orgas/show' + = render template: '/orgas/show' diff --git a/app/views/orgas/validate.html.haml b/app/views/orgas/validate.html.haml index 08ab05ae..183c07b9 100644 --- a/app/views/orgas/validate.html.haml +++ b/app/views/orgas/validate.html.haml @@ -16,4 +16,4 @@ %legend %em.fa.fa-calendar = Orga.model_name.human - = render file: '/orgas/show' + = render template: '/orgas/show'