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

Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop

This commit is contained in:
yanxd 2013-12-07 10:16:59 +08:00
parent c272783f1c 5b10981754
commit c9c5a18b41
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/projects_controller.rb
View File

@ -288,13 +288,13 @@ class ProjectsController < ApplicationController
when '0' when '0'
@offset ||= @project_pages.reverse_offset @offset ||= @project_pages.reverse_offset
unless @offset == 0 unless @offset == 0
@projects_status = @projects_status.offset(@offset).limit(@limit).all.reverse @projects_status = @projects_status.includes(:projects).reorder('projects.created_on').offset(@offset).limit(@limit).all.reverse
else else
limit = @project_count % @limit limit = @project_count % @limit
if limit == 0 if limit == 0
limit = @limit limit = @limit
end end
@projects_status = @projects_status.offset(@offset).limit(limit).all.reverse @projects_status = @projects_status.includes(:projects).reorder('projects.created_on').offset(@offset).limit(limit).all.reverse
end end
@s_type = 0 @s_type = 0
# @projects = @projects.sort {|x,y| y.created_on <=> x.created_on } # @projects = @projects.sort {|x,y| y.created_on <=> x.created_on }
@ -329,13 +329,13 @@ class ProjectsController < ApplicationController
else else
@offset ||= @project_pages.reverse_offset @offset ||= @project_pages.reverse_offset
unless @offset == 0 unless @offset == 0
@projects_status = @projects_status.offset(@offset).limit(@limit).all.reverse @projects_status = @projects_status.includes(:projects).reorder('projects.created_on').offset(@offset).limit(@limit).all.reverse
else else
limit = @project_count % @limit limit = @project_count % @limit
if limit == 0 if limit == 0
limit = @limit limit = @limit
end end
@projects_status = @projects_status.offset(@offset).limit(limit).all.reverse @projects_status = @projects_status.includes(:projects).reorder('projects.created_on').offset(@offset).limit(limit).all.reverse
end end
@s_type = 0 @s_type = 0
# @projects = @projects.sort {|x,y| y.created_on <=> x.created_on } # @projects = @projects.sort {|x,y| y.created_on <=> x.created_on }