From 29c720a8a4413bb0ed7cc8292174e22560eedfa6 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Wed, 30 Dec 2015 17:45:15 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/messages_controller.rb                 | 4 +++-
 app/views/messages/_show_org_subfields.html.erb        | 2 +-
 app/views/organizations/_org_subfield_message.html.erb | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index ae13b7e78..e91b3f0db 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -231,8 +231,10 @@ class MessagesController < ApplicationController
     @isReply = false
     if @project
       (render_403; return false) unless @message.editable_by?(User.current)
-    else
+    elsif @course
       (render_403; return false) unless @message.course_editable_by?(User.current)
+    else
+      (render_403; return false) unless @message.org_subfield_editable_by?(User.current)
     end
 
     @message.safe_attributes = params[:message]
diff --git a/app/views/messages/_show_org_subfields.html.erb b/app/views/messages/_show_org_subfields.html.erb
index cbd316ea4..fcdac063f 100644
--- a/app/views/messages/_show_org_subfields.html.erb
+++ b/app/views/messages/_show_org_subfields.html.erb
@@ -9,7 +9,7 @@
               </li>
           <% end %>
       <% else %>
-        <li><span class="mt3 fl mr5">暂无资源栏目</span></li>
+        <li><span class="mt3 fl mr5">暂无帖子栏目</span></li>
       <% end %>
   <% else %>
       <span class="fontBlue pl10">请在左侧选择组织</span>
diff --git a/app/views/organizations/_org_subfield_message.html.erb b/app/views/organizations/_org_subfield_message.html.erb
index 57c50486b..e6bee8000 100644
--- a/app/views/organizations/_org_subfield_message.html.erb
+++ b/app/views/organizations/_org_subfield_message.html.erb
@@ -11,7 +11,7 @@
             <%= link_to activity.try(:author).try(:realname), user_path(activity.author_id), :class => "newsBlue mr15" %>
         <% end %>
         TO
-        <%= link_to activity.board.org_subfield.name.to_s+" | 资源栏目讨论区",org_subfield_boards_path(activity.board.org_subfield), :class => "newsBlue ml15 mr5"%>
+        <%= link_to activity.board.org_subfield.name.to_s+" | 帖子栏目讨论区",org_subfield_boards_path(activity.board.org_subfield), :class => "newsBlue ml15 mr5"%>
         <!--<a href="javascript:void(0);" class="newsBlue ml15 mr5"><%= activity.board.org_subfield.name %>(项目讨论区)</a>-->
       </div>
       <div class="homepagePostTitle break_word">