From 51e462d13cc17ad0a0a11d8fbb5cf6f83d50860d Mon Sep 17 00:00:00 2001
From: Harry Bomrah <harry@rulingcom.com>
Date: Fri, 13 Nov 2015 22:05:29 +0800
Subject: [PATCH] added admin and changed subject

---
 app/helpers/admin/news_helper.rb         | 10 +++++++++-
 app/views/email/rejection_email.html.erb |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/helpers/admin/news_helper.rb b/app/helpers/admin/news_helper.rb
index 6ad7e44..8bc0b41 100644
--- a/app/helpers/admin/news_helper.rb
+++ b/app/helpers/admin/news_helper.rb
@@ -49,12 +49,20 @@ module Admin::NewsHelper
         sleep(2)
       end
     end
+    users = Workgroup.where(:key => "admin").first.users rescue []
+    users.each do |user|
+      email = user.member_profile.email
+      if !email.nil? && email != ""
+        send_email(user.name, email, news, type)
+        sleep(2)
+      end
+    end
   end
 
   def send_email(name, useremail, news, type)
     url = page_for_news_bulletin(news)
     template = (type == "approval" ? "email/new_news_email.html.erb" : "email/reapproval_news_email.html.erb")
-    email = Email.new(:mail_to => useremail, :mail_subject => "New news : #{news.title}.", :template => template, :template_data => {"url" => url, "submitter" => current_user.name, "name" => name})
+    email = Email.new(:mail_to => useremail, :mail_subject => "校園新聞請審核通知", :template => template, :template_data => {"url" => url, "submitter" => current_user.name, "name" => name})
     email.deliver
   end
 
diff --git a/app/views/email/rejection_email.html.erb b/app/views/email/rejection_email.html.erb
index 25bd918..a9c8014 100644
--- a/app/views/email/rejection_email.html.erb
+++ b/app/views/email/rejection_email.html.erb
@@ -1,3 +1,3 @@
 <h3>Hello <%= @data["name"] %>,</h3>
-<p><%= @data["rejector"] %> has rejected your news<%= @data["reason"].nil? || @data["reason"] == "" ? "." : ", because #{@data["reason"]}" %></p>
+<p>Your news has been rejected<%= @data["reason"].nil? || @data["reason"] == "" ? "." : ", because #{@data["reason"]}" %></p>
 <a href="<%= @data['url'] %>" > Please click here to view the news.</a>
\ No newline at end of file