Browse Source

Upgraded from render file to render template (render file will be deprecated)

remotes/origin/master
echarp 2 years ago
parent
commit
e36e37c66c
  1. 4
      app/views/event_mailer/accept.text.haml
  2. 2
      app/views/event_mailer/destroy.text.haml
  3. 4
      app/views/event_mailer/update.text.haml
  4. 2
      app/views/events/cancel.html.haml
  5. 2
      app/views/events/edit.html.haml
  6. 2
      app/views/events/new.html.haml
  7. 2
      app/views/moderation_mailer/accept.text.haml
  8. 2
      app/views/moderation_mailer/create.text.haml
  9. 2
      app/views/moderation_mailer/destroy.text.haml
  10. 4
      app/views/moderation_mailer/update.text.haml
  11. 2
      app/views/moderationorga_mailer/accept.text.haml
  12. 2
      app/views/moderationorga_mailer/create.text.haml
  13. 2
      app/views/moderationorga_mailer/destroy.text.haml
  14. 4
      app/views/moderationorga_mailer/update.text.haml
  15. 2
      app/views/moderations/edit.html.haml
  16. 2
      app/views/moderations/index.html.haml
  17. 2
      app/views/moderations/refuse.html.haml
  18. 4
      app/views/moderations/validate.html.haml
  19. 8
      app/views/notes/new.html.haml
  20. 2
      app/views/orga_mailer/accept.text.haml
  21. 2
      app/views/orga_mailer/destroy.text.haml
  22. 4
      app/views/orga_mailer/update.text.haml
  23. 2
      app/views/orgas/cancel.html.haml
  24. 2
      app/views/orgas/validate.html.haml

4
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'

2
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'

4
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'

2
app/views/events/cancel.html.haml

@ -24,4 +24,4 @@
%fieldset
%legend= Event.model_name.human
= render file: '/events/show'
= render template: '/events/show'

2
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

2
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

2
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

2
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'

2
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'

4
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'

2
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

2
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'

2
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'

4
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'

2
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

2
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}",

2
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'

4
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'

8
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'

2
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

2
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'

4
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'

2
app/views/orgas/cancel.html.haml

@ -20,4 +20,4 @@
%fieldset
%legend= Orga.model_name.human
= render file: '/orgas/show'
= render template: '/orgas/show'

2
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'

Loading…
Cancel
Save