Merge branch '29432-prevent-click-disabled-btn' into 'master'
Prevent clicking on disabled button Closes #29432 See merge request !9931
This commit is contained in:
commit
81ac42bd5b
|
@ -459,20 +459,13 @@ a.deploy-project-label {
|
|||
flex-wrap: wrap;
|
||||
|
||||
.btn {
|
||||
margin: 0 10px 10px 0;
|
||||
padding: 8px;
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
> div {
|
||||
margin-bottom: 10px;
|
||||
padding-left: 0;
|
||||
|
||||
&:last-child {
|
||||
margin-bottom: 0;
|
||||
|
||||
.btn {
|
||||
margin-right: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -78,7 +78,7 @@
|
|||
- if git_import_enabled?
|
||||
%button.btn.js-toggle-button.import_git{ type: "button" }
|
||||
= icon('git', text: 'Repo by URL')
|
||||
.import_gitlab_project
|
||||
.import_gitlab_project.has-tooltip{ data: { container: 'body' } }
|
||||
- if gitlab_project_import_enabled?
|
||||
= link_to new_import_gitlab_project_path, class: 'btn btn_import_gitlab_project project-submit' do
|
||||
= icon('gitlab', text: 'GitLab export')
|
||||
|
@ -109,6 +109,9 @@
|
|||
%p Please wait a moment, this page will automatically refresh when ready.
|
||||
|
||||
:javascript
|
||||
var importBtnTooltip = "Please enter a valid project name.";
|
||||
var $importBtnWrapper = $('.import_gitlab_project');
|
||||
|
||||
$('.how_to_import_link').bind('click', function (e) {
|
||||
e.preventDefault();
|
||||
var import_modal = $(this).next(".modal").show();
|
||||
|
@ -123,15 +126,8 @@
|
|||
$(".btn_import_gitlab_project").attr("href", _href + '?namespace_id=' + $("#project_namespace_id").val() + '&path=' + $("#project_path").val());
|
||||
});
|
||||
|
||||
$('.btn_import_gitlab_project').attr('disabled',true)
|
||||
$('.import_gitlab_project').attr('title', 'Project path and name required.');
|
||||
|
||||
$('.import_gitlab_project').click(function( event ) {
|
||||
if($('.btn_import_gitlab_project').attr('disabled')) {
|
||||
event.preventDefault();
|
||||
new Flash("Please enter path and name for the project to be imported to.");
|
||||
}
|
||||
});
|
||||
$('.btn_import_gitlab_project').attr('disabled', $('#project_path').val().trim().length === 0);
|
||||
$importBtnWrapper.attr('title', importBtnTooltip);
|
||||
|
||||
$('#new_project').submit(function(){
|
||||
var $path = $('#project_path');
|
||||
|
@ -139,13 +135,13 @@
|
|||
});
|
||||
|
||||
$('#project_path').keyup(function(){
|
||||
if($(this).val().length !=0) {
|
||||
if($(this).val().trim().length !== 0) {
|
||||
$('.btn_import_gitlab_project').attr('disabled', false);
|
||||
$('.import_gitlab_project').attr('title','');
|
||||
$(".flash-container").html("")
|
||||
$importBtnWrapper.attr('title','');
|
||||
$importBtnWrapper.removeClass('has-tooltip');
|
||||
} else {
|
||||
$('.btn_import_gitlab_project').attr('disabled',true);
|
||||
$('.import_gitlab_project').attr('title', 'Project path and name required.');
|
||||
$importBtnWrapper.addClass('has-tooltip');
|
||||
}
|
||||
});
|
||||
|
||||
|
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
title: Fix project title validation, prevent clicking on disabled button
|
||||
merge_request: 9931
|
||||
author:
|
|
@ -69,12 +69,8 @@ feature 'Import/Export - project import integration test', feature: true, js: tr
|
|||
|
||||
select2(namespace.id, from: '#project_namespace_id')
|
||||
|
||||
# click on disabled element
|
||||
find(:link, 'GitLab export').trigger('click')
|
||||
|
||||
page.within('.flash-container') do
|
||||
expect(page).to have_content('Please enter path and name')
|
||||
end
|
||||
# Check for tooltip disabled import button
|
||||
expect(find('.import_gitlab_project')['title']).to eq('Please enter a valid project name.')
|
||||
end
|
||||
end
|
||||
|
||||
|
|
Loading…
Reference in New Issue