diff options
author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-08-16 20:38:43 +0300 |
---|---|---|
committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-08-17 18:58:59 +0300 |
commit | 50ac488c739718902ba897bc5ad8791d35914324 (patch) | |
tree | cc3e5cb1b9da7401a5068c510f06e36cdee51f13 /app/services/boards/lists | |
parent | c6511235e4253d11447b40c2ea42ecb02c99687e (diff) |
Add a movable scope and a movable? method to List model
Diffstat (limited to 'app/services/boards/lists')
-rw-r--r-- | app/services/boards/lists/create_service.rb | 2 | ||||
-rw-r--r-- | app/services/boards/lists/destroy_service.rb | 2 | ||||
-rw-r--r-- | app/services/boards/lists/generate_service.rb | 2 | ||||
-rw-r--r-- | app/services/boards/lists/move_service.rb | 16 |
4 files changed, 11 insertions, 11 deletions
diff --git a/app/services/boards/lists/create_service.rb b/app/services/boards/lists/create_service.rb index 704e0254217..5cb408b9d20 100644 --- a/app/services/boards/lists/create_service.rb +++ b/app/services/boards/lists/create_service.rb @@ -10,7 +10,7 @@ module Boards private def next_position - max_position = board.lists.label.maximum(:position) + max_position = board.lists.movable.maximum(:position) max_position.nil? ? 0 : max_position.succ end diff --git a/app/services/boards/lists/destroy_service.rb b/app/services/boards/lists/destroy_service.rb index 5c8719f193a..25da3bfb56d 100644 --- a/app/services/boards/lists/destroy_service.rb +++ b/app/services/boards/lists/destroy_service.rb @@ -13,7 +13,7 @@ module Boards private def decrement_higher_lists(list) - board.lists.label.where('position > ?', list.position) + board.lists.movable.where('position > ?', list.position) .update_all('position = position - 1') end diff --git a/app/services/boards/lists/generate_service.rb b/app/services/boards/lists/generate_service.rb index 9107b1fb9e7..86f0aa99c61 100644 --- a/app/services/boards/lists/generate_service.rb +++ b/app/services/boards/lists/generate_service.rb @@ -2,7 +2,7 @@ module Boards module Lists class GenerateService < Boards::BaseService def execute - return false unless board.lists.label.empty? + return false unless board.lists.movable.empty? List.transaction do label_params.each { |params| create_list(params) } diff --git a/app/services/boards/lists/move_service.rb b/app/services/boards/lists/move_service.rb index 2b2b5c3943a..020ff69f4a7 100644 --- a/app/services/boards/lists/move_service.rb +++ b/app/services/boards/lists/move_service.rb @@ -5,7 +5,7 @@ module Boards @old_position = list.position @new_position = params[:position] - return false unless list.label? + return false unless list.movable? return false unless valid_move? list.with_lock do @@ -20,7 +20,7 @@ module Boards def valid_move? new_position.present? && new_position != old_position && - new_position >= 0 && new_position < board.lists.label.size + new_position >= 0 && new_position < board.lists.movable.size end def reorder_intermediate_lists @@ -32,15 +32,15 @@ module Boards end def decrement_intermediate_lists - board.lists.label.where('position > ?', old_position) - .where('position <= ?', new_position) - .update_all('position = position - 1') + board.lists.movable.where('position > ?', old_position) + .where('position <= ?', new_position) + .update_all('position = position - 1') end def increment_intermediate_lists - board.lists.label.where('position >= ?', new_position) - .where('position < ?', old_position) - .update_all('position = position + 1') + board.lists.movable.where('position >= ?', new_position) + .where('position < ?', old_position) + .update_all('position = position + 1') end def update_list_position(list) |