解决冲突

app/controllers/courses_controller.rb

@@ -271,6 +271,7 @@ class CoursesController < ApplicationController
   end
   def member
     ## 有角色参数的才是课程，没有的就是项目
+    if (User.current.admin? || @course.is_public == 1 || (@course.is_public == 0 && User.current.member_of_course?(@course)))
       @render_file = 'member_list'
       @teachers= searchTeacherAndAssistant(@course)
       @canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1'
@@ -294,6 +295,10 @@ class CoursesController < ApplicationController
       end
       @members = paginateHelper @members
       render :layout => 'base_courses'
+    else
+      render_403
+    end
+
   end
 
   #判断指定用户是否为课程教师
@@ -743,6 +748,7 @@ class CoursesController < ApplicationController
   end
 
   def feedback
+    if (User.current.admin? || @course.is_public == 1 || (@course.is_public == 0 && User.current.member_of_course?(@course)))
       page = params[:page]
       # Find the page of the requested reply
       @jours = @course.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
@@ -761,6 +767,10 @@ class CoursesController < ApplicationController
         format.html{render :layout => 'base_courses'}
         format.api
       end
+    else
+      render_403
+    end
+
   end