kevinli
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_xucheng' into develop

This commit is contained in:
huang 2017-08-25 20:27:12 +08:00
parent 7ebb8d63b0 290df45c79
commit 6a5a3024ec
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/managements/_audit_pro_authentication_list.html.erb
View File

@ -16,7 +16,7 @@
<span><%= user.user_extensions.school.name %><%= user.user_extensions.department ? ' - '+user.user_extensions.department.name.to_s : '' %></span>
<% end %>
<% if user.user_extensions && user.user_extensions.identity %>
<span class="ml30"><%= user.identity %></span>
<!--<span class="ml30"><%#= user.identity %></span>-->
<% if user.user_extensions.identity == 1 && user.user_extensions.try(:student_id) %>
<span class="ml30"><%= user.user_extensions.try(:student_id) %></span>
<% else %>

1
app/views/managements/_pro_authentication_list.html.erb
View File

@ -18,7 +18,6 @@
<span><%= user.user_extensions.school.name %><%= user.user_extensions.department ? ' - '+user.user_extensions.department.name.to_s : '' %></span>
<% end %>
<% if user.user_extensions && user.user_extensions.identity %>
<span class="ml30"><%= user.identity %></span>
<% if user.user_extensions.identity == 1 && user.user_extensions.try(:student_id) %>
<span class="ml30"><%= user.user_extensions.try(:student_id) %></span>
<% else %>

11
db/migrate/20170825113413_modify_support_shixuns_for_major.rb Normal file
View File

@ -0,0 +1,11 @@
class ModifySupportShixunsForMajor < ActiveRecord::Migration
def up
sql = "SELECT distinct(major_id) FROM `major_courses`"
MajorCourse.find_by_sql(sql).each do |mc|
Major.where(:id => mc.try(:major_id)).first.update_column(:support_shixuns, 1)
end
end
def down
end
end