Add support to group labels prioritization on project level

1 files changed, 6 insertions, 4 deletions

diff --git a/app/models/label.rb b/app/models/label.rb
index 3ce4e253035..ea11d9d7864 100644
--- a/app/models/label.rb
+++ b/app/models/label.rb
@@ -32,12 +32,14 @@ class Label < ActiveRecord::Base
   scope :templates, -> { where(template: true) }
   scope :with_title, ->(title) { where(title: title) }
 
-  def self.prioritized
-    where.not(priority: nil).reorder(:priority, :title)
+  def self.prioritized(project)
+    joins(:priorities)
+      .where(label_priorities: { project_id: project })
+      .reorder('label_priorities.priority ASC, labels.title ASC')
   end
 
-  def self.unprioritized
-    where(priority: nil)
+  def self.unprioritized(project)
+    where.not(id: prioritized(project).select(:id))
   end
 
   alias_attribute :name, :title