ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix courses controller for rails 3 specs 

Change-Id: I2f24f493f616970f9d613bda5225d2a08b530949
Reviewed-on: https://gerrit.instructure.com/29875
Tested-by: Jenkins <jenkins@instructure.com>
Reviewed-by: James Williams  <jamesw@instructure.com>
Product-Review: Cody Cutrer <cody@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
This commit is contained in:
Cody Cutrer 2014-02-10 11:22:44 -07:00
parent 3784e2d595
commit b5a71414ec
1 changed files with 36 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
app/controllers/courses_controller.rb
View File

@ -1304,12 +1304,10 @@ class CoursesController < ApplicationController
get_context get_context
@enrollment = @context.enrollments.find(params[:id]) @enrollment = @context.enrollments.find(params[:id])
if @enrollment.can_be_deleted_by(@current_user, @context, session) if @enrollment.can_be_deleted_by(@current_user, @context, session)
respond_to do |format| if (!@enrollment.defined_by_sis? || @context.grants_right?(@current_user, session, :manage_account_settings)) && @enrollment.destroy
if (!@enrollment.defined_by_sis? || @context.grants_right?(@current_user, session, :manage_account_settings)) && @enrollment.destroy render :json => @enrollment
format.json { render :json => @enrollment } else
else render :json => @enrollment, :status => :bad_request
format.json { render :json => @enrollment, :status => :bad_request }
end
end end
else else
authorized_action(@context, @current_user, :permission_fail) authorized_action(@context, @current_user, :permission_fail)
@ -1339,43 +1337,39 @@ class CoursesController < ApplicationController
if @current_user && @current_user.can_create_enrollment_for?(@context, session, params[:enrollment_type]) if @current_user && @current_user.can_create_enrollment_for?(@context, session, params[:enrollment_type])
params[:user_list] ||= "" params[:user_list] ||= ""
respond_to do |format| # Enrollment settings hash
# Enrollment settings hash # Change :limit_privileges_to_course_section to be an explicit true/false value
# Change :limit_privileges_to_course_section to be an explicit true/false value enrollment_options = params.slice(:course_section_id, :enrollment_type, :limit_privileges_to_course_section)
enrollment_options = params.slice(:course_section_id, :enrollment_type, :limit_privileges_to_course_section) limit_privileges = value_to_boolean(enrollment_options[:limit_privileges_to_course_section])
limit_privileges = value_to_boolean(enrollment_options[:limit_privileges_to_course_section]) enrollment_options[:limit_privileges_to_course_section] = limit_privileges
enrollment_options[:limit_privileges_to_course_section] = limit_privileges enrollment_options[:role_name] = custom_role.name if custom_role
enrollment_options[:role_name] = custom_role.name if custom_role list = UserList.new(params[:user_list],
list = UserList.new(params[:user_list], :root_account => @context.root_account,
:root_account => @context.root_account, :search_method => @context.user_list_search_mode_for(@current_user),
:search_method => @context.user_list_search_mode_for(@current_user), :initial_type => params[:enrollment_type])
:initial_type => params[:enrollment_type]) if !(@context.completed? || @context.soft_concluded?) && (@enrollments = EnrollmentsFromUserList.process(list, @context, enrollment_options))
if !(@context.completed? || @context.soft_concluded?) && (@enrollments = EnrollmentsFromUserList.process(list, @context, enrollment_options)) Enrollment.send(:preload_associations, @enrollments, [:course_section, {:user => [:communication_channel, :pseudonym]}])
format.json do json = @enrollments.map { |e|
Enrollment.send(:preload_associations, @enrollments, [:course_section, {:user => [:communication_channel, :pseudonym]}]) { 'enrollment' =>
json = @enrollments.map { |e| { 'associated_user_id' => e.associated_user_id,
{ 'enrollment' => 'communication_channel_id' => e.user.communication_channel.try(:id),
{ 'associated_user_id' => e.associated_user_id, 'email' => e.email,
'communication_channel_id' => e.user.communication_channel.try(:id), 'id' => e.id,
'email' => e.email, 'name' => (e.user.last_name_first || e.user.name),
'id' => e.id, 'pseudonym_id' => e.user.pseudonym.try(:id),
'name' => (e.user.last_name_first || e.user.name), 'section' => e.course_section.display_name,
'pseudonym_id' => e.user.pseudonym.try(:id), 'short_name' => e.user.short_name,
'section' => e.course_section.display_name, 'type' => e.type,
'short_name' => e.user.short_name, 'user_id' => e.user_id,
'type' => e.type, 'workflow_state' => e.workflow_state,
'user_id' => e.user_id, 'custom_role_asset_string' => custom_role ? custom_role.asset_string : nil,
'workflow_state' => e.workflow_state, 'already_enrolled' => e.already_enrolled
'custom_role_asset_string' => custom_role ? custom_role.asset_string : nil,
'already_enrolled' => e.already_enrolled
}
}
} }
render :json => json }
end }
else render :json => json
format.json { render :json => "", :status => :bad_request } else
end render :json => "", :status => :bad_request
end end
else else
authorized_action(@context, @current_user, :permission_fail) authorized_action(@context, @current_user, :permission_fail)