From 23fbd22d6d2bbca0aefcb01cfef99b97ed2c2a71 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Fri, 20 Sep 2019 17:05:33 +0800 Subject: [PATCH 1/2] fix --- app/services/ecs/import_student_service.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/services/ecs/import_student_service.rb b/app/services/ecs/import_student_service.rb index 8c16bd6e5..f5cd7c6ac 100644 --- a/app/services/ecs/import_student_service.rb +++ b/app/services/ecs/import_student_service.rb @@ -14,7 +14,7 @@ class Ecs::ImportStudentService < ApplicationService excel = Ecs::ImportStudentExcel.new(params[:file].path) success_count = 0 - EcYearStudent.bulk_insert(:student_id, :name, :created_at, :updated_at) do |worker| + EcYearStudent.bulk_insert(:ec_year_id, :student_id, :name, :created_at, :updated_at) do |worker| excel.read_each do |student_id, name| success_count += 1 @@ -24,7 +24,7 @@ class Ecs::ImportStudentService < ApplicationService next end - worker.add(student_id: student_id, name: name) + worker.add(ec_year_id: ec_year.id, student_id: student_id, name: name) end end From f79153688f7647020047ea5542cddd68127cb288 Mon Sep 17 00:00:00 2001 From: SylorHuang Date: Fri, 20 Sep 2019 17:07:45 +0800 Subject: [PATCH 2/2] change data-disable-with --- .../admins/professional_authentications/shared/_list.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/admins/professional_authentications/shared/_list.html.erb b/app/views/admins/professional_authentications/shared/_list.html.erb index bdcb87e21..10934a702 100644 --- a/app/views/admins/professional_authentications/shared/_list.html.erb +++ b/app/views/admins/professional_authentications/shared/_list.html.erb @@ -57,8 +57,8 @@ <%= javascript_void_link('拒绝', class: 'action refuse-action', data: { toggle: 'modal', target: '.admin-common-refuse-modal', id: apply.id, - url: refuse_admins_professional_authentication_path(apply, element: ".professional-authentication-#{apply.id}", 'data-disable-with': "拒绝中...") - }) %> + url: refuse_admins_professional_authentication_path(apply, element: ".professional-authentication-#{apply.id}") + }, 'data-disable-with': "拒绝中...") %> <% end %>