Upgraded from render file to render template (render file will be deprecated)
This commit is contained in:
parent
9d14d86eba
commit
e36e37c66c
|
@ -10,7 +10,7 @@
|
||||||
= surround '<'.html_safe, '>'.html_safe do
|
= surround '<'.html_safe, '>'.html_safe do
|
||||||
= cancel_event_url @event, secret: @event.secret
|
= 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
|
= t '.repeat_helper', count: @event.repeat
|
||||||
- @event.events.each do |e|
|
- @event.events.each do |e|
|
||||||
= e
|
= e
|
||||||
|
@ -20,6 +20,6 @@
|
||||||
= cancel_event_url e, secret: e.secret
|
= cancel_event_url e, secret: e.secret
|
||||||
\
|
\
|
||||||
!= t '.reminder'
|
!= t '.reminder'
|
||||||
= render file: '/events/show'
|
= render template: '/events/show'
|
||||||
\
|
\
|
||||||
!= t '.signature'
|
!= t '.signature'
|
||||||
|
|
|
@ -5,6 +5,6 @@
|
||||||
!= t '.reclamation'
|
!= t '.reclamation'
|
||||||
\
|
\
|
||||||
!= t '.reminder'
|
!= t '.reminder'
|
||||||
= render file: '/events/show'
|
= render template: '/events/show'
|
||||||
\
|
\
|
||||||
!= t '.signature'
|
!= t '.signature'
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
!= t '.body', subject: @event.title, author: @current_user || t('.submitter')
|
!= t '.body', subject: @event.title, author: @current_user || t('.submitter')
|
||||||
|
|
||||||
:ruby
|
:ruby
|
||||||
new = render file: '/events/show'
|
new = render template: '/events/show'
|
||||||
|
|
||||||
former = @event
|
former = @event
|
||||||
@event = @event.paper_trail.previous_version || @event
|
@event = @event.paper_trail.previous_version || @event
|
||||||
|
|
||||||
prev = render file: '/events/show'
|
prev = render template: '/events/show'
|
||||||
@event = former
|
@event = former
|
||||||
|
|
||||||
require 'differ/format/patch'
|
require 'differ/format/patch'
|
||||||
|
|
|
@ -24,4 +24,4 @@
|
||||||
|
|
||||||
%fieldset
|
%fieldset
|
||||||
%legend= Event.model_name.human
|
%legend= Event.model_name.human
|
||||||
= render file: '/events/show'
|
= render template: '/events/show'
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
%legend
|
%legend
|
||||||
%em.fa.fa-eye
|
%em.fa.fa-eye
|
||||||
= t '.preview'
|
= t '.preview'
|
||||||
= render file: '/events/show'
|
= render template: '/events/show'
|
||||||
|
|
||||||
%fieldset
|
%fieldset
|
||||||
%legend
|
%legend
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
%legend
|
%legend
|
||||||
%em.fa.fa-eye
|
%em.fa.fa-eye
|
||||||
= t '.preview'
|
= t '.preview'
|
||||||
= render file: '/events/show'
|
= render template: '/events/show'
|
||||||
|
|
||||||
- else
|
- else
|
||||||
:markdown
|
:markdown
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
!= t '.body', author: @current_user
|
!= t '.body', author: @current_user
|
||||||
\
|
\
|
||||||
!= t '.reminder'
|
!= t '.reminder'
|
||||||
= render file: '/events/show'
|
= render template: '/events/show'
|
||||||
\
|
\
|
||||||
!= t '.access'
|
!= t '.access'
|
||||||
= surround '<'.html_safe, '>'.html_safe do
|
= surround '<'.html_safe, '>'.html_safe do
|
||||||
|
|
|
@ -3,6 +3,6 @@
|
||||||
= surround '<'.html_safe, '>'.html_safe do
|
= surround '<'.html_safe, '>'.html_safe do
|
||||||
= moderations_url
|
= moderations_url
|
||||||
\
|
\
|
||||||
= render file: '/events/show'
|
= render template: '/events/show'
|
||||||
\
|
\
|
||||||
!= t '.signature'
|
!= t '.signature'
|
||||||
|
|
|
@ -3,6 +3,6 @@
|
||||||
= @event.reason
|
= @event.reason
|
||||||
\
|
\
|
||||||
!= t '.reminder'
|
!= t '.reminder'
|
||||||
= render file: '/events/show'
|
= render template: '/events/show'
|
||||||
\
|
\
|
||||||
!= t '.signature'
|
!= t '.signature'
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
!= t '.body', subject: @event.title, author: @current_user || t('.submitter')
|
!= t '.body', subject: @event.title, author: @current_user || t('.submitter')
|
||||||
|
|
||||||
:ruby
|
:ruby
|
||||||
new = render file: '/events/show'
|
new = render template: '/events/show'
|
||||||
|
|
||||||
former = @event
|
former = @event
|
||||||
@event = @event.paper_trail.previous_version || @event
|
@event = @event.paper_trail.previous_version || @event
|
||||||
|
|
||||||
prev = render file: '/events/show'
|
prev = render template: '/events/show'
|
||||||
@event = former
|
@event = former
|
||||||
|
|
||||||
require 'differ/format/patch'
|
require 'differ/format/patch'
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
!= t '.body', author: @current_user
|
!= t '.body', author: @current_user
|
||||||
\
|
\
|
||||||
!= t '.reminder'
|
!= t '.reminder'
|
||||||
= render file: '/orgas/show'
|
= render template: '/orgas/show'
|
||||||
\
|
\
|
||||||
!= t '.access'
|
!= t '.access'
|
||||||
= surround '<'.html_safe, '>'.html_safe do
|
= surround '<'.html_safe, '>'.html_safe do
|
||||||
|
|
|
@ -2,6 +2,6 @@
|
||||||
= surround '<'.html_safe, '>'.html_safe do
|
= surround '<'.html_safe, '>'.html_safe do
|
||||||
= moderations_url
|
= moderations_url
|
||||||
\
|
\
|
||||||
= render file: '/orgas/show'
|
= render template: '/orgas/show'
|
||||||
\
|
\
|
||||||
!= t '.signature'
|
!= t '.signature'
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
!= t '.body', subject: @orga.name, author: @current_user
|
!= t '.body', subject: @orga.name, author: @current_user
|
||||||
\
|
\
|
||||||
!= t '.reminder'
|
!= t '.reminder'
|
||||||
= render file: '/orgas/show'
|
= render template: '/orgas/show'
|
||||||
\
|
\
|
||||||
!= t '.signature'
|
!= t '.signature'
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
!= t '.body', subject: @orga.name, author: @current_user || t('.submitter')
|
!= t '.body', subject: @orga.name, author: @current_user || t('.submitter')
|
||||||
|
|
||||||
:ruby
|
:ruby
|
||||||
new = render file: '/orgas/show'
|
new = render template: '/orgas/show'
|
||||||
|
|
||||||
former = @orga
|
former = @orga
|
||||||
@orga = @orga.paper_trail.previous_version || @orga
|
@orga = @orga.paper_trail.previous_version || @orga
|
||||||
|
|
||||||
prev = render file: '/orgas/show'
|
prev = render template: '/orgas/show'
|
||||||
@orga = former
|
@orga = former
|
||||||
|
|
||||||
require 'differ/format/patch'
|
require 'differ/format/patch'
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
%legend
|
%legend
|
||||||
%em.fa.fa-eye
|
%em.fa.fa-eye
|
||||||
= t '.preview'
|
= t '.preview'
|
||||||
= render file: '/events/show'
|
= render template: '/events/show'
|
||||||
|
|
||||||
%fieldset
|
%fieldset
|
||||||
%legend
|
%legend
|
||||||
|
|
|
@ -82,7 +82,7 @@
|
||||||
%tr
|
%tr
|
||||||
%td.empty/
|
%td.empty/
|
||||||
%td.note(colspan="5")
|
%td.note(colspan="5")
|
||||||
= raw note.contents
|
= note.contents
|
||||||
%em.author
|
%em.author
|
||||||
= t '.posted_by',
|
= t '.posted_by',
|
||||||
author: "#{note.author.firstname} #{note.author.lastname}",
|
author: "#{note.author.firstname} #{note.author.lastname}",
|
||||||
|
|
|
@ -36,4 +36,4 @@
|
||||||
%legend
|
%legend
|
||||||
%em.fa.fa-calendar
|
%em.fa.fa-calendar
|
||||||
= Event.model_name.human
|
= Event.model_name.human
|
||||||
= render file: '/events/show'
|
= render template: '/events/show'
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
= @event.to_tweet
|
= @event.to_tweet
|
||||||
|
|
||||||
- if @event.repeat > 0
|
- if @event.repeat.positive?
|
||||||
%fieldset
|
%fieldset
|
||||||
%legend
|
%legend
|
||||||
%em.fa.fa-repeat
|
%em.fa.fa-repeat
|
||||||
|
@ -41,4 +41,4 @@
|
||||||
%legend
|
%legend
|
||||||
%em.fa.fa-calendar
|
%em.fa.fa-calendar
|
||||||
= Event.model_name.human
|
= Event.model_name.human
|
||||||
= render file: '/events/show'
|
= render template: '/events/show'
|
||||||
|
|
|
@ -3,12 +3,12 @@
|
||||||
%em.fa.fa-bullhorn
|
%em.fa.fa-bullhorn
|
||||||
- else
|
- else
|
||||||
%em.fa.fa-paperclip
|
%em.fa.fa-paperclip
|
||||||
=t '.title'
|
= t '.title'
|
||||||
|
|
||||||
%fieldset
|
%fieldset
|
||||||
%legend=t '.title'
|
%legend= t '.title'
|
||||||
= render 'form'
|
= render 'form'
|
||||||
|
|
||||||
%fieldset
|
%fieldset
|
||||||
%legend=t '.event'
|
%legend= t '.event'
|
||||||
= render file: '/events/show'
|
= render template: '/events/show'
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
!= t '.body', author: @current_user
|
!= t '.body', author: @current_user
|
||||||
\
|
\
|
||||||
= render file: '/orgas/show'
|
= render template: '/orgas/show'
|
||||||
\
|
\
|
||||||
!= t '.access'
|
!= t '.access'
|
||||||
= surround '<'.html_safe, '>'.html_safe do
|
= surround '<'.html_safe, '>'.html_safe do
|
||||||
|
|
|
@ -5,6 +5,6 @@
|
||||||
!= t '.reclamation'
|
!= t '.reclamation'
|
||||||
\
|
\
|
||||||
!= t '.reminder'
|
!= t '.reminder'
|
||||||
= render file: '/orgas/show'
|
= render template: '/orgas/show'
|
||||||
\
|
\
|
||||||
!= t '.signature'
|
!= t '.signature'
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
!= t '.body', subject: @orga.name, author: @current_user || t('.submitter')
|
!= t '.body', subject: @orga.name, author: @current_user || t('.submitter')
|
||||||
|
|
||||||
:ruby
|
:ruby
|
||||||
new = render file: '/orgas/show'
|
new = render template: '/orgas/show'
|
||||||
|
|
||||||
former = @orga
|
former = @orga
|
||||||
@orga = @orga.paper_trail.previous_version
|
@orga = @orga.paper_trail.previous_version
|
||||||
|
|
||||||
prev = render file: '/orgas/show'
|
prev = render template: '/orgas/show'
|
||||||
@orga = former
|
@orga = former
|
||||||
|
|
||||||
require 'differ/format/patch'
|
require 'differ/format/patch'
|
||||||
|
|
|
@ -20,4 +20,4 @@
|
||||||
|
|
||||||
%fieldset
|
%fieldset
|
||||||
%legend= Orga.model_name.human
|
%legend= Orga.model_name.human
|
||||||
= render file: '/orgas/show'
|
= render template: '/orgas/show'
|
||||||
|
|
|
@ -16,4 +16,4 @@
|
||||||
%legend
|
%legend
|
||||||
%em.fa.fa-calendar
|
%em.fa.fa-calendar
|
||||||
= Orga.model_name.human
|
= Orga.model_name.human
|
||||||
= render file: '/orgas/show'
|
= render template: '/orgas/show'
|
||||||
|
|
Loading…
Reference in New Issue