Merge branch 'release/0.11.4.1'

ulmic · Dec 11, 2016 · 5a6d47f · 5a6d47f
2 parents 199d60e + 1d4a51e
commit 5a6d47f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/app/mailers/activity_lines/corporative/confession_mailer.rb b/app/mailers/activity_lines/corporative/confession_mailer.rb
@@ -14,4 +14,11 @@ def confirm(confession, user)
     @subject = subject(confession.class, :confirm)
     mail from: sender_name, to: user.email, subject: @subject
   end
+
+  def nominated(confession, user)
+    @user = user
+    @confession = confession
+    @subject = subject(confession.class, :nominated)
+    mail from: sender_name, to: user.email, subject: @subject
+  end
 end
diff --git a/lib/yaml/mail_messages.yml b/lib/yaml/mail_messages.yml
@@ -18,3 +18,11 @@ messages:
       subject: 'Отправленный вами вопрос на онлайн-конферерцию опубликован'
     answer:
       subject: 'Заданный вами вопрос на онлайн-конференцию получил ответ'
+  activity_lines/corporative/confession:
+    confirm:
+      subject: 'Ваше ходатайство было подтверждено руководителем корпоративных проектов МИЦ'
+    create:
+      subject: 'Добавлено ходатайство на премию Признание'
+    nominated:
+      subject: 'Ты номинирован на премию Признание!'
+