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

fix except(:includes) in a few places 

Change-Id: I6ae9324a2833ea76de0445cc5666bf16ed80b037
Reviewed-on: https://gerrit.instructure.com/23587
Reviewed-by: Rob Orton <rob@instructure.com>
Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
Product-Review: Bracken Mosbacker <bracken@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Cody Cutrer <cody@instructure.com>
This commit is contained in:
Cody Cutrer 2013-08-22 09:33:17 -06:00
parent 314e1423a4
commit 12c7a3ecab
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/content_migrations_controller.rb
View File

@ -107,7 +107,7 @@ class ContentMigrationsController < ApplicationController
js_env :UPLOAD_LIMIT => @context.storage_quota js_env :UPLOAD_LIMIT => @context.storage_quota
js_env :SELECT_OPTIONS => options js_env :SELECT_OPTIONS => options
js_env :QUESTION_BANKS => @context.assessment_question_banks.except(:include).select([:title, :id]).active js_env :QUESTION_BANKS => @context.assessment_question_banks.except(:includes).select([:title, :id]).active
js_env :COURSE_ID => @context.id js_env :COURSE_ID => @context.id
js_env :CONTENT_MIGRATIONS => content_migration_json_hash js_env :CONTENT_MIGRATIONS => content_migration_json_hash
js_env(:OLD_START_DATE => datetime_string(@context.start_at, :verbose, nil, true)) js_env(:OLD_START_DATE => datetime_string(@context.start_at, :verbose, nil, true))

2
lib/canvas/migration/helpers/selective_content_formatter.rb
View File

@ -167,7 +167,7 @@ module Canvas::Migration::Helpers
content_list << course_item_hash(type, item) content_list << course_item_hash(type, item)
end end
when 'discussion_topics' when 'discussion_topics'
source.discussion_topics.active.only_discussion_topics.select("id, title, user_id, assignment_id").except(:user).each do |item| source.discussion_topics.active.only_discussion_topics.select("id, title, user_id, assignment_id").except(:includes).each do |item|
content_list << course_item_hash(type, item) content_list << course_item_hash(type, item)
end end
else else