From 264cb8d28811204d1655148620a41fda3b83ce77 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Sat, 2 Nov 2019 17:28:10 +0800 Subject: [PATCH 1/6] fix --- app/views/competitions/prizes/show.json.jbuilder | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/competitions/prizes/show.json.jbuilder b/app/views/competitions/prizes/show.json.jbuilder index 792773900..c97ff6fbe 100644 --- a/app/views/competitions/prizes/show.json.jbuilder +++ b/app/views/competitions/prizes/show.json.jbuilder @@ -7,13 +7,13 @@ end json.personal_certifications do json.array! @self_prizes do |prize_user| - json.url personal_competition_certificate_path(current_competition, prize_user) + json.url personal_competition_certificate_path(current_competition.identifier, prize_user) end end json.team_certifications do json.array! @team_prizes do |team| - json.url team_competition_certificate_path(current_competition, team) + json.url team_competition_certificate_path(current_competition.identifier, team) end end From 363ed577e51e75e1ee0f1751ea3d552fa067f4f3 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Sat, 2 Nov 2019 18:01:14 +0800 Subject: [PATCH 2/6] fix --- app/controllers/competitions/certificates_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/competitions/certificates_controller.rb b/app/controllers/competitions/certificates_controller.rb index ab52920cd..dfe666561 100644 --- a/app/controllers/competitions/certificates_controller.rb +++ b/app/controllers/competitions/certificates_controller.rb @@ -11,7 +11,7 @@ class Competitions::CertificatesController < Competitions::BaseController end def team - team = CompetitionTeam.find(id: params[:id]) + team = CompetitionTeam.find(params[:id]) return render_forbidden unless team.team_members.exists?(user_id: current_user.id) return render_not_found unless team.certificate_exist? From 4a48ab39328d45880c956029743bd3d120c919a3 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Sat, 2 Nov 2019 18:02:24 +0800 Subject: [PATCH 3/6] fix --- app/controllers/competitions/certificates_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/competitions/certificates_controller.rb b/app/controllers/competitions/certificates_controller.rb index dfe666561..68dad41c1 100644 --- a/app/controllers/competitions/certificates_controller.rb +++ b/app/controllers/competitions/certificates_controller.rb @@ -13,7 +13,7 @@ class Competitions::CertificatesController < Competitions::BaseController def team team = CompetitionTeam.find(params[:id]) return render_forbidden unless team.team_members.exists?(user_id: current_user.id) - return render_not_found unless team.certificate_exist? + return render_not_found unless team.certificate_exists? prize = team.competition_prize_users.first.competition_prize filename = "#{current_competition.name}-#{prize.name}-#{team.name}.pdf" From aa5eb76b570f95b5d27a2cf54940992b522060f2 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Sat, 2 Nov 2019 18:05:28 +0800 Subject: [PATCH 4/6] fix --- app/templates/competition_certificates/team.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/competition_certificates/team.html.erb b/app/templates/competition_certificates/team.html.erb index e889d3c62..b38b3bd16 100644 --- a/app/templates/competition_certificates/team.html.erb +++ b/app/templates/competition_certificates/team.html.erb @@ -9,7 +9,7 @@

- <%= @member_names %>（指导老师：<%= @teacher_names %>） 在第二届“全国高校绿色计算大赛”（任务挑战组）中成绩突出，荣获“团体 <%= @prize.name %>”。 + <%= @member_names %>（指导老师：<%= @teacher_names %>） 在第二届“全国高校绿色计算大赛”（<%= @prize.competition.sub_title %>）中成绩突出，荣获“团体 <%= @prize.name %>”。

特发此证，以资鼓励。

From f34bffde8db565624b49d1e1afa22586543d23da Mon Sep 17 00:00:00 2001 From: p31729568 Date: Sat, 2 Nov 2019 18:09:15 +0800 Subject: [PATCH 5/6] fix --- app/services/competitions/save_prize_team_account_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/competitions/save_prize_team_account_service.rb b/app/services/competitions/save_prize_team_account_service.rb index 60d10cf54..098a5365b 100644 --- a/app/services/competitions/save_prize_team_account_service.rb +++ b/app/services/competitions/save_prize_team_account_service.rb @@ -10,7 +10,7 @@ class Competitions::SavePrizeTeamAccountService < ApplicationService def call Competitions::SavePrizeTeamAccountForm.new(params).validate! - prize_leaders = competition.competition_prize_users.where(competition.competition_prize_users) + prize_leaders = competition.competition_prize_users.where(user_id: user.id, leader: true) raise Error, '审批通过后不能修改' if prize_leaders.exists?(status: :approved) From 314c83d44aeb8dfef733bc73079958103bfc1e04 Mon Sep 17 00:00:00 2001 From: p31729568 Date: Sat, 2 Nov 2019 18:23:52 +0800 Subject: [PATCH 6/6] admin: modify style --- app/views/admins/competition_prize_users/shared/_tr.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/admins/competition_prize_users/shared/_tr.html.erb b/app/views/admins/competition_prize_users/shared/_tr.html.erb index fada20c43..18912c36a 100644 --- a/app/views/admins/competition_prize_users/shared/_tr.html.erb +++ b/app/views/admins/competition_prize_users/shared/_tr.html.erb @@ -16,7 +16,7 @@ <% if prize_user.leader? && prize_user.competition_prize.category == 'bonus' %> <% bank_content = [prize_user.extra&.[]('bank'), prize_user.extra&.[]('second_bank'), prize_user.extra&.[]('card_no')].compact.join('
').presence || '无' %> - <%= javascript_void_link('查看银行账户', data: { toggle: 'popover', title: '银行账号', content: bank_content.html_safe }) %> + <%= javascript_void_link('查看银行账户', data: { toggle: 'popover', title: '银行账号', content: bank_content.html_safe, html: true }) %> <% end %> <% if prize_user.pending? %>