diff options
author | James Lopez <james@jameslopez.es> | 2016-08-08 15:05:58 +0200 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2016-09-20 10:14:39 +0200 |
commit | 0c65112da79e177da3574458c3bb5befc349fd30 (patch) | |
tree | f3715fa7342143d1fd7bd53278c3ecf279e87c49 /app/assets/javascripts/importer_status.js | |
parent | 95b9421ad3b2678da6e0af0131eafd52cdd0b2a5 (diff) | |
download | gitlab-ce-0c65112da79e177da3574458c3bb5befc349fd30.tar.gz |
modify github import JS and controller so we can now specify a namespace and/or name for a project.
- Fixed and added specs.
- Added different namespace options depending on user privilages
- Updated docs.
Diffstat (limited to 'app/assets/javascripts/importer_status.js')
-rw-r--r-- | app/assets/javascripts/importer_status.js | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/app/assets/javascripts/importer_status.js b/app/assets/javascripts/importer_status.js index 9efad1ce943..9fe00a0a4db 100644 --- a/app/assets/javascripts/importer_status.js +++ b/app/assets/javascripts/importer_status.js @@ -14,20 +14,20 @@ $btn = $(e.currentTarget); $tr = $btn.closest('tr'); $target_field = $tr.find('.import-target'); - $namespace_input = $target_field.find('input'); + $namespace_input = $target_field.find('.js-select-namespace option:selected'); id = $tr.attr('id').replace('repo_', ''); target_namespace = null; - + new_name = null; if ($namespace_input.length > 0) { - target_namespace = $namespace_input.prop('value'); - $target_field.empty().append(target_namespace + "/" + ($target_field.data('project_name'))); + target_namespace = $namespace_input[0].innerHTML; + new_name = $target_field.find('#path').prop('value'); + $target_field.empty().append(target_namespace + "/" + new_name); } - $btn.disable().addClass('is-loading'); - return $.post(_this.import_url, { repo_id: id, - target_namespace: target_namespace + target_namespace: target_namespace, + new_name: new_name }, { dataType: 'script' }); |