1.修改课程配置界面

2.新增课程成员修改
3.删除课程成员修改
4.课程成员类型更改支持

app/controllers/application_controller.rb

@@ -309,6 +309,10 @@ class ApplicationController < ActionController::Base
     render_404 unless @object.present?
 
     @project = @object.project
+    if @project == nil && @object.has_attribute?('course_id')
+      @course = @object.course
+    end
+
   end
 
   def find_model_object

app/controllers/courses_controller.rb

@@ -1,4 +1,5 @@
 class CoursesController < ApplicationController
+  layout 'base_courses'
   include CoursesHelper
   helper :activities
   helper :members

app/controllers/members_controller.rb

@@ -21,6 +21,7 @@ class MembersController < ApplicationController
   before_filter :find_project_by_project_id, :only => [:index, :create, :autocomplete]
   before_filter :authorize
   accept_api_auth :index, :show, :create, :update, :destroy
+
   def index
     @offset, @limit = api_offset_and_limit
     @member_count = @project.member_principals.count
@@ -59,10 +60,13 @@ class MembersController < ApplicationController
         end
       end
     else
+      #modify by nwb
+      #更改课程成员逻辑
       applied_members = false
       members = []
-      project_info = []
       user_grades = []
+      if @project
+        project_info = []
         if params[:membership]
           if params[:membership][:user_ids]
             attrs = params[:membership].dup
@@ -92,18 +96,14 @@ class MembersController < ApplicationController
           @project.user_grades << user_grades
           # end
         end
-    end
-
-    if members.present? && members.all? {|m| m.valid? }
+        if members.present? && members.all? { |m| m.valid? }
           members.each do |member|
             AppliedProject.deleteappiled(member.user_id, @project.id)
           end
-
         end
-
         respond_to do |format|
           format.html { redirect_to_settings_in_projects }
-      format.js { @members = members;@applied_members = applied_members; }
+          format.js { @members = members; @applied_members = applied_members; }
           format.api {
             @member = members.first
             if @member.valid?
@@ -113,14 +113,55 @@ class MembersController < ApplicationController
             end
           }
         end
+      elsif @course
+        course_info = []
+        if params[:membership]
+          if params[:membership][:user_ids]
+            attrs = params[:membership].dup
+            user_ids = attrs.delete(:user_ids)
+            user_ids.each do |user_id|
+              members << Member.new(:role_ids => params[:membership][:role_ids], :user_id => user_id)
+              user_grades << UserGrade.new(:user_id => user_id, :course_id => @course.id)
+              if (params[:membership][:role_ids] && params[:membership][:role_ids][0] == "3")
+                course_info << CourseInfo.new(:user_id => user_id, :course_id => @course.id)
+              end
+            end
+          else
+            members << Member.new(:role_ids => params[:membership][:role_ids], :user_id => params[:membership][:user_id])
+            if (params[:membership][:role_ids] && params[:membership][:role_ids][0] == "3")
+              course_info << CourseInfo.new(:course_id => @course.id, :user_id => params[:membership][:user_id])
+            end
+          end
+          @course.members << members
+          @course.course_infos << course_info
+        end
+        respond_to do |format|
+          format.html { redirect_to_settings_in_courses }
+          format.js { @members = members; @applied_members = applied_members; }
+          format.api {
+            @member = members.first
+            if @member.valid?
+              render :action => 'show', :status => :created, :location => membership_url(@member)
+            else
+              render_validation_errors(@member)
+            end
+          }
+        end
+      end     # end of  if @project
+
+    end  # end of params[:refusal_button]
+
   end
 
   def update
+    #modify by nwb
+    #增加对课程成员修改的支持
+    if @project
       if params[:membership]
         @member.role_ids = params[:membership][:role_ids]
 
         #added by nie
-      if(params[:membership][:role_ids] && params[:membership][:role_ids][0] == "3")
+        if (params[:membership][:role_ids] && params[:membership][:role_ids][0] == "3")
           @projectInfo = ProjectInfo.new(:user_id => @member.user_id, :project_id => @project.id)
           @projectInfo.save
         else
