diff options
author | Valery Sizov <valery@gitlab.com> | 2017-02-27 14:16:26 +0300 |
---|---|---|
committer | Valery Sizov <valery@gitlab.com> | 2017-02-27 14:16:26 +0300 |
commit | 69e0b06dbb5866be65641ecf0f9b9b29c339a204 (patch) | |
tree | 291be0356589e9c863b3bf79d05b710384bbcdad /app/models/concerns/relative_positioning.rb | |
parent | 1ff3cd993468f5e1825d2824fbc93d25899b8014 (diff) |
[Issue Sorting] Add project scope when calculate maximum position[ci skip]
Diffstat (limited to 'app/models/concerns/relative_positioning.rb')
-rw-r--r-- | app/models/concerns/relative_positioning.rb | 6 |
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 |