From 56f989e53e80fe7545a3400ba7ee98a0cd2cf259 Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Mon, 10 Feb 2014 15:04:52 +0200
Subject: [PATCH] Fix wrong issues appears at Dashboard#issues page

---
 app/controllers/dashboard_controller.rb |  4 ++--
 app/models/concerns/issuable.rb         | 10 +++++-----
 app/services/filtering_service.rb       |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index 656eda9..b95233c 100644
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -54,12 +54,12 @@ class DashboardController < ApplicationController
 
   def merge_requests
     @merge_requests = FilteringService.new.execute(MergeRequest, current_user, params)
-    @merge_requests = @merge_requests.recent.page(params[:page]).per(20)
+    @merge_requests = @merge_requests.page(params[:page]).per(20)
   end
 
   def issues
     @issues = FilteringService.new.execute(Issue, current_user, params)
-    @issues = @issues.recent.page(params[:page]).per(20)
+    @issues = @issues.page(params[:page]).per(20)
     @issues = @issues.includes(:author, :project)
 
     respond_to do |format|
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 0f1dad4..bf2c215 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -48,13 +48,13 @@ module Issuable
 
     def sort(method)
       case method.to_s
-      when 'newest' then reorder('created_at DESC')
-      when 'oldest' then reorder('created_at ASC')
-      when 'recently_updated' then reorder('updated_at DESC')
-      when 'last_updated' then reorder('updated_at ASC')
+      when 'newest' then reorder("#{table_name}.created_at DESC")
+      when 'oldest' then reorder("#{table_name}.created_at ASC")
+      when 'recently_updated' then reorder("#{table_name}.updated_at DESC")
+      when 'last_updated' then reorder("#{table_name}.updated_at ASC")
       when 'milestone_due_soon' then joins(:milestone).reorder("milestones.due_date ASC")
       when 'milestone_due_later' then joins(:milestone).reorder("milestones.due_date DESC")
-      else reorder('created_at DESC')
+      else reorder("#{table_name}.created_at DESC")
       end
     end
   end
diff --git a/app/services/filtering_service.rb b/app/services/filtering_service.rb
index ebd394e..52537f7 100644
--- a/app/services/filtering_service.rb
+++ b/app/services/filtering_service.rb
@@ -57,11 +57,11 @@ class FilteringService
   def by_scope(items)
     case params[:scope]
     when 'created-by-me', 'authored' then
-      klass.where(author_id: current_user.id)
+      items.where(author_id: current_user.id)
     when 'all' then
-      klass
+      items
     when 'assigned-to-me' then
-      klass.where(assignee_id: current_user.id)
+      items.where(assignee_id: current_user.id)
     else
       raise 'You must specify default scope'
     end
--
libgit2 0.21.2