Merge branch 'educoder' into dev_aliyun

5 years ago · 758087a5ba
parent 47f2bda924 4070ff98c5
commit 758087a5ba
2 changed files with 36 additions and 1 deletions
--- a/app/views/managements/_competition_enroll_list.html.erb
+++ b/app/views/managements/_competition_enroll_list.html.erb
@ -33,7 +33,7 @@
      <td><%= member_user.try(:authentication_status) %></td>
      <td><%= member_user.try(:professional_status) %></td>
      <td><%= member_user.try(:school_name) %></td>
-      <td><%= member_user.user_extensions.school.try(:province) %></td>
+      <td><%= member_user.user_extensions.try(:school).try(:province) %></td>
      <td><%= format_time member.created_at %></td>
    </tr>
  <% end %>
--- a/db/migrate/20190726085129_add_team_member_for_competition_teams.rb
+++ b/db/migrate/20190726085129_add_team_member_for_competition_teams.rb