diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2016-07-01 20:09:27 +0000 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-07-01 20:09:27 +0000 |
| commit | d6efef0f2aeb982dcd64c63db1ec8b4946f77a31 (patch) | |
| tree | 4d8388aa9c6855a6fbc5d26680a43657874bcbae | |
| parent | b227355973fac017905833409e8cb721f9dbd36d (diff) | |
| parent | 9dab692a2be2624ee2dddd6ae54accb2c28e4f93 (diff) | |
| download | gitlab-ce-d6efef0f2aeb982dcd64c63db1ec8b4946f77a31.tar.gz | |
Merge branch 'renable-import-button-when-namespace-already-been-taken' into 'master'
Renable import button when import process fail due to the namespace already been taken
Closes #19435
## Screenshots (if relevant)
Before:
<br/><br/>
After:
See merge request !5053
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/javascripts/importer_status.js.coffee | 11 | ||||
| -rw-r--r-- | app/views/import/base/create.js.haml | 5 |
3 files changed, 12 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG index ac14af9d2d0..2f93fcdbaa0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -37,6 +37,7 @@ v 8.9.5 (unreleased) - Fix assigning shared runners as admins. !4961 - Show "locked" label for locked runners on runners admin. !4961 - Fixes issues importing events in Import/Export. Import/Export version bumped to 0.1.1 + - Fix import button disabled when import process fail due to the namespace already been taken. v 8.9.4 - Fix privilege escalation issue with OAuth external users. diff --git a/app/assets/javascripts/importer_status.js.coffee b/app/assets/javascripts/importer_status.js.coffee index b0edc895649..eb046eb2eff 100644 --- a/app/assets/javascripts/importer_status.js.coffee +++ b/app/assets/javascripts/importer_status.js.coffee @@ -7,13 +7,16 @@ class @ImporterStatus $('.js-add-to-import') .off 'click' .on 'click', (e) => - new_namespace = null $btn = $(e.currentTarget) $tr = $btn.closest('tr') + $target_field = $tr.find('.import-target') + $namespace_input = $target_field.find('input') 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')}") + new_namespace = null + + if $namespace_input.length > 0 + new_namespace = $namespace_input.prop('value') + $target_field.empty().append("#{new_namespace}/#{$target_field.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}") |