From 7a4d5627730a2d7eec233c6bfccad6255e43caa4 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 29 Aug 2015 19:15:06 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=B8=BB=E9=A1=B5=EF=BC=8C?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=BB=E9=A1=B5=20500?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/welcome_controller.rb | 58 +++++++++++++--------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index 24cbecb81..784066378 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -96,14 +96,14 @@ class WelcomeController < ApplicationController
     @projects = Project.all_public.active
     render :layout => false, :content_type => 'text/plain'
   end
-  
+
   def course
     redirect_to signin_path
     return
-
-    @course_page = FirstPage.find_by_page_type('course')
-    @school_id = params[:school_id] || User.current.user_extensions.school.try(:id) || 117
-    @logoLink ||= logolink()
+    #
+    # @course_page = FirstPage.find_by_page_type('course')
+    # @school_id = params[:school_id] || User.current.user_extensions.school.try(:id) || 117
+    # @logoLink ||= logolink()
   end
 
   def logolink()
@@ -146,8 +146,8 @@ class WelcomeController < ApplicationController
     redirect_to signin_path
     return
 
-    @contest_page = FirstPage.find_by_page_type('contest')
-    @contest_notifications = Contestnotification.order("created_at desc").limit(5)
+    # @contest_page = FirstPage.find_by_page_type('contest')
+    # @contest_notifications = Contestnotification.order("created_at desc").limit(5)
   end
 
   def search
@@ -187,28 +187,28 @@ class WelcomeController < ApplicationController
   private
   # 判断网站的入口，是课程 course 则跳过index去渲染 course 方法
   def entry_select
-    url = request.original_url.gsub('/','')
-    if url.include?(Setting.url_course.gsub('/',''))
-      if @first_page.show_course == 1
-        course
-        render :course
-      else
-        render_404
-      end
-
-      return 0
-    elsif url.include?(Setting.url_contest.gsub('/',''))
-      if @first_page.show_contest == 1
-        contest
-        render :contest
-      else
-        render_404
-      end
-
-      return 0
-    elsif url.include?(Setting.url_user.gsub('/',''))
-      #redirect_to(:controller => "users", :action => "index")
-    end
+    # url = request.original_url.gsub('/','')
+    # if url.include?(Setting.url_course.gsub('/',''))
+    #   if @first_page.show_course == 1
+    #     course
+    #     render :course
+    #   else
+    #     render_404
+    #   end
+    #
+    #   return 0
+    # elsif url.include?(Setting.url_contest.gsub('/',''))
+    #   if @first_page.show_contest == 1
+    #     contest
+    #     render :contest
+    #   else
+    #     render_404
+    #   end
+    #
+    #   return 0
+    # elsif url.include?(Setting.url_user.gsub('/',''))
+    #   #redirect_to(:controller => "users", :action => "index")
+    # end
       
     
   end