Download as
Browse Code »

Commit dc9916b474f68a23781df15bee5e814da687ab26

Authored by Dmitriy Zaporozhets
2 parents 68b119f6 31bf0cd8
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #1998 from erroric/gitlabhq_issue1669 

fix for issue #1669
Showing 3 changed files with 4 additions and 4 deletions   Show diff stats
app/controllers/dashboard_controller.rb
  Diff comments   View file @dc9916b
... ... @@ -5,7 +5,7 @@ class DashboardController < ApplicationController
5 5  
6 6 def index
7 7 @groups = Group.where(id: current_user.projects.pluck(:group_id))
8   - @projects = current_user.projects_with_events
  8 + @projects = current_user.projects_sorted_by_activity
9 9 @projects = @projects.page(params[:page]).per(30)
10 10  
11 11 @events = Event.in_projects(current_user.project_ids)
... ...
app/controllers/groups_controller.rb
  Diff comments   View file @dc9916b
... ... @@ -54,7 +54,7 @@ class GroupsController < ApplicationController
54 54 end
55 55  
56 56 def projects
57   - @projects ||= current_user.projects_with_events.where(group_id: @group.id)
  57 + @projects ||= current_user.projects_sorted_by_activity.where(group_id: @group.id)
58 58 end
59 59  
60 60 def project_ids
... ...
app/roles/account.rb
  Diff comments   View file @dc9916b
... ... @@ -67,7 +67,7 @@ module Account
67 67 events = events.recent.limit(1).first
68 68 end
69 69  
70   - def projects_with_events
71   - projects.includes(:events).order("events.created_at DESC")
  70 + def projects_sorted_by_activity
  71 + projects.order("(SELECT max(events.created_at) FROM events WHERE events.project_id = projects.id) DESC")
72 72 end
73 73 end
... ...