Mercurial > hg > soundsoftware-site
comparison app/controllers/projects_controller.rb @ 760:b2a9e64b8283 feature_14
Fixes Bug #322, but is not self-contained in the plugin (basically I'm editing the original projects controller…)
| author | luisf <luis.figueira@eecs.qmul.ac.uk> |
|---|---|
| date | Fri, 11 Nov 2011 18:32:51 +0000 |
| parents | 851510f1b535 |
| children | dd33798e514d |
comparison
equal
deleted
inserted
replaced
| 759:7d58183fd14c | 760:b2a9e64b8283 |
|---|---|
| 53 sort_update %w(name lft created_on updated_on) | 53 sort_update %w(name lft created_on updated_on) |
| 54 @limit = per_page_option | 54 @limit = per_page_option |
| 55 @project_count = Project.visible_roots.count | 55 @project_count = Project.visible_roots.count |
| 56 @project_pages = Paginator.new self, @project_count, @limit, params['page'] | 56 @project_pages = Paginator.new self, @project_count, @limit, params['page'] |
| 57 @offset ||= @project_pages.current.offset | 57 @offset ||= @project_pages.current.offset |
| 58 @projects = Project.visible_roots.all(:offset => @offset, :limit => @limit, :order => sort_clause) | 58 @projects = Project.visible_roots.find(@filtered_projects, :offset => @offset, :limit => @limit, :order => sort_clause) |
| 59 if User.current.logged? | 59 if User.current.logged? |
| 60 # seems sort_by gives us case-sensitive ordering, which we don't want | 60 # seems sort_by gives us case-sensitive ordering, which we don't want |
| 61 # @user_projects = User.current.projects.sort_by(&:name) | 61 # @user_projects = User.current.projects.sort_by(&:name) |
| 62 @user_projects = User.current.projects.all(:order => :name) | 62 @user_projects = User.current.projects.all(:order => :name) |
| 63 end | 63 end |