diff --git a/nested_projects/app/controllers/admin_controller.rb b/nested_projects/app/controllers/admin_controller.rb index d3afeeea1..07e682e2a 100644 --- a/nested_projects/app/controllers/admin_controller.rb +++ b/nested_projects/app/controllers/admin_controller.rb @@ -26,9 +26,6 @@ class AdminController < ApplicationController end def projects - sort_init 'name', 'asc' - sort_update - @status = params[:status] ? params[:status].to_i : 1 c = ARCondition.new(@status == 0 ? "status <> 0" : ["status = ?", @status]) @@ -37,14 +34,8 @@ class AdminController < ApplicationController c << ["LOWER(identifier) LIKE ? OR LOWER(name) LIKE ?", name, name] end - @project_count = Project.count(:conditions => c.conditions) - @project_pages = Paginator.new self, @project_count, - per_page_option, - params['page'] - @projects = Project.find :all, :order => sort_clause, - :conditions => c.conditions, - :limit => @project_pages.items_per_page, - :offset => @project_pages.current.offset + @projects = Project.find :all, :order => 'lft', + :conditions => c.conditions render :action => "projects", :layout => false if request.xhr? end diff --git a/nested_projects/app/views/admin/projects.rhtml b/nested_projects/app/views/admin/projects.rhtml index 6c7a21fb5..cf74282e0 100644 --- a/nested_projects/app/views/admin/projects.rhtml +++ b/nested_projects/app/views/admin/projects.rhtml @@ -17,20 +17,18 @@ - <%= sort_header_tag('name', :caption => l(:label_project)) %> + - - <%= sort_header_tag('is_public', :caption => l(:field_is_public), :default_order => 'desc') %> - <%= sort_header_tag('created_on', :caption => l(:field_created_on), :default_order => 'desc') %> + + <% for project in @projects %> "> -
<%=l(:label_project)%> <%=l(:field_description)%><%=l(:label_subproject_plural)%><%=l(:field_is_public)%><%=l(:field_created_on)%>
<%= project.active? ? link_to(h(project.name), :controller => 'projects', :action => 'settings', :id => project) : h(project.name) %> + <%= project.active? ? link_to(h(project.name), :controller => 'projects', :action => 'settings', :id => project) : h(project.name) %> <%= textilizable project.short_description, :project => project %> - <%= project.children.size %> <%= image_tag 'true.png' if project.is_public? %> <%= format_date(project.created_on) %> @@ -47,6 +45,4 @@
-

<%= pagination_links_full @project_pages, @project_count %>

- <% html_title(l(:label_project_plural)) -%>