##// END OF EJS Templates
Adds a 'sorted' scope to Project....
Jean-Philippe Lang -
r13159:f5e582294590
parent child
Show More
@@ -32,7 +32,7 class AdminController < ApplicationController
32 32 def projects
33 33 @status = params[:status] || 1
34 34
35 scope = Project.status(@status).order('lft')
35 scope = Project.status(@status).sorted
36 36 scope = scope.like(params[:name]) if params[:name].present?
37 37 @projects = scope.to_a
38 38
@@ -40,21 +40,22 class ProjectsController < ApplicationController
40 40
41 41 # Lists visible projects
42 42 def index
43 scope = Project.visible.sorted
44
43 45 respond_to do |format|
44 46 format.html {
45 scope = Project
46 47 unless params[:closed]
47 48 scope = scope.active
48 49 end
49 @projects = scope.visible.order('lft').to_a
50 @projects = scope.to_a
50 51 }
51 52 format.api {
52 53 @offset, @limit = api_offset_and_limit
53 @project_count = Project.visible.count
54 @projects = Project.visible.offset(@offset).limit(@limit).order('lft').to_a
54 @project_count = scope.count
55 @projects = scope.offset(@offset).limit(@limit).to_a
55 56 }
56 57 format.atom {
57 projects = Project.visible.order('created_on DESC').limit(Setting.feeds_limit.to_i).to_a
58 projects = scope.reorder(:created_on => :desc).limit(Setting.feeds_limit.to_i).to_a
58 59 render_feed(projects, :title => "#{Setting.app_title}: #{l(:label_project_latest)}")
59 60 }
60 61 end
@@ -111,6 +111,7 class Project < ActiveRecord::Base
111 111 where("LOWER(identifier) LIKE :p OR LOWER(name) LIKE :p", :p => pattern)
112 112 end
113 113 }
114 scope :sorted, lambda {order(:lft)}
114 115
115 116 def initialize(attributes=nil, *args)
116 117 super
General Comments 0
You need to be logged in to leave comments. Login now