From 5d1ad32eb8f59992354d37249b23cbb528c48691 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Wed, 3 Jul 2019 10:49:40 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8A=A5500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/tiding.rb | 2 +- app/services/games_service.rb | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/models/tiding.rb b/app/models/tiding.rb index c5b2e6a3..5107374e 100644 --- a/app/models/tiding.rb +++ b/app/models/tiding.rb @@ -252,7 +252,7 @@ class Tiding < ActiveRecord::Base if self.tiding_type == "Mentioned" "@了你：" + message_content(container.notes) elsif self.tiding_type == "Comment" - "评论了你" + (container.parent.present? ? "的回复：" : "发布的项目issue：") + message_content(container.notes) + container.present? ? ("评论了你" + (container.parent.present? ? "的回复：" : "发布的项目issue：") + message_content(container.notes)) : "" else "更新了Issue：#{container.issue.subject}" end diff --git a/app/services/games_service.rb b/app/services/games_service.rb index 8589023a..7cfe9107 100644 --- a/app/services/games_service.rb +++ b/app/services/games_service.rb @@ -568,7 +568,6 @@ class GamesService testCases = Base64.urlsafe_encode64(testSet.to_json) unless testSet.blank? - # 注意：这个地方的参数写的时候不能换行 content_modified = params[:content_modified] # 决定文件内容是否有修改，有修改如果中间成pull没有更新，则轮询等待更新 params = {:tpiID => "#{myshixun.id}", :tpiGitURL => "#{gitUrl}", :buildID => "#{taskId}",:instanceChallenge => "#{step}", From a90d48e5f1ea9a8c7f69431c3eaeee49f3be2ef6 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Wed, 3 Jul 2019 16:33:47 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=B8=96=E5=AD=90=E6=8A=A5500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/message.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/message.rb b/app/models/message.rb index fff845be..392bab48 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -53,7 +53,7 @@ class Message < ActiveRecord::Base has_many :tidings, :as => :container , :dependent => :destroy belongs_to :reply, :class_name => 'Message', :foreign_key => 'reply_id' - has_one :message_detail, :dependent => :destroy + #has_one :message_detail, :dependent => :destroy #转发表 has_many :forwards, :as => :from, :dependent => :destroy From 11f0d9c8081c320d9be2d6b99c37f987c229aac6 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Wed, 3 Jul 2019 23:19:22 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=AF=95=E5=8D=B7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8A=A5500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_student_exercise.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/exercise/_student_exercise.html.erb b/app/views/exercise/_student_exercise.html.erb index bb83e49d..0a1bdad4 100644 --- a/app/views/exercise/_student_exercise.html.erb +++ b/app/views/exercise/_student_exercise.html.erb @@ -34,8 +34,8 @@ <%= link_to exercise.user.show_real_name, user_path(exercise.user),:class=>"color-grey-3" %> <% member = @course.members.where(:user_id => exercise.user_id).first %> - - <%= member.try(:course_group_id).to_i == 0 ? '未分班' : member.course_group.name %> + + <%= member.try(:course_group_id).to_i == 0 ? '未分班' : member.course_group.try(:name) %> <% if User.current.admin || User.current.member_of_course?(@course) %> "> From 0f6a51ac7ca24b987afb2682fb5b41818b6c7967 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 4 Jul 2019 09:06:52 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=94=A8=E6=88=B7=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_p_path.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/_p_path.html.erb b/app/views/users/_p_path.html.erb index 33a1f719..37dff6c1 100644 --- a/app/views/users/_p_path.html.erb +++ b/app/views/users/_p_path.html.erb @@ -68,7 +68,7 @@

- <%= link_to object.owner.show_name, user_path(object), :class => "fl color-grey-9", :target => "_blank" %> + <%= link_to object.owner.show_name, user_path(object.owner), :class => "fl color-grey-9", :target => "_blank" %> <%= object.visits %>

From fc05ad2b2bd71429adae3504f2d4e5d8f30d7dbe Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Thu, 4 Jul 2019 12:18:01 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/competitions/_gq_second_code_competition.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/competitions/_gq_second_code_competition.html.erb b/app/views/competitions/_gq_second_code_competition.html.erb index 65b0befc..9097eccf 100644 --- a/app/views/competitions/_gq_second_code_competition.html.erb +++ b/app/views/competitions/_gq_second_code_competition.html.erb @@ -72,7 +72,8 @@

<% is_start = Time.now > first_section.start_time - btn_url = is_start ? "#{entry.url}" : "javascript:void(0);" + competition_url = User.current.logged? ? "#{entry.url}?eid=#{User.current.id}" : "#{entry.url}" + btn_url = is_start ? "#{competition_url}" : "javascript:void(0);" %>