From 8c3767cfa20c6da13f4013221a1b22ebf6e116c7 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Mon, 13 May 2019 10:38:05 +0800 Subject: [PATCH 1/2] fix my account page reject trial auth notify modal bug --- app/views/my/account.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb index e70c3555..5103d7f9 100644 --- a/app/views/my/account.html.erb +++ b/app/views/my/account.html.erb @@ -103,7 +103,7 @@ <% if @trail_authentication.status == 1 %> sure_box_redirect_without_newtab("<%= user_path(@user) %>", "试用申请已被接受"); <% elsif @trail_authentication.status == 2 %> - sure_box_redirect_without_newtab_btn("<%= my_account_path %>", "试用申请已被拒绝
原因：<%= @trail_authentication.reason %>", "重新申请"); + sure_box_redirect_without_newtab_btn("<%= my_account_path %>", "试用申请已被拒绝
原因：<%= [@trail_authentication.reason, @trail_authentication.reject_description].join('；') %>", "重新申请"); <% end %> <% end %> From 39423255da3d2fd99220f55b01be44f689fd04aa Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Mon, 13 May 2019 11:09:34 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E6=8A=A5=E5=91=8A?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=8A=A5500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/zip_service.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/services/zip_service.rb b/app/services/zip_service.rb index b798e111..32846312 100644 --- a/app/services/zip_service.rb +++ b/app/services/zip_service.rb @@ -188,6 +188,7 @@ module ZipService # file_name = "#{exercise.course_id}-#{exercise.exercise_name}-#{exercise_user.user.user_extensions.student_id}-#{exercise_user.user.show_real_name}" + ".pdf" # file_name = "#{Time.now.strftime("%Y%m%d%H%M%S").to_s}-#{exercise.course_id}-#{exercise.id}-#{exercise_user.user.user_extensions.student_id}" + ".pdf" file_name.gsub!(" ", "-") + file_name.gsub!("/", "_") kit.to_file("#{OUTPUT_FOLDER}/#{file_name}") out_file = "#{OUTPUT_FOLDER}/#{file_name}" out_file @@ -200,6 +201,7 @@ module ZipService # file_name = "#{homework.course_id}-#{homework.name}-#{student_work.user.user_extensions.student_id}-#{student_work.user.show_real_name}" + ".pdf" # file_name = "#{Time.now.strftime("%Y%m%d%H%M%S").to_s}-#{homework.course_id}-#{homework.id}-#{student_work.user.user_extensions.student_id}" + ".pdf" file_name.gsub!(" ", "-") + file_name.gsub!("/", "_") kit.to_file("#{OUTPUT_FOLDER}/#{file_name}") out_file = "#{OUTPUT_FOLDER}/#{file_name}" out_file