From c7f80effb7656b0e0242c48a5c9670dfb3df1b25 Mon Sep 17 00:00:00 2001
From: nwb <nwb5@hotmail.com>
Date: Mon, 21 Jul 2014 13:37:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=AF=BE=E7=A8=8B=E8=AE=A8?=
 =?UTF-8?q?=E8=AE=BA=E5=8C=BA=E5=88=A0=E9=99=A4=E5=B8=96=E5=AD=90BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/boards_controller.rb   |  6 +++++-
 app/controllers/messages_controller.rb | 17 +++++++++++++----
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index e0bd9582d..a692acc12 100644
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -140,7 +140,11 @@ private
   end
 
   def find_board_if_available
-    @board = @project.boards.find(params[:id]) if params[:id]
+    if @project
+      @board = @project.boards.find(params[:id]) if params[:id]
+    elsif @course
+      @board = @course.boards.find(params[:id]) if params[:id]
+    end
   rescue ActiveRecord::RecordNotFound
     render_404
   end
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 2915ff8f8..90e0d937c 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -112,10 +112,19 @@ class MessagesController < ApplicationController
     (render_403; return false) unless @message.destroyable_by?(User.current)
     r = @message.to_param
     @message.destroy
-    if @message.parent
-      redirect_to board_message_path(@board, @message.parent, :r => r)
-    else
-      redirect_to project_board_path(@project, @board)
+    # modify by nwb
+    if @project
+      if @message.parent
+        redirect_to board_message_path(@board, @message.parent, :r => r)
+      else
+        redirect_to project_board_path(@project, @board)
+      end
+    elsif @course
+      if @message.parent
+        redirect_to board_message_path(@board, @message.parent, :r => r)
+      else
+        redirect_to course_board_path(@course, @board)
+      end
     end
   end