diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-07-01 16:04:24 -0300 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2016-07-01 16:04:24 -0300 |
| commit | 8353cc6111e12fa819debe188776d7b6195ffaad (patch) | |
| tree | 27ef3b06afd4b9534de9b8f31a6af3716b78a396 | |
| parent | b227355973fac017905833409e8cb721f9dbd36d (diff) | |
| download | gitlab-ce-8353cc6111e12fa819debe188776d7b6195ffaad.tar.gz | |
Fix import button when import fail due the namespace already been taken
| -rw-r--r-- | app/assets/javascripts/importer_status.js.coffee | 2 | ||||
| -rw-r--r-- | app/views/import/base/create.js.haml | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/app/assets/javascripts/importer_status.js.coffee b/app/assets/javascripts/importer_status.js.coffee index b0edc895649..ec42c992e98 100644 --- a/app/assets/javascripts/importer_status.js.coffee +++ b/app/assets/javascripts/importer_status.js.coffee @@ -13,7 +13,7 @@ class @ImporterStatus id = $tr.attr('id').replace('repo_', '') if $tr.find('.import-target input').length > 0 new_namespace = $tr.find('.import-target input').prop('value') - $tr.find('.import-target').empty().append("#{new_namespace} / #{$tr.find('.import-target').data('project_name')}") + $tr.find('.import-target').empty().append("#{new_namespace}/#{$tr.find('.import-target').data('project_name')}") $btn .disable() diff --git a/app/views/import/base/create.js.haml b/app/views/import/base/create.js.haml index dfebf7768d9..804ad88468f 100644 --- a/app/views/import/base/create.js.haml +++ b/app/views/import/base/create.js.haml @@ -1,6 +1,8 @@ - if @already_been_taken :plain - target_field = $("tr#repo_#{@repo_id} .import-target") + tr = $("tr#repo_#{@repo_id}") + target_field = tr.find(".import-target") + import_button = tr.find(".btn-import") origin_target = target_field.text() project_name = "#{@project_name}" origin_namespace = "#{@target_namespace}" @@ -10,6 +12,7 @@ target_field.append("/" + project_name) target_field.data("project_name", project_name) target_field.find('input').prop("value", origin_namespace) + import_button.enable().removeClass('is-loading') - elsif @access_denied :plain job = $("tr#repo_#{@repo_id}") |