From b42d742c0626ae11e2f8ffd9bf4a7f90abf559ca Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 3 Jul 2014 17:25:51 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E6=88=91=E7=9A=84=E5=AD=A6?=
 =?UTF-8?q?=E6=A0=A1=E9=93=BE=E6=8E=A5=202.=E4=BF=AE=E6=94=B9=E5=BD=93?=
 =?UTF-8?q?=E6=88=91=E7=9A=84=E5=AD=A6=E6=A0=A1=E6=9C=AA=E5=BC=80=E8=AE=BE?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=97=B6=E6=8A=A5=E5=87=BA=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/school/index.html.erb   |  3 ++-
 app/views/welcome/course.html.erb | 12 ++++++------
 config/routes.rb                  |  2 +-
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/app/views/school/index.html.erb b/app/views/school/index.html.erb
index 755bd315..fa5d846e 100644
--- a/app/views/school/index.html.erb
+++ b/app/views/school/index.html.erb
@@ -69,8 +69,9 @@
 
 <div>
 	<p>
+
 		<a href="http://course.trustie.net<%=port%>?school_id=0">全部学校</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-		<a href="http://course.trustie.net<%=port%>">我的学校</a>
+      <%= link_to '我的学校',scholl_course_list_path(User.current.user_extensions.school)  %>
 	</p>
 		<ul>
 			<li style="width: 40%; float: left">请选择省份:
diff --git a/app/views/welcome/course.html.erb b/app/views/welcome/course.html.erb
index ca7f0bb7..2bae6e40 100644
--- a/app/views/welcome/course.html.erb
+++ b/app/views/welcome/course.html.erb
@@ -73,7 +73,7 @@
 
 <div id="J_Slide" class="d-p-index-box d-p-index-hotproject">
   <h3><strong>新开课程</strong></h3>
-  <% school_course = find_miracle_course(10, 7,params[:school_id]) %>
+  <% school_course = find_miracle_course(10, 7,params[:school_id] || params[:id]) %>
   <% if(school_course.count == 0) %>
       <span><%= link_to "更多>>", {:controller => 'courses', :action => 'index', :school_id => nil} %></span>
       <div class="d-p-projectlist-box">
@@ -86,7 +86,7 @@
             该学校未开设任何课程，您可以查看其他学校课程
           </p>
           <h1></h1>
-          <% find_all_new_hot_course(9,params[:school_id]).map do |project| %>
+          <% find_all_new_hot_course(9,params[:school_id] || params[:id]).map do |project| %>
               <li class='<%= cycle("odd", "even") %>'  title=<%=project.description.to_s%>>
                 <div class='avatar'>
                   <%= image_tag(get_course_avatar(project), :class => "avatar-4") %>
@@ -94,7 +94,7 @@
                 <!-- 上左下右 -->
                 <div class='desc_item' >
                     <span class=''>
-                        <% course = Course.find_by_extra(project.identifier)%>
+                        <% course = Course.find_by_extra(project.extra)%>
                       <% if(course.school == nil) %>
                         &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                         <% else %>
@@ -119,7 +119,7 @@
                 <div>
                   <% if !course_endTime_timeout?(project)%>
                       <div >
-                        <%= new_watcher_link(project, User.current)%>
+                        <%#= new_watcher_link(project, User.current)%>
                       </div>
                   <% end %>
                 </div>
@@ -181,7 +181,7 @@
                 该学校开设课程较少，您可以查看其他学校课程
               </p>
             </li>
-            <% find_all_new_hot_course(9 - school_course.count,params[:school_id]).map do |project| %>
+            <% find_all_new_hot_course(9 - school_course.count,params[:school_id] || params[:id]).map do |project| %>
               <li class='<%= cycle("odd", "even") %>'  title=<%=project.description.to_s%>>
                 <div class='avatar'>
                   <%= image_tag(get_course_avatar(project), :class => "avatar-4") %>
@@ -211,7 +211,7 @@
                 <div>
                   <% if !course_endTime_timeout?(project)%>
                       <div >
-                        <%= new_watcher_link(project, User.current)%>
+                        <%#= new_watcher_link(project, User.current)%>
                       </div>
                   <% end %>
                 </div>
diff --git a/config/routes.rb b/config/routes.rb
index 7c1ad802..b087b3bd 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -700,7 +700,7 @@ RedmineApp::Application.routes.draw do
   #######confusing########
   get 'welcome/search', to: 'welcome#search'
   get 'school/index', to: 'school#index'
-  get 'course/:school_id', to: 'welcome#course'
+  get 'course/:school_id', to: 'welcome#course', :as => 'scholl_course_list'
   #get 'course/:school_id', to: 'welcome#course'
   post 'school/get_options/:province', :to => 'school#get_options'
   get 'school/get_options/:province', :to => 'school#get_options'