jro_apps/redmine Commit - r15373:daab32923d85

Adds pagination to admin project list....

Jean-Philippe Lang -

r15373:daab32923d85

parent child

Context file:

r15373:daab32923d85

app/controllers/admin_controller.rb +4 -1

                 scope = Project.status(@status).sorted
                 scope = scope.like(params[:name]) if params[:name].present?
-                @projects = scope.to_a
+                @project_count = scope.count
+                @project_pages = Paginator.new @project_count, per_page_option, params['page']
+                @projects = scope.limit(@project_pages.per_page).offset(@project_pages.offset).to_a
                 render :action => "projects", :layout => false if request.xhr?
               end

app/controllers/projects_controller.rb +2 -2

                 unless @project.archive
                   flash[:error] = l(:error_can_not_archive_project)
                 end
-                redirect_to admin_projects_path(:status => params[:status])
+                redirect_to_referer_or admin_projects_path(:status => params[:status])
               end
               def unarchive
                 unless @project.active?
                   @project.unarchive
                 end
-                redirect_to admin_projects_path(:status => params[:status])
+                redirect_to_referer_or admin_projects_path(:status => params[:status])
               end
               def close

app/helpers/application_helper.rb +2 -2

               # Yields the given block for each project with its level in the tree
               #
               # Wrapper for Project#project_tree
-              def project_tree(projects, &block)
+              def project_tree(projects, options={}, &block)
-                Project.project_tree(projects, &block)
+                Project.project_tree(projects, options, &block)
               end
               def principals_check_box_tags(name, principals)

app/models/project.rb +4 -1

               end
               # Yields the given block for each project with its level in the tree
-              def self.project_tree(projects, &block)
+              def self.project_tree(projects, options={}, &block)
                 ancestors = []
+                if options[:init_level] && projects.first
+                  ancestors = projects.first.ancestors.to_a
+                end
                 projects.sort_by(&:lft).each do |project|
                   while (ancestors.any? && !project.is_descendant_of?(ancestors.last))
                     ancestors.pop

app/views/admin/projects.html.erb +2 -1

               <th></th>
               </tr></thead>
               <tbody>
-            <% project_tree(@projects) do |project, level| %>
+            <% project_tree(@projects, :init_level => true) do |project, level| %>
               <tr class="<%= cycle("odd", "even") %> <%= project.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
               <td class="name"><span><%= link_to_project_settings(project, {}, :title => project.short_description) %></span></td>
               <td><%= checked_image project.is_public? %></td>
               </tbody>
             </table>
             </div>
+            <span class="pagination"><%= pagination_links_full @project_pages, @project_count %></span>
  No newline at end of file

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	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