p94386572
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1.修改课程配置界面 

2.新增课程成员修改
3.删除课程成员修改
4.课程成员类型更改支持
This commit is contained in:
nwb 2014-06-12 16:01:38 +08:00
parent ae8fcca14f
commit 3933817570
7 changed files with 221 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/application_controller.rb
View File

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

1
app/controllers/courses_controller.rb
View File

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

291
app/controllers/members_controller.rb
View File

@ -21,15 +21,16 @@ class MembersController < ApplicationController
before_filter :find_project_by_project_id, :only => [:index, :create, :autocomplete] before_filter :find_project_by_project_id, :only => [:index, :create, :autocomplete]
before_filter :authorize before_filter :authorize
accept_api_auth :index, :show, :create, :update, :destroy accept_api_auth :index, :show, :create, :update, :destroy
def index def index
@offset, @limit = api_offset_and_limit @offset, @limit = api_offset_and_limit
@member_count = @project.member_principals.count @member_count = @project.member_principals.count
@member_pages = Paginator.new @member_count, @limit, params['page'] @member_pages = Paginator.new @member_count, @limit, params['page']
@offset ||= @member_pages.offset @offset ||= @member_pages.offset
@members = @project.member_principals.all( @members = @project.member_principals.all(
:order => "#{Member.table_name}.id", :order => "#{Member.table_name}.id",
:limit => @limit, :limit => @limit,
:offset => @offset :offset => @offset
) )
respond_to do |format| respond_to do |format|
@ -59,121 +60,217 @@ class MembersController < ApplicationController
end end
end end
else else
#modify by nwb
#更改课程成员逻辑
applied_members = false applied_members = false
members = [] members = []
project_info = []
user_grades = [] user_grades = []
if params[:membership] if @project
if params[:membership][:user_ids] project_info = []
attrs = params[:membership].dup if params[:membership]
user_ids = attrs.delete(:user_ids) if params[:membership][:user_ids]
user_ids.each do |user_id| attrs = params[:membership].dup
members << Member.new(:role_ids => params[:membership][:role_ids], :user_id => user_id) user_ids = attrs.delete(:user_ids)
user_grades << UserGrade.new(:user_id => user_id, :project_id => @project.id) 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, :project_id => @project.id)
## added by nie
if (params[:membership][:role_ids] && params[:membership][:role_ids][0] == "3")
project_info << ProjectInfo.new(:user_id => user_id, :project_id => @project.id)
# ProjectInfo.create(:name => "test", :user_id => 123)
end
## end
end
else
members << Member.new(:role_ids => params[:membership][:role_ids], :user_id => params[:membership][:user_id])
user_grades << UserGrade.new(:user_id => params[:membership][:user_id], :project_id => @project.id)
## added by nie ## 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")
project_info << ProjectInfo.new(:user_id => user_id, :project_id => @project.id) project_info << ProjectInfo.new(:project_id => @project.id, :user_id => params[:membership][:user_id])
# ProjectInfo.create(:name => "test", :user_id => 123)
end end
## end ## end
end
else
members << Member.new(:role_ids => params[:membership][:role_ids], :user_id => params[:membership][:user_id])
user_grades << UserGrade.new(:user_id => params[:membership][:user_id], :project_id => @project.id)
## added by nie
if (params[:membership][:role_ids] && params[:membership][:role_ids][0] == "3")
project_info << ProjectInfo.new(:project_id => @project.id, :user_id => params[:membership][:user_id])
end end
## end @project.members << members
# added by nie
@project.project_infos << project_info
@project.user_grades << user_grades
# end
end end
@project.members << members if members.present? && members.all? { |m| m.valid? }
# added by nie members.each do |member|
@project.project_infos << project_info AppliedProject.deleteappiled(member.user_id, @project.id)
@project.user_grades << user_grades end
# end
end
end
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.api {
@member = members.first
if @member.valid?
render :action => 'show', :status => :created, :location => membership_url(@member)
else
render_validation_errors(@member)
end end
} respond_to do |format|
end format.html { redirect_to_settings_in_projects }
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
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 end
def update def update
if params[:membership] #modify by nwb
@member.role_ids = params[:membership][:role_ids] #增加对课程成员修改的支持
if @project
if params[:membership]
@member.role_ids = params[:membership][:role_ids]
#added by nie #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 = ProjectInfo.new(:user_id => @member.user_id, :project_id => @project.id)
@projectInfo.save @projectInfo.save
else else
user_admin = ProjectInfo.where("user_id = ? and project_id = ?", @member.user_id, @project.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_projects }
format.js
format.api {
if saved
render_api_ok
else
render_validation_errors(@member)
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
user_admin = ProjectInfo.where("user_id = ? and project_id = ?", @member.user_id, @project.id) user_admin = ProjectInfo.where("user_id = ? and project_id = ?", @member.user_id, @project.id)
if user_admin.size > 0 if user_admin.size > 0
user_admin.each do |user| user_admin.each do |user|
user.destroy user.destroy
end end
end end
end user_grade = UserGrade.where("user_id = ? and project_id = ?", @member.user_id, @project.id)
end if user_grade.size > 0
user_grade.each do |grade|
saved = @member.save grade.destroy
respond_to do |format| end
format.html { redirect_to_settings_in_projects }
format.js
format.api {
if saved
render_api_ok
else
render_validation_errors(@member)
end
}
end
end
def destroy
if request.delete? && @member.deletable?
@member.destroy
# end
user_admin = ProjectInfo.where("user_id = ? and project_id = ?", @member.user_id, @project.id)
if user_admin.size > 0
user_admin.each do |user|
user.destroy
end end
end end
user_grade = UserGrade.where("user_id = ? and project_id = ?", @member.user_id, @project.id) respond_to do |format|
if user_grade.size > 0 format.html { redirect_to_settings_in_projects }
user_grade.each do |grade| format.js
grade.destroy format.api {
if @member.destroyed?
render_api_ok
else
head :unprocessable_entity
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
end end
end respond_to do |format|
respond_to do |format| format.html { redirect_to_settings_in_courses }
format.html { redirect_to_settings_in_projects } format.js
format.js format.api {
format.api { if @member.destroyed?
if @member.destroyed? render_api_ok
render_api_ok else
else head :unprocessable_entity
head :unprocessable_entity end
end }
} end
end end
end end
@ -188,4 +285,8 @@ class MembersController < ApplicationController
def redirect_to_settings_in_projects def redirect_to_settings_in_projects
redirect_to settings_project_path(@project, :tab => 'members') redirect_to settings_project_path(@project, :tab => 'members')
end end
def redirect_to_settings_in_courses
redirect_to settings_course_path(@course, :tab => 'members')
end
end end

8
app/models/member.rb
View File

@ -86,7 +86,13 @@ class Member < ActiveRecord::Base
def set_issue_category_nil def set_issue_category_nil
if user if user
# remove category based auto assignments for this member # remove category based auto assignments for this member
IssueCategory.update_all "assigned_to_id = NULL", ["project_id = ? AND assigned_to_id = ?", project.id, user.id] #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
end end

5
app/views/members/create.js.erb
View File

@ -1,4 +1,9 @@
<%if @project%>
$('#tab-content-members').html('<%= escape_javascript(render :partial => 'projects/settings/members') %>'); $('#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(); hideOnLoad();
<%if !@applied_members%> <%if !@applied_members%>

4
app/views/members/destroy.js.erb
View File

@ -1,2 +1,6 @@
<%if @project%>
$('#tab-content-members').html('<%= escape_javascript(render :partial => 'projects/settings/members') %>'); $('#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(); hideOnLoad();

4
app/views/members/update.js.erb
View File

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