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

Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop

This commit is contained in:
caishi 2017-08-27 10:35:35 +08:00
parent d2915df759 70b28f07bb
commit 1fb2f6e398
4 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/layouts/_public_left_info.html.erb
View File

@ -91,6 +91,6 @@
// 新建实训
function shixun_valication(){
notice_box_redirect('<%= security_settings_path %>', '开启实训，请先绑定邮箱');
sure_box_redirect('<%= security_settings_path %>', '新建实训，请先绑定邮箱');
}
</script>

6
app/views/users/show.html.erb
View File

@ -252,7 +252,11 @@
<a href="<%= shixuns_or_courses_filter_user_path(@user, :index => "shixun", :filter => "create") %>" class="user_course_filtrate fl mt20 mr30" data-remote="true"><span class="user_filtrate_span1"><%= str %>创建的</span><span class="user_filtrate_span2 ml10"><%= @create_num %></span></a>
<a href="<%= shixuns_or_courses_filter_user_path(@user, :index => "shixun", :filter => "cooperative") %>" class="user_course_filtrate fl mt20 mr30" data-remote="true"><span class="user_filtrate_span1"><%= str %>合作的</span><span class="user_filtrate_span2 ml10"><%= @cooperative_num %></span></a>
<a href="<%= shixuns_or_courses_filter_user_path(@user, :index => "shixun", :filter => "challenge") %>" class="user_course_filtrate fl mt20 mr30" data-remote="true"><span class="user_filtrate_span1"><%= str %>挑战的</span><span class="user_filtrate_span2 ml10"><%= @challenge_num %></span></a>
<a href="/shixuns/new" class="color-light-green fr font-14 mr20" style="line-height:56px">+&nbsp;新建</a>
<% if User.current.mail.blank? %>
<li><a href="javascript:void(0)" class="color-light-green fr font-14 mr20" style="line-height:56px" onclick="shixun_valication()">+&nbsp;新建</a></li>
<% else %>
<li><%= link_to "+ 新建", new_shixun_path, :target => "_blank", :class => "color-light-green fr font-14 mr20", :style => "line-height:56px" %></li>
<% end %>
</div>
<div class="lesson clearfix user_bg_shadow_notop" id="my_shixuns_list">
<%= render :partial => "my_homepage_shixuns_list" %>

1
db/migrate/20170825113413_modify_support_shixuns_for_major.rb
View File

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

12
db/migrate/20170827023117_managements_zhuanye.rb Normal file
View File

@ -0,0 +1,12 @@
class ManagementsZhuanye < ActiveRecord::Migration
def up
sql = "SELECT distinct(major_id) FROM `major_courses`"
MajorCourse.where("0=0").update_all(:support_shixuns, 0)
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