diff --git a/app/controllers/admin/news_controller.rb b/app/controllers/admin/news_controller.rb
index 533b33a..c5ca3fc 100644
--- a/app/controllers/admin/news_controller.rb
+++ b/app/controllers/admin/news_controller.rb
@@ -74,8 +74,10 @@ class Admin::NewsController < OrbitAdminController
if params["approved"] == "true"
news_bulletin.approved = true
news_bulletin.rejected = false
+ news_bulletin.reapproval = false
else
news_bulletin.rejected = true
+ news_bulletin.reapproval = false
news_bulletin.rejection_reason = params["reason"]
end
news_bulletin.save
@@ -110,6 +112,7 @@ class Admin::NewsController < OrbitAdminController
end
news_bulletin.update_attributes(news_bulletin_params)
+ news_bulletin.reapproval = true if news_bulletin.rejected
news_bulletin.save
build_email(news_bulletin)
redirect_to params['referer_url']
diff --git a/app/models/news_bulletin.rb b/app/models/news_bulletin.rb
index 2c55a2a..f98f27d 100644
--- a/app/models/news_bulletin.rb
+++ b/app/models/news_bulletin.rb
@@ -22,6 +22,7 @@ class NewsBulletin
field :rss2_sn
field :approved, :type => Boolean, :default => false
field :rejected, :type => Boolean, :default => false
+ field :reapproval, :type => Boolean, :default => false
field :rejection_reason
field :is_preview, :type => Boolean, :default => false
field :image_description, localize: true
diff --git a/app/views/admin/news/_index.html.erb b/app/views/admin/news/_index.html.erb
index 174f2ba..ade17be 100644
--- a/app/views/admin/news/_index.html.erb
+++ b/app/views/admin/news/_index.html.erb
@@ -34,6 +34,14 @@
<%= b.title_translations["en"] %> <%= t(:expired) %>
<% end %>
<% end %>
+ <% elsif b.rejected && b.reapproval %>
+ <% url = page_for_bulletin(b) %>
+ <% if !b.title_translations["zh_tw"].blank? %>
+ <%= b.title_translations["zh_tw"] %> <%= t("news.reapproval") %> : <%= t(:pending) %>
+ <% end %>
+ <% if !b.title_translations["en"].blank? %>
+ <%= b.title_translations["en"] %> <%= t("news.reapproval") %> : <%= t(:pending) %>
+ <% end %>
<% elsif b.rejected %>
<% url = page_for_bulletin(b) %>
<% if !b.title_translations["zh_tw"].blank? %>
@@ -67,7 +75,7 @@