diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 28b395fc2..739288379 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -108,9 +108,9 @@ class CoursesController < ApplicationController school_id = User.find(@course.tea_id).try(:user_extensions).try(:school_id) @import_attachments = Attachment.where(:container_id => @course.id, :container_type => "ImportStudent") @had_import_count = 0 + @list_count = 0 if @import_attachments.present? @import_attachments.each do |attachment| - @list_count = 0 path = attachment.disk_directory name = attachment.disk_filename if name.split(".").last == "xls" || name.split(".").last == "xlsx" diff --git a/app/views/courses/settings/_import_students_result.html.erb b/app/views/courses/settings/_import_students_result.html.erb new file mode 100644 index 000000000..6dbbc7330 --- /dev/null +++ b/app/views/courses/settings/_import_students_result.html.erb @@ -0,0 +1,12 @@ + +
diff --git a/app/views/courses/sync_students.js.erb b/app/views/courses/sync_students.js.erb index c49456425..c4dea436f 100644 --- a/app/views/courses/sync_students.js.erb +++ b/app/views/courses/sync_students.js.erb @@ -1,2 +1,6 @@ $("#setting_teacher_list").hide(); -$("#setting_student_list").html("<%= j(render :partial => 'courses/settings/all_student_list') %>").show(); \ No newline at end of file +$("#setting_student_list").html("<%= j(render :partial => 'courses/settings/all_student_list') %>").show(); +<% if @had_import_count > 0 %> +var htmlvalue = '<%= escape_javascript(render :partial => 'courses/settings/import_students_result', :locals => {:course => @course}) %>'; +pop_box_new(htmlvalue, 440, 490); +<% end %> \ No newline at end of file