@@ -145,9 +186,43 @@ class MembersController < ApplicationController
           end
         }
       end
+    elsif @course
+      if params[:membership]
+        @member.role_ids = params[:membership][:role_ids]
+
+        if (params[:membership][:role_ids] && params[:membership][:role_ids][0] == "3")
+          @courseInfo = CourseInfos.new(:user_id => @member.user_id, :course_id => @course.id)
+          @courseInfo.save
+        else
+          user_admin = CourseInfos.where("user_id = ? and course_id = ?", @member.user_id, @course.id)
+          if user_admin.size > 0
+            user_admin.each do |user|
+              user.destroy
+            end
+          end
+        end
+      end
+
+      saved = @member.save
+      respond_to do |format|
+        format.html { redirect_to_settings_in_courses }
+        format.js
+        format.api {
+          if saved
+            render_api_ok
+          else
+            render_validation_errors(@member)
+          end
+        }
+      end
+    end
+
   end
 
   def destroy
+    #modify by nwb
+    #课程成员删除修改
+    if @project
       if request.delete? && @member.deletable?
         @member.destroy
         # end
@@ -175,6 +250,28 @@ class MembersController < ApplicationController
           end
         }
       end
+    elsif @course
+      if request.delete? && @member.deletable?
+        @member.destroy
+        user_admin = CourseInfos.where("user_id = ? and course_id = ?", @member.user_id, @course.id)
+        if user_admin.size > 0
+          user_admin.each do |user|
+            user.destroy
+          end
+        end
+      end
+      respond_to do |format|
+        format.html { redirect_to_settings_in_courses }
+        format.js
+        format.api {
+          if @member.destroyed?
+            render_api_ok
+          else
+            head :unprocessable_entity
+          end
+        }
+      end
+    end
   end
 
   def autocomplete
@@ -188,4 +285,8 @@ class MembersController < ApplicationController
   def redirect_to_settings_in_projects
     redirect_to settings_project_path(@project, :tab => 'members')
   end
+
+  def redirect_to_settings_in_courses
+    redirect_to settings_course_path(@course, :tab => 'members')
+  end
 end

app/models/member.rb

@@ -86,7 +86,13 @@ class Member < ActiveRecord::Base
   def set_issue_category_nil
     if user
       # remove category based auto assignments for this member
+      #modify by nwb
+      if project
         IssueCategory.update_all "assigned_to_id = NULL", ["project_id = ? AND assigned_to_id = ?", project.id, user.id]
+      elsif course
+        #IssueCategory.update_all "assigned_to_id = NULL", ["course_id = ? AND assigned_to_id = ?", course.id, user.id]
+      end
+
     end
   end
 

app/views/members/create.js.erb

@@ -1,4 +1,9 @@
+<%if @project%>
 $('#tab-content-members').html('<%= escape_javascript(render :partial => 'projects/settings/members') %>');
+<%elsif @course%>
+$('#tab-content-members').html('<%= escape_javascript(render :partial => 'courses/settings/members') %>');
+<%end%>
+
 hideOnLoad();
 
 <%if !@applied_members%>

app/views/members/destroy.js.erb

@@ -1,2 +1,6 @@
+  <%if @project%>
 $('#tab-content-members').html('<%= escape_javascript(render :partial => 'projects/settings/members') %>');
+  <%elsif @course%>
+  $('#tab-content-members').html('<%= escape_javascript(render :partial => 'courses/settings/members') %>');
+  <%end%>
 hideOnLoad();

app/views/members/update.js.erb

@@ -1,3 +1,7 @@
+<%if @project%>
 $('#tab-content-members').html('<%= escape_javascript(render :partial => 'projects/settings/members') %>');
+<%elsif @course%>
+$('#tab-content-members').html('<%= escape_javascript(render :partial => 'courses/settings/members') %>');
+<%end%>
 hideOnLoad();
 $("#member-<%= @member.id %>").effect("highlight");