Commit 34c826a3 authored by James Lopez's avatar James Lopez

some JS magic to pass namespace and path importing projects

parent cbbc42e0
...@@ -27,15 +27,18 @@ class Import::GitlabProjectsController < Import::BaseController ...@@ -27,15 +27,18 @@ class Import::GitlabProjectsController < Import::BaseController
end end
def create def create
# TODO verify access to namespace and path
file = params[:file] file = params[:file]
namespace_id = project_params[:namespace_id]
path = project_params[:path]
repo_owner = current_user.username repo_owner = current_user.username
@target_namespace = params[:new_namespace].presence || repo_owner @target_namespace = params[:new_namespace].presence || repo_owner
@project = Project.create_from_import_job(current_user_id: current_user.id, @project = Project.create_from_import_job(current_user_id: current_user.id,
tmp_file: File.expand_path(file.path), tmp_file: File.expand_path(file.path),
namespace_id: @namespace_id, namespace_id: namespace_id,
project_path: @path) project_path: path)
end end
private private
...@@ -45,7 +48,7 @@ class Import::GitlabProjectsController < Import::BaseController ...@@ -45,7 +48,7 @@ class Import::GitlabProjectsController < Import::BaseController
end end
def project_params def project_params
params.require(:project).permit( params.permit(
:path, :namespace_id, :path, :namespace_id,
) )
end end
......
...@@ -9,9 +9,12 @@ ...@@ -9,9 +9,12 @@
%p %p
To get started you add your project export file below. To get started you add your project export file below.
.form-group .form-group
= hidden_field_tag :namespace_id, @namespace_id
= hidden_field_tag :path, @path
= label_tag :file, class: 'control-label' do = label_tag :file, class: 'control-label' do
%span GitLab export file %span GitLab export file
.col-sm-10 .col-sm-10
= file_field_tag :file, class: '' = file_field_tag :file, class: ''
.form-actions .form-actions
= submit_tag 'Continue to the next step', class: 'btn btn-create' = submit_tag 'Continue to the next step', class: 'btn btn-create'
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
%span Repo by URL %span Repo by URL
- if gitlab_project_import_enabled? - if gitlab_project_import_enabled?
= link_to new_import_gitlab_project_path, class: 'btn import_gitlab_project' do = link_to new_import_gitlab_project_path, class: 'btn import_gitlab_project project-submit' do
%i.fa.fa-gitlab %i.fa.fa-gitlab
%span GitLab project %span GitLab project
...@@ -127,3 +127,7 @@ ...@@ -127,3 +127,7 @@
$('.modal-header .close').bind('click', function() { $('.modal-header .close').bind('click', function() {
$(".modal").hide(); $(".modal").hide();
}); });
$('.import_gitlab_project').bind('click', function() {
var _href = $("a.import_gitlab_project").attr("href");
$(".import_gitlab_project").attr("href", _href + '?namespace_id=' + $("#project_namespace_id").val() + '&path=' + $("#project_path").val());
});
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment