From 463b232a6825af7bc047451a70c2adb621e9ea8b Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 25 Aug 2017 21:06:51 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=9A=84=E6=96=B0?=
 =?UTF-8?q?=E5=BB=BA=E5=AE=9E=E8=AE=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_public_left_info.html.erb | 2 +-
 app/views/users/show.html.erb                | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/_public_left_info.html.erb b/app/views/layouts/_public_left_info.html.erb
index ef4a50277..a52fba79f 100644
--- a/app/views/layouts/_public_left_info.html.erb
+++ b/app/views/layouts/_public_left_info.html.erb
@@ -91,6 +91,6 @@
 
     // 新建实训
     function shixun_valication(){
-        notice_box_redirect('<%= security_settings_path %>', '开启实训，请先绑定邮箱');
+        notice_box_redirect('<%= security_settings_path %>', '新建实训，请先绑定邮箱');
     }
 </script>
\ No newline at end of file
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index 793c37db9..a764806da 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -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" %>

From ebd34af0a36f83a90db38529bd0cbc873ed0267d Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 25 Aug 2017 21:51:47 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E9=82=AE=E7=AE=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_public_left_info.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/_public_left_info.html.erb b/app/views/layouts/_public_left_info.html.erb
index a52fba79f..5f201109f 100644
--- a/app/views/layouts/_public_left_info.html.erb
+++ b/app/views/layouts/_public_left_info.html.erb
@@ -91,6 +91,6 @@
 
     // 新建实训
     function shixun_valication(){
-        notice_box_redirect('<%= security_settings_path %>', '新建实训，请先绑定邮箱');
+        sure_box_redirect('<%= security_settings_path %>', '新建实训，请先绑定邮箱');
     }
 </script>
\ No newline at end of file

From 29e9c38553c3c6f916333bd96254049a592ae59e Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sun, 27 Aug 2017 10:29:50 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E4=B8=93?=
 =?UTF-8?q?=E4=B8=9A=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/migrate/20170825113413_modify_support_shixuns_for_major.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/migrate/20170825113413_modify_support_shixuns_for_major.rb b/db/migrate/20170825113413_modify_support_shixuns_for_major.rb
index f29f16808..7dcb922d7 100644
--- a/db/migrate/20170825113413_modify_support_shixuns_for_major.rb
+++ b/db/migrate/20170825113413_modify_support_shixuns_for_major.rb
@@ -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

From 70b28f07bb60e3e87f3907f1e742e302cdb7e316 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Sun, 27 Aug 2017 10:34:59 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E4=B8=93=E4=B8=9A=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/migrate/20170827023117_managements_zhuanye.rb | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 db/migrate/20170827023117_managements_zhuanye.rb

diff --git a/db/migrate/20170827023117_managements_zhuanye.rb b/db/migrate/20170827023117_managements_zhuanye.rb
new file mode 100644
index 000000000..38c270f63
--- /dev/null
+++ b/db/migrate/20170827023117_managements_zhuanye.rb
@@ -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