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

Merge remote-tracking branch 'remotes/origin/szzh' into develop

This commit is contained in:
nwb 2014-07-03 15:31:43 +08:00
parent ae8093c400 b928eb6ed8
commit 39b4bd37d4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,7 +75,7 @@
<h3><strong>新开课程</strong></h3> <h3><strong>新开课程</strong></h3>
<% school_course = find_miracle_course(10, 7,params[:school_id]) %> <% school_course = find_miracle_course(10, 7,params[:school_id]) %>
<% if(school_course.count == 0) %> <% if(school_course.count == 0) %>
<span><%= link_to "更多>>", {:controller => 'courses', :action => 'course', :project_type => 1, :school_id => nil} %></span> <span><%= link_to "更多>>", {:controller => 'courses', :action => 'index', :school_id => nil} %></span>
<div class="d-p-projectlist-box"> <div class="d-p-projectlist-box">
<ul class="d-p-projectlist"> <ul class="d-p-projectlist">
@ -130,11 +130,11 @@
<% else %> <% else %>
<% if school_course.count < 9 %> <% if school_course.count < 9 %>
<span> <span>
<%= link_to "更多>>", {:controller => 'courses', :action => 'course', :school_id => nil} %> <%= link_to "更多>>", {:controller => 'courses', :action => 'index', :school_id => nil} %>
</span> </span>
<% else %> <% else %>
<span> <span>
<%= link_to "更多>>", {:controller => 'courses', :action => 'course', :school_id => params[:school_id]} %> <%= link_to "更多>>", {:controller => 'courses', :action => 'index', :school_id => params[:school_id]} %>
</span> </span>
<% end %> <% end %>
<div class="d-p-projectlist-box"> <div class="d-p-projectlist-box">