From 4b95ee95c073876faa641a07dfa6dfc87b70e981 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Wed, 27 Jan 2016 16:12:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=B8=96=E5=AD=90=E6=A0=8F?=
 =?UTF-8?q?=E7=9B=AE=E8=AE=A8=E8=AE=BA=E5=8C=BA=E4=B8=AD=E7=9A=84=E5=B8=96?=
 =?UTF-8?q?=E5=AD=90=EF=BC=8C=E5=9C=A8=E7=99=BB=E9=99=86=E6=83=85=E5=86=B5?=
 =?UTF-8?q?=E4=B8=8B=E5=B0=B1=E8=83=BD=E5=8F=91=E9=80=81=EF=BC=9B=E5=9C=A8?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=A0=8F=E7=9B=AE=E4=B8=AD=EF=BC=8C=E5=AF=B9?=
 =?UTF-8?q?=E5=B8=96=E5=AD=90=E6=A0=8F=E7=9B=AE=E8=AE=A8=E8=AE=BA=E5=8C=BA?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BC=96=E8=BE=91=E3=80=81=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E3=80=81=E5=8F=91=E9=80=81=E9=80=89=E9=A1=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../messages/_org_subfield_show.html.erb      |  2 +-
 .../_org_subfield_message.html.erb            | 25 +++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/app/views/messages/_org_subfield_show.html.erb b/app/views/messages/_org_subfield_show.html.erb
index 7fdf5d02c..1e31881d5 100644
--- a/app/views/messages/_org_subfield_show.html.erb
+++ b/app/views/messages/_org_subfield_show.html.erb
@@ -68,7 +68,7 @@
       <%= link_to image_tag(url_to_avatar(@topic.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@topic.author) %>
     </div>
     <div class="postThemeWrap">
-      <% if @message.org_subfield_editable_by?(User.current) %>
+      <% if User.current.logged? %>
           <div class="homepagePostSetting" id="message_setting_<%= @topic.id%>" style="display: none">
             <ul>
               <li class="homepagePostSettingIcon">
diff --git a/app/views/organizations/_org_subfield_message.html.erb b/app/views/organizations/_org_subfield_message.html.erb
index 16a2a55d6..a14138903 100644
--- a/app/views/organizations/_org_subfield_message.html.erb
+++ b/app/views/organizations/_org_subfield_message.html.erb
@@ -43,6 +43,31 @@
       <div class="mt10" style="font-weight:normal;">
         <%= render :partial=>"attachments/activity_attach", :locals=>{:activity => activity} %>
       </div>
+      <div class="homepagePostSetting">
+        <ul>
+          <li class="homepagePostSettingIcon">
+            <% if User.current.logged? %>
+                <ul class="homepagePostSettiongText">
+                  <li><%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}',#{User.current.id},'message')")  %></li>
+                  <li>
+                    <%= link_to(
+                                l(:button_edit),
+                                {:controller => 'messages', :action => 'edit', :id => activity, :board_id => activity.board_id},
+                                :class => 'postOptionLink'
+                        ) if activity.org_subfield_editable_by?(User.current) %>
+                  </li>
+                  <li>
+                    <%= delete_link(
+                                {:controller => 'messages', :action => 'destroy', :id => activity, :board_id => activity.board_id},
+                                :data => {:confirm => l(:text_are_you_sure)},
+                                :class => 'postOptionLink'
+                        ) if activity.org_subfield_editable_by?(User.current) %>
+                  </li>
+                </ul>
+            <% end %>
+          </li>
+        </ul>
+      </div>
     </div>
     <div class="cl"></div>
   </div>