Merge pull request instructure#220 from va7map/misc-plugins

Retire WebCT course import override + remove hardcoded SFU account names
lunchgroup · Sep 9, 2015 · 3d5f584 · 3d5f584
2 parents e89b924 + 9d49b33
commit 3d5f584
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 28 deletions.
diff --git a/vendor/plugins/sfu_api/app/controllers/api_controller.rb b/vendor/plugins/sfu_api/app/controllers/api_controller.rb
@@ -21,9 +21,8 @@ def course
   end
 
   def user
-    account_id = Account.find_by_name('Simon Fraser University').id
     sfu_id = params[:sfu_id]
-    pseudonym = Pseudonym.where(:unique_id => sfu_id, :account_id => account_id).all
+    pseudonym = Pseudonym.where(:unique_id => sfu_id, :account_id => Account.default.id).all
 
     raise(ActiveRecord::RecordNotFound) if pseudonym.empty?
 
@@ -62,7 +61,7 @@ def user
   def terms
     term_arr = []
     if params[:term].nil?
-      terms = Account.find_by_name('Simon Fraser University').enrollment_terms.find(:all, :conditions => "workflow_state = 'active'", :order => 'sis_source_id DESC').delete_if {|t| t.name == 'Default Term'}
+      terms = Account.default.enrollment_terms.find(:all, :conditions => "workflow_state = 'active'", :order => 'sis_source_id DESC').delete_if {|t| t.name == 'Default Term'}
       terms.each do |term|
         term_info = {}
         term_info["name"] = term.name
@@ -72,7 +71,7 @@ def terms
         term_arr.push term_info
       end
     else
-      term = Account.find_by_name('Simon Fraser University').enrollment_terms.find(:all, :conditions => "sis_source_id = '#{params[:term]}'")
+      term = Account.default.enrollment_terms.find(:all, :conditions => "sis_source_id = '#{params[:term]}'")
       term_info = {}
       term_info["name"] = term.first.name
       term_info["sis_source_id"] = term.first.sis_source_id

diff --git a/vendor/plugins/sfu_api/app/model/sfu/rest.rb b/vendor/plugins/sfu_api/app/model/sfu/rest.rb
@@ -32,8 +32,7 @@ def maillist_membership_url
     end
 
     def canvas_sis_import_url
-      account_id = Account.find_by_name("Simon Fraser University").id
-      "#{canvas_server}/api/v1/accounts/#{account_id}/sis_imports.json?extension=csv"
+      "#{canvas_server}/api/v1/accounts/#{Account.default.id}/sis_imports.json?extension=csv"
     end
 
     def text(url, params)

diff --git a/vendor/plugins/sfu_course_copy_importer/init.rb b/vendor/plugins/sfu_course_copy_importer/init.rb
diff --git a/vendor/plugins/sfu_course_form/app/controllers/course_form_controller.rb b/vendor/plugins/sfu_course_form/app/controllers/course_form_controller.rb
@@ -35,7 +35,7 @@ def new_adhoc
   def create
     req_user = User.find(@current_user.id).pseudonym.unique_id
     selected_courses = []
-    account_id = Account.find_by_name("Simon Fraser University").id
+    account_id = Account.default.id
     teacher_username = params[:username]
     teacher2_username = params[:enroll_me]
     teacher_sis_user_id = sis_user_id(teacher_username, account_id)