解决冲突

app/controllers/courses_controller.rb

@@ -271,29 +271,34 @@ class CoursesController < ApplicationController
   end
   def member
     ## 有角色参数的才是课程，没有的就是项目
-    @render_file = 'member_list'
-    @teachers= searchTeacherAndAssistant(@course)
-    @canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1'
-    @role = params[:role]
-    @course_groups = @course.course_groups if @course.course_groups
-    @course_group_id = params[:@course_group_id] unless params[:@course_group_id].nil?
-    case params[:role]
-      when '1'
-        @subPage_title = l :label_teacher_list
-        @members = searchTeacherAndAssistant(@course)
-      when '2'
-        @subPage_title = l :label_student_list
-        if @course_group_id
-           @members = search_student_in_group(@course, @course_group_id)
+    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'
+      @role = params[:role]
+      @course_groups = @course.course_groups if @course.course_groups
+      @course_group_id = params[:@course_group_id] unless params[:@course_group_id].nil?
+      case params[:role]
+        when '1'
+          @subPage_title = l :label_teacher_list
+          @members = searchTeacherAndAssistant(@course)
+        when '2'
+          @subPage_title = l :label_student_list
+          if @course_group_id
+             @members = search_student_in_group(@course, @course_group_id)
+          else
+            @members = searchStudent(@course)
+          end
         else
-          @members = searchStudent(@course)
-        end
-      else
-        @subPage_title = ''
-        @members = @course.member_principals.includes(:roles, :principal).all.sort
+          @subPage_title = ''
+          @members = @course.member_principals.includes(:roles, :principal).all.sort
+      end
+      @members = paginateHelper @members
+      render :layout => 'base_courses'
+    else
+      render_403
     end
-    @members = paginateHelper @members
-    render :layout => 'base_courses'
+
   end
 
   #判断指定用户是否为课程教师
@@ -743,24 +748,29 @@ class CoursesController < ApplicationController
   end
 
   def feedback
-    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')
-    @limit =  10
-    if params[:r] && page.nil?
-      offset = @jours.count(:conditions => ["#{JournalsForMessage.table_name}.id > ?", params[:r].to_i])
-      page = 1 + offset / @limit
-    end
-
-    #@feedback_count = @jours.count
-    #@feedback_pages = Paginator.new @feedback_count, @limit, page
-    #@offset ||= @feedback_pages.offset
-    @jour = paginateHelper @jours,10
-    @state = false
-    respond_to do |format|
-      format.html{render :layout => 'base_courses'}
-      format.api
+    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')
+      @limit =  10
+      if params[:r] && page.nil?
+        offset = @jours.count(:conditions => ["#{JournalsForMessage.table_name}.id > ?", params[:r].to_i])
+        page = 1 + offset / @limit
+      end
+
+      #@feedback_count = @jours.count
+      #@feedback_pages = Paginator.new @feedback_count, @limit, page
+      #@offset ||= @feedback_pages.offset
+      @jour = paginateHelper @jours,10
+      @state = false
+      respond_to do |format|
+        format.html{render :layout => 'base_courses'}
+        format.api
+      end
+    else
+      render_403
     end
+
   end