Fix project filter for MR on dashboard

Dmitriy Zaporozhets
1 parent ba937b2b
Showing 4 changed files with 22 additions and 9 deletions Show diff stats
app/helpers/dashboard_helper.rb
app/models/issue.rb
app/models/merge_request.rb
app/models/user.rb
@@ -27,6 +27,6 @@ module DashboardHelper
               items.opened
             end
  
-    items.where(assignee_id: current_user.id).count
+    items.cared(current_user).count
   end
 end
@@ -24,7 +24,13 @@ class Issue &lt; ActiveRecord::Base
  
   acts_as_taggable_on :labels
  
-  def self.open_for(user)
-    opened.assigned(user)
+  class << self
+    def cared(user)
+      where('assignee_id = :user', user: user.id)
+    end
+
+    def open_for(user)
+      opened.assigned(user)
+    end
   end
 end
@@ -43,12 +43,19 @@ class MergeRequest &lt; ActiveRecord::Base
   validates :target_branch, presence: true
   validate :validate_branches
  
-  def self.find_all_by_branch(branch_name)
-    where("source_branch LIKE :branch OR target_branch LIKE :branch", branch: branch_name)
-  end
  
-  def self.find_all_by_milestone(milestone)
-    where("milestone_id = :milestone_id", milestone_id: milestone)
+  class << self
+    def cared(user)
+      where('assignee_id = :user OR author_id = :user', user: user.id)
+    end
+
+    def find_all_by_branch(branch_name)
+      where("source_branch LIKE :branch OR target_branch LIKE :branch", branch: branch_name)
+    end
+
+    def find_all_by_milestone(milestone)
+      where("milestone_id = :milestone_id", milestone_id: milestone)
+    end
   end
  
   def human_state
@@ -267,7 +267,7 @@ class User &lt; ActiveRecord::Base
   end
  
   def cared_merge_requests
-    MergeRequest.where("author_id = :id or assignee_id = :id", id: self.id)
+    MergeRequest.cared(self)
   end
  
   # Remove user from all projects and
...	...	@@ -27,6 +27,6 @@ module DashboardHelper
27	27	items.opened
28	28	end
29	29
30		- items.where(assignee_id: current_user.id).count
	30	+ items.cared(current_user).count
31	31	end
32	32	end
...	...
...	...	@@ -24,7 +24,13 @@ class Issue < ActiveRecord::Base
24	24
25	25	acts_as_taggable_on :labels
26	26
27		- def self.open_for(user)
28		- opened.assigned(user)
	27	+ class << self
	28	+ def cared(user)
	29	+ where('assignee_id = :user', user: user.id)
	30	+ end
	31	+
	32	+ def open_for(user)
	33	+ opened.assigned(user)
	34	+ end
29	35	end
30	36	end
...	...
...	...	@@ -43,12 +43,19 @@ class MergeRequest < ActiveRecord::Base
43	43	validates :target_branch, presence: true
44	44	validate :validate_branches
45	45
46		- def self.find_all_by_branch(branch_name)
47		- where("source_branch LIKE :branch OR target_branch LIKE :branch", branch: branch_name)
48		- end
49	46
50		- def self.find_all_by_milestone(milestone)
51		- where("milestone_id = :milestone_id", milestone_id: milestone)
	47	+ class << self
	48	+ def cared(user)
	49	+ where('assignee_id = :user OR author_id = :user', user: user.id)
	50	+ end
	51	+
	52	+ def find_all_by_branch(branch_name)
	53	+ where("source_branch LIKE :branch OR target_branch LIKE :branch", branch: branch_name)
	54	+ end
	55	+
	56	+ def find_all_by_milestone(milestone)
	57	+ where("milestone_id = :milestone_id", milestone_id: milestone)
	58	+ end
52	59	end
53	60
54	61	def human_state
...	...
...	...	@@ -267,7 +267,7 @@ class User < ActiveRecord::Base
267	267	end
268	268
269	269	def cared_merge_requests
270		- MergeRequest.where("author_id = :id or assignee_id = :id", id: self.id)
	270	+ MergeRequest.cared(self)
271	271	end
272	272
273	273	# Remove user from all projects and
...	...