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

---
 app/views/admin/news/_index.html.erb | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/views/admin/news/_index.html.erb b/app/views/admin/news/_index.html.erb
index a06cb5b..a6a4d37 100644
--- a/app/views/admin/news/_index.html.erb
+++ b/app/views/admin/news/_index.html.erb
@@ -63,9 +63,18 @@
             <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/news/<%=b.id.to_s%>/edit"><%= t(:edit) %></a></li>
-                <li><a href="#" class="delete text-error" rel="/admin/news/<%=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/news/<%=b.id.to_s%>/edit"><%= t(:edit) %></a></li>
+                  <li><a href="#" class="delete text-error" rel="/admin/news/<%=b.id.to_s%>"><%= t(:delete_) %></a></li>
+                <% else %>
+                  <% if !b.rejected && !b.approved %>
+                    <li><a href="/admin/news/<%=b.id.to_s%>/edit"><%= t(:edit) %></a></li>
+                    <li><a href="#" class="delete text-error" rel="/admin/news/<%=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}/news/#{b.to_param}" %>"  data-id="<%= b.id.to_s %>"><%= t("news.approve") %></a></li>
                 <% end %>
               <% end %>