diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-04-21 09:29:17 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-04-21 09:29:17 +0000 |
| commit | 2400181a3af8709603d90dbc414da0ebcb36c633 (patch) | |
| tree | fbf4a208068bb0ff17e5227e790a55b4f3fa134e | |
| parent | 76aade28e25d1f6e8924b35ed9bd365c8889987f (diff) | |
| parent | 6fb1e80a2622a13f316ec056fc7b17ebf79ef1ef (diff) | |
| download | gitlab-ce-2400181a3af8709603d90dbc414da0ebcb36c633.tar.gz | |
Merge branch 'fix-cannot-move-project-error' into 'master'
Fix "Cannot move project" error message from popping up after a successful transfer
The JavaScript click handlers were never being removed, leading to duplicate requests when attempting to transfer a project to another namespace. The first transfer would succeed but the subsequent ones would fail, leading to the error message saying, "Cannot move project".
I attempted to write a unit test for this, but it was taking me too long to get it right.
Closes #1448 and #1128
See merge request !548
| -rw-r--r-- | CHANGELOG | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/application.js.coffee | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/confirm_danger_modal.js.coffee | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index b4affd5217a..d872b12df9a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -3,7 +3,7 @@ Please view this file on the master branch, on stable branches it's out of date. v 7.11.0 (unreleased) - Fix clone URL field and X11 Primary selection (Dmitry Medvinsky) - Ignore invalid lines in .gitmodules - - + - Fix "Cannot move project" error message from popping up after a successful transfer (Stan Hu) - - - diff --git a/app/assets/javascripts/application.js.coffee b/app/assets/javascripts/application.js.coffee index bd52d3d4d70..345af363775 100644 --- a/app/assets/javascripts/application.js.coffee +++ b/app/assets/javascripts/application.js.coffee @@ -173,6 +173,7 @@ $ -> $(@).closest(".diff-file").find(".notes_holder").toggle() e.preventDefault() + $(document).off "click", '.js-confirm-danger' $(document).on "click", '.js-confirm-danger', (e) -> e.preventDefault() btn = $(e.target) diff --git a/app/assets/javascripts/confirm_danger_modal.js.coffee b/app/assets/javascripts/confirm_danger_modal.js.coffee index bb99edbd09e..66e34dd4a08 100644 --- a/app/assets/javascripts/confirm_danger_modal.js.coffee +++ b/app/assets/javascripts/confirm_danger_modal.js.coffee @@ -8,11 +8,13 @@ class @ConfirmDangerModal submit = $('.js-confirm-danger-submit') submit.disable() + $('.js-confirm-danger-input').off 'input' $('.js-confirm-danger-input').on 'input', -> if rstrip($(@).val()) is project_path submit.enable() else submit.disable() + $('.js-confirm-danger-submit').off 'click' $('.js-confirm-danger-submit').on 'click', => @form.submit() |