jro_apps/redmine Commit - r10909:9394d739b1fc

0

app/controllers/boards_controller.rb +2 -2

                                  'updated_on' => "#{Message.table_name}.updated_on"
                      @topic_count = @board.topics.count
-                     @topic_pages = Paginator.new self, @topic_count, per_page_option, params['page']
+                     @topic_pages = Paginator.new @topic_count, per_page_option, params['page']
                      @topics =  @board.topics.
                        reorder("#{Message.table_name}.sticky DESC").
                        includes(:author, {:last_reply => :author}).
                        limit(@topic_pages.items_per_page).
-                       offset(@topic_pages.current.offset).
+                       offset(@topic_pages.offset).
                        order(sort_clause).
                        all
                      @message = Message.new(:board => @board)

0

app/controllers/issues_controller.rb +2 -2

                    end
                    @issue_count = @query.issue_count
-                   @issue_pages = Paginator.new self, @issue_count, @limit, params['page']
-                   @offset ||= @issue_pages.current.offset
+                   @issue_pages = Paginator.new @issue_count, @limit, params['page']
+                   @offset ||= @issue_pages.offset
                    @issues = @query.issues(:include => [:assigned_to, :tracker, :priority, :category, :fixed_version],
                                            :order => sort_clause,
                                            :offset => @offset,

0

app/controllers/members_controller.rb +2 -2

                def index
                  @offset, @limit = api_offset_and_limit
                  @member_count = @project.member_principals.count
-                 @member_pages = Paginator.new self, @member_count, @limit, params['page']
-                 @offset ||= @member_pages.current.offset
+                 @member_pages = Paginator.new @member_count, @limit, params['page']
+                 @offset ||= @member_pages.offset
                  @members =  @project.member_principals.all(
                    :order => "#{Member.table_name}.id",
                    :limit  =>  @limit,

0

app/controllers/messages_controller.rb +2 -2

                  end
                  @reply_count = @topic.children.count
-                 @reply_pages = Paginator.new self, @reply_count, REPLIES_PER_PAGE, page
+                 @reply_pages = Paginator.new @reply_count, REPLIES_PER_PAGE, page
                  @replies =  @topic.children.
                    includes(:author, :attachments, {:board => :project}).
                    reorder("#{Message.table_name}.created_on ASC").
                    limit(@reply_pages.items_per_page).
-                   offset(@reply_pages.current.offset).
+                   offset(@reply_pages.offset).
                    all
                  @reply = Message.new(:subject => "RE: #{@message.subject}")

0

app/controllers/news_controller.rb +2 -2

                  scope = @project ? @project.news.visible : News.visible
                  @news_count = scope.count
-                 @news_pages = Paginator.new self, @news_count, @limit, params['page']
-                 @offset ||= @news_pages.current.offset
+                 @news_pages = Paginator.new @news_count, @limit, params['page']
+                 @offset ||= @news_pages.offset
                  @newss = scope.all(:include => [:author, :project],
                                                     :order => "#{News.table_name}.created_on DESC",
                                                     :offset => @offset,

0

app/controllers/queries_controller.rb +1 -1

                  end
                  @query_count = IssueQuery.visible.count
-                 @query_pages = Paginator.new self, @query_count, @limit, params['page']
+                 @query_pages = Paginator.new @query_count, @limit, params['page']
                  @queries = IssueQuery.visible.all(:limit => @limit, :offset => @offset, :order => "#{Query.table_name}.name")
                  respond_to do |format|

0

app/controllers/repositories_controller.rb +2 -2

                def revisions
                  @changeset_count = @repository.changesets.count
-                 @changeset_pages = Paginator.new self, @changeset_count,
+                 @changeset_pages = Paginator.new @changeset_count,
                                                   per_page_option,
                                                   params['page']
                  @changesets = @repository.changesets.
                    limit(@changeset_pages.items_per_page).
-                   offset(@changeset_pages.current.offset).
+                   offset(@changeset_pages.offset).
                    includes(:user, :repository, :parents).
                    all

0

app/controllers/timelog_controller.rb +2 -2

                    format.html {
                      # Paginate results
                      @entry_count = scope.count
-                     @entry_pages = Paginator.new self, @entry_count, per_page_option, params['page']
+                     @entry_pages = Paginator.new @entry_count, per_page_option, params['page']
                      @entries = scope.all(
                        :include => [:project, :activity, :user, {:issue => :tracker}],
                        :order => sort_clause,
                        :limit  =>  @entry_pages.items_per_page,
-                       :offset =>  @entry_pages.current.offset
+                       :offset =>  @entry_pages.offset
                      )
                      @total_hours = scope.sum(:hours).to_f

0

app/controllers/users_controller.rb +2 -2

                  scope = scope.in_group(params[:group_id]) if params[:group_id].present?
                  @user_count = scope.count
-                 @user_pages = Paginator.new self, @user_count, @limit, params['page']
-                 @offset ||= @user_pages.current.offset
+                 @user_pages = Paginator.new @user_count, @limit, params['page']
+                 @offset ||= @user_pages.offset
                  @users =  scope.order(sort_clause).limit(@limit).offset(@offset).all
                  respond_to do |format|

0

app/controllers/wiki_controller.rb +2 -2

                # show page history
                def history
                  @version_count = @page.content.versions.count
-                 @version_pages = Paginator.new self, @version_count, per_page_option, params['page']
+                 @version_pages = Paginator.new @version_count, per_page_option, params['page']
                  # don't load text
                  @versions = @page.content.versions.
                    select("id, author_id, comments, updated_on, version").
                    reorder('version DESC').
                    limit(@version_pages.items_per_page + 1).
-                   offset(@version_pages.current.offset).
+                   offset(@version_pages.offset).
                    all
                  render :layout => false if request.xhr?

0

lib/redmine/pagination.rb +1 -1

                    page_param = options[:parameter] || :page
                    page = (params[page_param] || 1).to_i
                    per_page = options[:per_page] || per_page_option
-                   Paginator.new(self, item_count, per_page, page, page_param)
+                   Paginator.new(item_count, per_page, page, page_param)
                  end
                  module Helper

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages