kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

fixing issues with project members mapping. Also added some more JS magic to the import page

This commit is contained in:
James Lopez 2016-05-02 18:22:18 +02:00
parent b5f2a7e139
commit 5a4f576359
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/views/projects/new.html.haml
View File

@ -131,3 +131,14 @@
var _href = $("a.import_gitlab_project").attr("href");
$(".import_gitlab_project").attr("href", _href + '?namespace_id=' + $("#project_namespace_id").val() + '&path=' + $("#project_path").val());
});
$('.import_gitlab_project').attr('disabled',true)
$('.import_gitlab_project').attr('title', 'Project path required.');
$('#project_path').keyup(function(){
if($(this).val().length !=0) {
$('.import_gitlab_project').attr('disabled', false);
$('.import_gitlab_project').attr('title','');
} else {
$('.import_gitlab_project').attr('disabled',true);
$('.import_gitlab_project').attr('title', 'Project path required.');
}
})

4
lib/gitlab/import_export/import_export_reader.rb
View File

@ -57,8 +57,10 @@ module Gitlab
end
def add_new_class(current_key, included_classes_hash, value)
only_except_hash = check_only_and_except(value)
# TODO: refactor this
value = (value.is_a?(Hash) ? value.merge(only_except_hash) : { value => only_except_hash }) if only_except_hash
new_hash = { include: value }
new_hash.merge!(check_only_and_except(value))
included_classes_hash[current_key] = new_hash
end

1
lib/gitlab/import_export/project_tree_restorer.rb
View File

@ -49,6 +49,7 @@ module Gitlab
project = Gitlab::ImportExport::ProjectFactory.create(
project_params: project_params, user: @user)
project.path = @project_path
project.name = @project_path
project.save
project
end