From 9e5a305f18377c9fbe74e44dcef7606ab109291c Mon Sep 17 00:00:00 2001 From: Douglas Barbosa Alexandre Date: Wed, 3 Aug 2016 12:09:03 -0300 Subject: Use zero-based positions on issues board services --- app/services/boards/lists/create_service.rb | 3 ++- app/services/boards/lists/move_service.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'app/services/boards') diff --git a/app/services/boards/lists/create_service.rb b/app/services/boards/lists/create_service.rb index 59e8b51e37f..77c3c85df92 100644 --- a/app/services/boards/lists/create_service.rb +++ b/app/services/boards/lists/create_service.rb @@ -12,7 +12,8 @@ module Boards private def find_next_position - board.lists.label.maximum(:position).to_i + 1 + max_position = board.lists.label.maximum(:position) + max_position.nil? ? 0 : max_position.succ end def create_list_at(position) diff --git a/app/services/boards/lists/move_service.rb b/app/services/boards/lists/move_service.rb index 9bd07f43a36..1c91fed0ff4 100644 --- a/app/services/boards/lists/move_service.rb +++ b/app/services/boards/lists/move_service.rb @@ -19,7 +19,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.label.size end def old_position -- cgit v1.2.1