diff options
author | Rémy Coutable <remy@rymai.me> | 2016-09-05 17:23:32 +0200 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2016-09-05 17:23:32 +0200 |
commit | 8aa025bb85cab3070a876b43d9c5462af5f35e67 (patch) | |
tree | ee0a11ec654dcf337b6badad796068f0bd54085e /app/assets | |
parent | 89af76edc5e44ad1a0a55a65337bb992355911a6 (diff) | |
parent | a24822104a1b27560c8d3c76462ef778144f9491 (diff) | |
download | gitlab-ce-8aa025bb85cab3070a876b43d9c5462af5f35e67.tar.gz |
Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhq
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/importer_status.js | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/app/assets/javascripts/importer_status.js b/app/assets/javascripts/importer_status.js index 0f840821f53..9efad1ce943 100644 --- a/app/assets/javascripts/importer_status.js +++ b/app/assets/javascripts/importer_status.js @@ -10,21 +10,24 @@ ImporterStatus.prototype.initStatusPage = function() { $('.js-add-to-import').off('click').on('click', (function(_this) { return function(e) { - var $btn, $namespace_input, $target_field, $tr, id, new_namespace; + var $btn, $namespace_input, $target_field, $tr, id, target_namespace; $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_', ''); - new_namespace = null; + target_namespace = null; + if ($namespace_input.length > 0) { - new_namespace = $namespace_input.prop('value'); - $target_field.empty().append(new_namespace + "/" + ($target_field.data('project_name'))); + target_namespace = $namespace_input.prop('value'); + $target_field.empty().append(target_namespace + "/" + ($target_field.data('project_name'))); } + $btn.disable().addClass('is-loading'); + return $.post(_this.import_url, { repo_id: id, - new_namespace: new_namespace + target_namespace: target_namespace }, { dataType: 'script' }); @@ -70,7 +73,7 @@ if ($('.js-importer-status').length) { var jobsImportPath = $('.js-importer-status').data('jobs-import-path'); var importPath = $('.js-importer-status').data('import-path'); - + new ImporterStatus(jobsImportPath, importPath); } }); |