diff options
author | Felipe Artur <felipefac@gmail.com> | 2016-05-25 18:34:40 -0400 |
---|---|---|
committer | Felipe Artur <felipefac@gmail.com> | 2016-06-24 15:23:33 -0300 |
commit | c391a72c18e7081cfbc1b80627663fdfcf4bbfe6 (patch) | |
tree | 753b9f6f84707eb1d7d54c26eeddec3069e3b903 | |
parent | 88c9a05771610b12e3853c1c414329442f6f166a (diff) | |
download | gitlab-ce-c391a72c18e7081cfbc1b80627663fdfcf4bbfe6.tar.gz |
Fix issue being ordered twice and callback when moving between states
-rw-r--r-- | CHANGELOG | 1 | ||||
-rw-r--r-- | app/assets/javascripts/milestone.js.coffee | 5 | ||||
-rw-r--r-- | app/controllers/projects/issues_controller.rb | 2 | ||||
-rw-r--r-- | app/models/issue.rb | 4 |
4 files changed, 9 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG index 4ebf0440cdd..e7838e7a8f1 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -92,6 +92,7 @@ v 8.9.0 - Links from a wiki page to other wiki pages should be rewritten as expected - Add option to project to only allow merge requests to be merged if the build succeeds (Rui Santos) - Added navigation shortcuts to the project pipelines, milestones, builds and forks page. !4393 + - Fix changing issue state columns in milestone view - Fix issues filter when ordering by milestone - Disable SAML account unlink feature - Added artifacts:when to .gitlab-ci.yml - this requires GitLab Runner 1.3 diff --git a/app/assets/javascripts/milestone.js.coffee b/app/assets/javascripts/milestone.js.coffee index 0037a3a21c2..0fd64e9384e 100644 --- a/app/assets/javascripts/milestone.js.coffee +++ b/app/assets/javascripts/milestone.js.coffee @@ -81,8 +81,9 @@ class @Milestone stop: (event, ui) -> $(".issues-sortable-list").css "min-height", "0px" update: (event, ui) -> - data = $(this).sortable("serialize") - Milestone.sortIssues(data) + if this == ui.item.parent()[0] + data = $(this).sortable("serialize") + Milestone.sortIssues(data) receive: (event, ui) -> new_state = $(this).data('state') diff --git a/app/controllers/projects/issues_controller.rb b/app/controllers/projects/issues_controller.rb index fbf8b01b7c2..80dbabf51a5 100644 --- a/app/controllers/projects/issues_controller.rb +++ b/app/controllers/projects/issues_controller.rb @@ -116,7 +116,7 @@ class Projects::IssuesController < Projects::ApplicationController end end format.json do - render json: @issue.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } }) + render json: @issue.to_json(include: { milestone: {}, assignee: { methods: :avatar_url }, labels: { methods: :text_color } }, methods: :saved) end end end diff --git a/app/models/issue.rb b/app/models/issue.rb index 3c5859194b4..421fd44dffc 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -190,4 +190,8 @@ class Issue < ActiveRecord::Base def overdue? due_date.try(:past?) || false end + + def saved + valid? + end end |