kevinli
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

首页班级数据分页不对

This commit is contained in:
cxt 2017-07-24 16:54:18 +08:00
parent 6f84d188c6
commit a8169c4353
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.idea/dataSources.xml
View File

@ -28,25 +28,25 @@
<data-source source="LOCAL" name="Rails bigdata: production" uuid="a2967bb5-941b-447d-ba0e-5e62ade5fb7d">
<driver-ref>mysql</driver-ref>
<jdbc-driver>com.mysql.jdbc.Driver</jdbc-driver>
<jdbc-url>jdbc:mysql://127.0.0.1/0604new</jdbc-url>
<jdbc-url>jdbc:mysql://127.0.0.1/trustie</jdbc-url>
<user-name>root</user-name>
<user-password>df9bdf98df99df9e</user-password>
<user-password>dfcbdfc6dfcbdfc4dfc6dfc5dfc4dfcd</user-password>
<libraries />
</data-source>
<data-source source="LOCAL" name="Rails bigdata: development" uuid="ea7cc5a3-1ef5-4a23-93bb-2c9650c10d07">
<driver-ref>mysql</driver-ref>
<jdbc-driver>com.mysql.jdbc.Driver</jdbc-driver>
<jdbc-url>jdbc:mysql://127.0.0.1/20161227data</jdbc-url>
<jdbc-url>jdbc:mysql://127.0.0.1/trustie</jdbc-url>
<user-name>root</user-name>
<user-password>df9bdf98df99df9e</user-password>
<user-password>dfcbdfc6dfcbdfc4dfc6dfc5dfc4dfcd</user-password>
<libraries />
</data-source>
<data-source source="LOCAL" name="Rails bigdata: test" uuid="9f93a163-6133-42ac-a16d-9bd67f458fd6">
<driver-ref>mysql</driver-ref>
<jdbc-driver>com.mysql.jdbc.Driver</jdbc-driver>
<jdbc-url>jdbc:mysql://127.0.0.1/0623newblank</jdbc-url>
<jdbc-url>jdbc:mysql://127.0.0.1/trustie</jdbc-url>
<user-name>root</user-name>
<user-password>df9bdf98df99df9e</user-password>
<user-password>dfcbdfc6dfcbdfc4dfc6dfc5dfc4dfcd</user-password>
<libraries />
</data-source>
</component>

4
app/controllers/users_controller.rb
View File

@ -2258,9 +2258,9 @@ class UsersController < ApplicationController
@shixuns = paginateHelper @shixuns, @limit
elsif params[:index] == "course"
if params[:filter] == "manage"
@courses = @user.courses.not_deleted_not_end.select{ |course| @user.has_teacher_role(course)}.order("updated_at desc")
@courses = @user.courses.not_deleted_not_end.order("updated_at desc").select{ |course| @user.has_teacher_role(course)}
elsif params[:filter] == "join"
@courses = @user.courses.not_deleted_not_end.select{ |course| !@user.has_teacher_role(course)}.order("updated_at desc")
@courses = @user.courses.not_deleted_not_end.order("updated_at desc").select{ |course| !@user.has_teacher_role(course)}
elsif params[:filter] == "all"
@courses = @user.courses.not_deleted_not_end.order("updated_at desc")
end

2
app/views/users/_my_homepage_courses_list.html.erb
View File

@ -20,7 +20,7 @@
<%# if @courses_count > 8 %>
<!--<a href="<%#= courses_path %>" target="_blank" class="font-16 new_expand">点击查看全部</a>-->
<%# end %>
<% if @courses_count > 8 %>
<% if @courses_count > 5 %>
<div class="cl"></div>
<div style="text-align:center;" class="new_expand">
<div class="pages_user_show" style="width:auto; display:inline-block;margin: 18px 0;">