p49726105
/
bigdir
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1.增加我的学校链接 

2.修改当我的学校未开设课程时报出的BUG
This commit is contained in:
sw 2014-07-03 17:25:51 +08:00
parent fe4e1cc175
commit b42d742c06
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/school/index.html.erb
View File

@ -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">请选择省份:

12
app/views/welcome/course.html.erb
View File

@ -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>

2
config/routes.rb
View File

@ -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'