From 0a9ac5837c149039eb0a452654f3bb7a9445fcba Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 23 Jul 2019 19:16:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/welcome_controller.rb                 | 6 ++++++
 app/views/competitions/_qg_second_opensource.html.erb | 2 +-
 app/views/layouts/_logined_header.html.erb            | 2 +-
 app/views/layouts/_unlogin_header.html.erb            | 4 ++--
 app/views/welcome/join_private_courses.js.erb         | 2 ++
 config/routes.rb                                      | 2 +-
 6 files changed, 13 insertions(+), 5 deletions(-)
 create mode 100644 app/views/welcome/join_private_courses.js.erb

diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index 05f04630..251e6de7 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -54,6 +54,12 @@ class WelcomeController < ApplicationController
     end
   end
 
+  def join_private_courses
+    @invitation_code = params[:invitation_code]
+    respond_to do |format|
+      format.js
+    end
+  end
 
   def shixun_to_local
     identifiers = params[:identifiers].split(",")
diff --git a/app/views/competitions/_qg_second_opensource.html.erb b/app/views/competitions/_qg_second_opensource.html.erb
index ddaad572..193e4d1c 100644
--- a/app/views/competitions/_qg_second_opensource.html.erb
+++ b/app/views/competitions/_qg_second_opensource.html.erb
@@ -45,7 +45,7 @@
       invite_code = nil
 
       if first_entry.url.present?
-        course_id = first_entry.url.split('/')[-2, 1]
+        course_id = first_entry.url.split('/')[-5, 1]
 
         course = Course.find_by_id(course_id)
         if course.present? && @user && @user.logged?
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index 0277fe05..6b9cde10 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -85,7 +85,7 @@
           <li><%= link_to '新建项目', new_project_path() %></li>
         </ul>
         <ul class="fl with50 edu-txt-center">
-          <li><%= link_to "加入课堂", join_private_courses_users_path, :remote => true %></li>
+          <li><%= link_to "加入课堂", join_private_courses_path, :remote => true %></li>
 <!--          <li><%#= link_to "加入项目", applied_join_project_path, :remote => true %></li>-->
         </ul>
       </div>
diff --git a/app/views/layouts/_unlogin_header.html.erb b/app/views/layouts/_unlogin_header.html.erb
index eb10c8d6..d54b65f5 100644
--- a/app/views/layouts/_unlogin_header.html.erb
+++ b/app/views/layouts/_unlogin_header.html.erb
@@ -51,9 +51,9 @@
   </div>
 
   <span class="font-15 fr mt15 ml15">
-      <a href="www.educoder.net/login" class="mr5 color-white">登录</a>
+      <a href="/login" class="mr5 color-white">登录</a>
     <em class="vertical-line"></em>
-    <a href="www.educoder.net/register" class="mr5 color-white">登录</a>
+    <a href="/register" class="mr5 color-white">注册</a>
     <%#= link_to '注册', user_join_path, :class => "ml5 color-white" %>
     </span>
   <div class="fr head-right">
diff --git a/app/views/welcome/join_private_courses.js.erb b/app/views/welcome/join_private_courses.js.erb
new file mode 100644
index 00000000..35214ee0
--- /dev/null
+++ b/app/views/welcome/join_private_courses.js.erb
@@ -0,0 +1,2 @@
+var htmlvalue = "<%= escape_javascript(render :partial => 'courses/join_private_course') %>";
+pop_box_new(htmlvalue,460,220);
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 9ab407ee..1df0c29c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1670,7 +1670,6 @@ RedmineApp::Application.routes.draw do ## oauth相关
       get 'html_show'
       get 'switch_user_module'
       get 'reward_grade'
-      match 'join_private_courses', :via => [:get, :post]
     end
 
     member do
@@ -2606,6 +2605,7 @@ RedmineApp::Application.routes.draw do ## oauth相关
   ########################
   ##added by wen##########
   #######confusing########
+  match 'welcome/join_private_courses', to: 'welcome#join_private_courses', :via => [:get, :post], :as => 'join_private_courses'
   get 'welcome/search', to: 'welcome#search'
   get 'school/index', to: 'school#index'
   get 'school/:school_id', to: