Add self.project_foreign_key on both Issue and MergeRequest

3 files changed, 9 insertions, 7 deletions

diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 9a9b562af02..17c3b526c97 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -145,16 +145,10 @@ module Issuable
     end
 
     def order_labels_priority(excluded_labels: [])
-      project_column =
-        case table_name
-        when Issue.table_name then "#{table_name}.project_id"
-        when MergeRequest.table_name then "#{table_name}.target_project_id"
-        end
-
       params = {
         target_type: name,
         target_column: "#{table_name}.id",
-        project_column: project_column,
+        project_column: "#{table_name}.#{project_foreign_key}",
         excluded_labels: excluded_labels
       }
 
diff --git a/app/models/issue.rb b/app/models/issue.rb
index f7ccce2924a..133a5993815 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -138,6 +138,10 @@ class Issue < ActiveRecord::Base
     reference.to_i > 0 && reference.to_i <= Gitlab::Database::MAX_INT_VALUE
   end
 
+  def self.project_foreign_key
+    'project_id'
+  end
+
   def self.sort(method, excluded_labels: [])
     case method.to_s
     when 'due_date_asc' then order_due_date_asc
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb
index fedc35102ef..0cc0b3c2a0e 100644
--- a/app/models/merge_request.rb
+++ b/app/models/merge_request.rb
@@ -137,6 +137,10 @@ class MergeRequest < ActiveRecord::Base
     reference.to_i > 0 && reference.to_i <= Gitlab::Database::MAX_INT_VALUE
   end
 
+  def self.project_foreign_key
+    'target_project_id'
+  end
+
   # Returns all the merge requests from an ActiveRecord:Relation.
   #
   # This method uses a UNION as it usually operates on the result of