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

make sure a course made sectionless due to crosslisting gets marked deleted. fixes #4518 

Change-Id: I28998d8d2159fc8875cda0c23b210c08b3a2f800
Reviewed-on: https://gerrit.instructure.com/3536
Tested-by: Hudson <hudson@instructure.com>
Reviewed-by: Cody Cutrer <cody@instructure.com>
Reviewed-by: Zach Wily <zach@instructure.com>
This commit is contained in:
JT Olds 2011-05-06 18:18:39 -06:00
parent 123b23c73e
commit beb9b53c1d
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/course_section.rb
View File

@ -121,7 +121,8 @@ class CourseSection < ActiveRecord::Base
if (self.nonxlist_course.course_sections.active.count == 0 ||
(self.nonxlist_course.course_sections.active.count == 1 &&
self.nonxlist_course.course_sections.active.first.enrollments.count == 0)) &&
self.nonxlist_course.workflow_state == "created"
(self.nonxlist_course.workflow_state == "created" ||
self.nonxlist_course.workflow_state == "claimed")
self.nonxlist_course.workflow_state = "deleted"
self.nonxlist_course.save!
end

21
spec/lib/sis_csv_importer_spec.rb
View File

@ -798,6 +798,27 @@ describe SIS::SisCsv do
xlist_course.workflow_state.should == "claimed"
end
it 'should mark the original course deleted if it is made empty due to crosslisting' do
process_csv_data(
"course_id,short_name,long_name,account_id,term_id,status",
"C001,TC 101,Test Course 101,,,active",
"C002,TC 101,Test Course 101,,,active"
)
process_csv_data(
"section_id,course_id,name,start_date,end_date,status",
"S001,C001,Sec1,2011-1-05 00:00:00,2011-4-14 00:00:00,active",
"S002,C002,Sec2,2012-12-05 00:00:00,2012-12-14 00:00:00,active",
"S003,C002,Sec3,2012-12-05 00:00:00,2012-12-14 00:00:00,active"
)
process_csv_data(
"xlist_course_id,section_id,status",
"X001,S001,active",
"X001,S002,active"
)
@account.courses.find_by_sis_source_id("C002").workflow_state.should_not == "deleted"
@account.courses.find_by_sis_source_id("C001").workflow_state.should == "deleted"
end
it 'should work with xlists with an xlist course defined' do
process_csv_data(
"course_id,short_name,long_name,account_id,term_id,status",