[Issue Sorting] Add project scope when calculate maximum position[ci skip]

1 files changed, 4 insertions, 2 deletions

diff --git a/app/models/concerns/relative_positioning.rb b/app/models/concerns/relative_positioning.rb
index 3c1e726e6c8..1d77bdecddb 100644
--- a/app/models/concerns/relative_positioning.rb
+++ b/app/models/concerns/relative_positioning.rb
@@ -9,11 +9,11 @@ module RelativePositioning
   end
 
   def min_relative_position
-    self.class.minimum(:relative_position)
+    self.class.in_projects(project.id).minimum(:relative_position)
   end
 
   def max_relative_position
-    self.class.maximum(:relative_position)
+    self.class.in_projects(project.id).maximum(:relative_position)
   end
 
   def prev_relative_position
@@ -21,6 +21,7 @@ module RelativePositioning
 
     if self.relative_position
       prev_pos = self.class.
+        in_projects(project.id).
         where('relative_position < ?', self.relative_position).
         maximum(:relative_position)
     end
@@ -33,6 +34,7 @@ module RelativePositioning
 
     if self.relative_position
       next_pos = self.class.
+        in_projects(project.id).
         where('relative_position > ?', self.relative_position).
         minimum(:relative_position)
     end