添加了项目活动的分页

exceptionHandle
zhangyang 12 years ago
parent 7b3c201469
commit bb461cd244

@ -195,7 +195,7 @@ class ProjectsController < ApplicationController
@key = User.current.rss_key
#新增内容
@days = Setting.activity_days_default.to_i
@days = Setting.activity_days_default.to_i
if params[:from]
begin; @date_to = params[:from].to_date + 1; rescue; end
@ -214,8 +214,15 @@ class ProjectsController < ApplicationController
:author => @author)
@activity.scope_select {|t| !has["show_#{t}"].nil?}
# @activity.scope = (@author.nil? ? :default : :all) if @activity.scope.empty?
events = @activity.events(@date_from, @date_to, {:limit=>15})
#Added by young
events = @activity.events(@date_from, @date_to)
@offset, @limit = api_offset_and_limit({:limit => 10})
@events_count = events.count
@events_pages = Paginator.new @events_count, @limit, params['page']
@offset ||= @events_pages.offset
events = events.slice(@offset,@limit)
#Ended by young
@events_by_day = events.group_by {|event| User.current.time_to_date(event.event_datetime)}
# documents
@sort_by = %w(category date title author).include?(params[:sort_by]) ? params[:sort_by] : 'category'

@ -43,6 +43,11 @@
<% end -%>
</div>
<% end -%>
<div class="pagination">
<ul>
<%= pagination_links_full @events_pages%>
</ul>
</div>
</div>
</div>

Loading…
Cancel
Save