From df7662e8bb49bba2d51e25525c3f3c33ef401995 Mon Sep 17 00:00:00 2001
From: nccu <nccu@test174.(none)>
Date: Mon, 23 Mar 2015 16:08:10 +0800
Subject: [PATCH] fix after approve cant edit & delete

---
 app/views/admin/announcements/_index.html.erb | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/views/admin/announcements/_index.html.erb b/app/views/admin/announcements/_index.html.erb
index 7af4c3b..8b0a73b 100644
--- a/app/views/admin/announcements/_index.html.erb
+++ b/app/views/admin/announcements/_index.html.erb
@@ -87,9 +87,17 @@
             <ul class="nav nav-pills">
               <li><a href="#" class="detail-row" onclick="$('#<%= "#{b.id.to_s}-detail" %>').slideToggle(300); return false;"><%= t(:detail) %></a></li>
               <% if can_edit_or_delete?(b) %>
-                <li><a href="/admin/announcements/<%=b.id.to_s%>/edit"><%= t(:edit) %></a></li>
-                <li><a href="#" class="delete text-error" rel="/admin/announcements/<%=b.id.to_s%>"><%= t(:delete_) %></a></li>
-                <% if !b.approved && user_can_approve? && !b.expired? %>
+                <% if current_user.is_admin? || current_user.is_manager?(@module_app) %>
+                  <li><a href="/admin/announcements/<%=b.id.to_s%>/edit"><%= t(:edit) %></a></li>
+                  <li><a href="#" class="delete text-error" rel="/admin/announcements/<%=b.id.to_s%>"><%= t(:delete_) %></a></li>
+                <% else %>
+                  <% if !b.rejected && !b.approved %>
+                   <li><a href="/admin/announcements/<%=b.id.to_s%>/edit"><%= t(:edit) %></a></li>
+                   <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? %>
                   <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 %>