Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-08-03 18:09:03 +0300
committerDouglas Barbosa Alexandre <dbalexandre@gmail.com>2016-08-17 18:58:58 +0300
commit9e5a305f18377c9fbe74e44dcef7606ab109291c (patch)
tree2a9a2bc4f69a2ff93264bdfb69640f5a8e3ed800 /app/services/boards
parent2c00d5928c69744138c9a411c533ff3a098f2804 (diff)
Use zero-based positions on issues board services
Diffstat (limited to 'app/services/boards')
-rw-r--r--app/services/boards/lists/create_service.rb3
-rw-r--r--app/services/boards/lists/move_service.rb2
2 files changed, 3 insertions, 2 deletions
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