Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
open-source
aoz-003
Commits
2d3b1af4
Commit
2d3b1af4
authored
Oct 23, 2018
by
Jiri Strojil
Browse files
Made some variables working
parent
2a7a5fba
Changes
2
Show whitespace changes
Inline
Side-by-side
app/models/email_template.rb
View file @
2d3b1af4
...
...
@@ -34,8 +34,8 @@ class EmailTemplate < ApplicationRecord
trial:
ReminderMailing
::
TEMPLATE_VARNAMES
,
half_year:
ReminderMailing
::
TEMPLATE_VARNAMES
,
termination:
ReminderMailing
::
TEMPLATE_VARNAMES
,
half_year_process_email:
R
em
inderMailing
::
TEMPLATE_VARNAMES
+
[
:Semester
],
half_year_process_overdue:
ReminderMailing
::
TEMPLATE_VARNAMES
+
[
:
S
em
est
er
]
half_year_process_email:
S
em
esterProcessMail
.
template_varnames
[
:mail
],
half_year_process_overdue:
SemesterProcessMail
.
template_varnames
[
:
r
em
ind
er
]
}
end
...
...
app/models/semester_process_mail.rb
View file @
2d3b1af4
...
...
@@ -12,10 +12,20 @@ class SemesterProcessMail < ApplicationRecord
delegate
:volunteer
,
to: :semester_process_volunteer
delegate
:semester_process
,
to: :semester_process_volunteer
TEMPLATE_VARNAMES
=
[
:Anrede
,
:Name
,
:Einsatz
,
:FeedbackLink
,
:EmailAbsender
,
:Semester
].
freeze
def
self
.
template_varnames
{
mail:
EmailTemplate
::
template_varnames
[
:half_year_process_email
]
,
reminder:
EmailTemplate
::
template_varnames
[
:half_year_process_overdue
]
mail:
TEMPLATE_VARNAMES
,
reminder:
TEMPLATE_VARNAMES
}
end
...
...
@@ -50,11 +60,6 @@ class SemesterProcessMail < ApplicationRecord
"
#{
I18n
.
l
(
semester_process
.
semester
.
begin
)
}
-
#{
I18n
.
l
(
semester_process
.
semester
.
end
)
}
"
end
def
einsatz_start
#I18n.l(reminder_mailable.period_start) if reminder_mailable.period_start
''
end
def
einsatz
''
end
...
...
@@ -74,7 +79,7 @@ class SemesterProcessMail < ApplicationRecord
end
def
feedback_url
(
options
=
{})
''
review_semester_semester_process_volunteer_path
(
semester_process_volunteer
)
end
private
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment