From 22be66f85ca7f016a4bb31497d0348ada31fe7cf Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Thu, 31 Dec 2015 14:00:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B/=E9=A1=B9=E7=9B=AE=E5=B8=96?=
 =?UTF-8?q?=E5=AD=90=E4=B8=AD=EF=BC=8C=E7=94=A8=E6=88=B7=E5=9C=A8=E7=99=BB?=
 =?UTF-8?q?=E9=99=86=E6=83=85=E5=86=B5=E4=B8=8B=E5=8D=B3=E5=8F=AF=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E5=B8=96=E5=AD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/messages/_course_show.html.erb  | 38 ++++++++++++-----------
 app/views/messages/_project_show.html.erb | 22 +++++++------
 2 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index 294f9b7d4..c3278a209 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -37,28 +37,30 @@
       <%= link_to image_tag(url_to_avatar(@topic.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@topic.author) %>
     </div>
     <div class="postThemeWrap">
-      <% if @topic.author.id == User.current.id%>
+      <% if User.current.logged? %>
       <div class="homepagePostSetting" id="message_setting_<%= @topic.id%>" style="display: none">
         <ul>
           <li class="homepagePostSettingIcon">
             <ul class="homepagePostSettiongText">
-              <li>
-                  <%= link_to(
-                              l(:button_edit),
-                              {:action => 'edit', :id => @topic},
-                              :class => 'postOptionLink'
-                      ) if @message.course_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.course_destroyable_by?(User.current) %>
-                <%= link_to "发送",messages_join_org_subfield_path(:message_id => @topic.id) , :remote=> true,:class => 'postOptionLink' %>
-              </li>
+              <% if @topic.author.id == User.current.id  %>
+                  <li>
+                      <%= link_to(
+                                  l(:button_edit),
+                                  {:action => 'edit', :id => @topic},
+                                  :class => 'postOptionLink'
+                          ) if @message.course_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.course_destroyable_by?(User.current) %>
+                  </li>
+              <% end %>
+              <li> <%= link_to "发送",messages_join_org_subfield_path(:message_id => @topic.id) , :remote=> true,:class => 'postOptionLink' %></li>
             </ul>
           </li>
         </ul>
diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index 1cbd606ab..e5aba7c02 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -99,20 +99,22 @@
         <%= link_to image_tag(url_to_avatar(@topic.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@topic.author) %>
       </div>
       <div class="postThemeWrap">
-        <% if @topic.author.id == User.current.id%>
+        <% if User.current.logged? %>
             <div class="homepagePostSetting" id="message_setting_<%= @topic.id%>" style="display: none">
               <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>
-                    <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 @topic.author.id == User.current.id %>
+                        <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>
+                    <% end %>
                     <li> <%= link_to "发送",messages_join_org_subfield_path(:message_id => @topic.id) , :remote=> true,:class => 'postOptionLink' %></li>
                   </ul>
                 </li>