From 613f974440db5486d872499bf07a3efb9a662220 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 2 Sep 2016 15:22:09 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=9A=84=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E5=92=8C=E8=AF=BE=E7=A8=8B=E7=9A=84=E8=80=81=E5=B8=88?=
 =?UTF-8?q?=E9=83=BD=E6=9C=89=E6=9D=83=E9=99=90=E5=88=A0=E9=99=A4=E5=B8=96?=
 =?UTF-8?q?=E5=AD=90=E5=92=8C=E6=96=B0=E9=97=BB/=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E7=9A=84=E5=9B=9E=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/messages/_project_show.html.erb | 23 ++++++++++-------------
 app/views/news/_course_show.html.erb      |  2 +-
 app/views/news/_news_all_replies.html.erb |  2 +-
 app/views/news/_project_show.html.erb     |  2 +-
 app/views/users/_message_replies.html.erb |  2 +-
 app/views/users/_news_replies.html.erb    |  3 ++-
 6 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index 41c2f7d1f..2769594c5 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -104,18 +104,15 @@
               <ul>
                 <li class="homepagePostSettingIcon">
                   <ul class="homepagePostSettiongText">
-
-                        <li>
-                          <%= link_to(l(:button_edit), {:action => 'edit', :id => @topic}, :class => 'postOptionLink') if @message.editable_by?(User.current) %>
-                        </li>
-                    <% if @topic.author.id == User.current.id %>
-                        <li>
-                          <%= link_to(l(:button_delete), {:action => 'destroy', :id => @topic},:method => :post,
-                                      :data => {:confirm => l(:text_are_you_sure)},
-                                      :class => 'postOptionLink'
-                              ) if @message.destroyable_by?(User.current) %>
-                        </li>
-                    <% end %>
+                    <li>
+                      <%= link_to(l(:button_edit), {:action => 'edit', :id => @topic}, :class => 'postOptionLink') if @message.editable_by?(User.current) %>
+                    </li>
+                    <li>
+                      <%= link_to(l(:button_delete), {:action => 'destroy', :id => @topic},:method => :post,
+                                  :data => {:confirm => l(:text_are_you_sure)},
+                                  :class => 'postOptionLink'
+                          ) if @message.destroyable_by?(User.current) %>
+                    </li>
                     <% if hidden_unproject_infos %>
                         <li><%= link_to "发送", "javascript:void(0);", :onclick => "show_send(#{@message.id},#{User.current.id},'message');", :class => 'postOptionLink' %></li>
                     <% else %>
@@ -202,7 +199,7 @@
                               :class => 'fr mr20',
                               :data => {:confirm => l(:text_are_you_sure)},
                               :title => l(:button_delete)
-                      ) if reply.course_destroyable_by?(User.current) %>
+                      ) if reply.destroyable_by?(User.current) %>
                 </span>
 
                     <div class="cl"></div>
diff --git a/app/views/news/_course_show.html.erb b/app/views/news/_course_show.html.erb
index c8068e425..7fb6bad7f 100644
--- a/app/views/news/_course_show.html.erb
+++ b/app/views/news/_course_show.html.erb
@@ -82,7 +82,7 @@
   </div>
   <div class="cl"></div>
   <div class="homepagePostReply">
-    <%= render :partial => 'news/news_all_replies' %>
+    <%= render :partial => 'news/news_all_replies', :locals => {:object => @course} %>
   </div>
 </div>
 <script type="text/javascript">
diff --git a/app/views/news/_news_all_replies.html.erb b/app/views/news/_news_all_replies.html.erb
index c4140cd91..914f6c7f8 100644
--- a/app/views/news/_news_all_replies.html.erb
+++ b/app/views/news/_news_all_replies.html.erb
@@ -50,7 +50,7 @@
                               :class => 'fr mr20',
                               :data => {:confirm => l(:text_are_you_sure)},
                               :title => l(:button_delete)
-                      ) if @news.author == User.current %>
+                      ) if User.current.allowed_to?(:manage_news, object) %>
                         </span>
                       <div class="cl"></div>
                     </div>
diff --git a/app/views/news/_project_show.html.erb b/app/views/news/_project_show.html.erb
index 26393f7cb..29fe6a207 100644
--- a/app/views/news/_project_show.html.erb
+++ b/app/views/news/_project_show.html.erb
@@ -86,7 +86,7 @@
   </div>
   <div class="cl"></div>
   <div class="homepagePostReply">
-    <%= render :partial => 'news/news_all_replies' %>
+    <%= render :partial => 'news/news_all_replies', :locals => {:object => @project} %>
   </div>
 </div>
 <script type="text/javascript">
diff --git a/app/views/users/_message_replies.html.erb b/app/views/users/_message_replies.html.erb
index 994c5c64e..20b167ad2 100644
--- a/app/views/users/_message_replies.html.erb
+++ b/app/views/users/_message_replies.html.erb
@@ -33,7 +33,7 @@
                                     :title => l(:button_reply)) %>
                       <span id="reply_iconup_<%=comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
                     </span>
-                    <% if comment.course_destroyable_by?(User.current) %>
+                    <% if comment.course_destroyable_by?(User.current) || comment.destroyable_by?(User.current) %>
                       <%= link_to(
                                   l(:button_delete),
                                   delete_board_message_path(comment,:board_id =>comment.board.id, :user_activity_id => user_activity_id, :activity_id => activity_id, :is_course => is_course, :is_board => is_board),
diff --git a/app/views/users/_news_replies.html.erb b/app/views/users/_news_replies.html.erb
index fcbe59ebf..fcd9397e7 100644
--- a/app/views/users/_news_replies.html.erb
+++ b/app/views/users/_news_replies.html.erb
@@ -56,8 +56,9 @@
                                     :title => l(:button_reply)) %>
                             <span id="reply_iconup_<%= comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
                         </span>
+                        <% news = News.find(activity_id) %>
                         <%= link_to('删除', {:controller => 'comments', :action => 'destroy', :id => activity_id, :comment_id => comment, :user_activity_id => user_activity_id},
-                                  :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20", :title => l(:button_delete)) if News.find(activity_id).author == User.current %>
+                                  :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20", :title => l(:button_delete)) if (User.current.allowed_to?(:manage_news, news.course) || User.current.allowed_to?(:manage_news, news.project)) %>
                     <% elsif type == 'Issue' %>
                         <span style="position: relative" class="fr mr20">
                             <%= link_to(