From 50783e56d3e635edcc54a10333ca646467bef219 Mon Sep 17 00:00:00 2001
From: nccu <nccu@test174.(none)>
Date: Thu, 26 Mar 2015 20:49:50 +0800
Subject: [PATCH] approve btn fix

---
 app/views/admin/announcements/_index.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/announcements/_index.html.erb b/app/views/admin/announcements/_index.html.erb
index 5c09e8b..361e211 100644
--- a/app/views/admin/announcements/_index.html.erb
+++ b/app/views/admin/announcements/_index.html.erb
@@ -83,7 +83,7 @@
                    <li><a href="#" class="delete text-error" rel="/admin/announcements/<%=b.id.to_s%>"><%= t(:delete_) %></a></li>
                   <% end %>
                 <% end %>
-                <% if !b.rejected && !b.approved && user_can_approve? && !b.expired? && b.reapproval %>
+                <% if (!b.rejected && !b.approved && user_can_approve? && !b.expired?) || (b.rejected && !b.approved && user_can_approve? && !b.expired? && b.reapproval) %>
                   <li><a href="#" class="appoval_button" data-approve-link="<%= "/#{I18n.locale.to_s}/announcement/#{b.to_param}" %>"  data-id="<%= b.id.to_s %>"><%= t("announcement.approve") %></a></li>
                 <% end %>
               <% end %>