Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Foreman 1.11] fixes #12312 - bulk actions opens job invocation in new page directly #72

Merged
merged 1 commit into from Jan 22, 2016
Merged

[Foreman 1.11] fixes #12312 - bulk actions opens job invocation in new page directly #72

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 1 addition & 22 deletions app/helpers/concerns/foreman_remote_execution/hosts_helper_extensions.rb
View file
Open in desktop
Expand Up @@ -5,36 +5,15 @@ module HostsHelperExtensions
included do
alias_method_chain(:host_title_actions, :run_button)
alias_method_chain :multiple_actions, :remote_execution
alias_method_chain :multiple_actions_select, :remote_execution
end

def multiple_actions_with_remote_execution
# The modal window loads empty page, we hook the custom function
# to the link later. The ?run_job=true is there just to be able to identify the link
multiple_actions_without_remote_execution + [[_('Run Job'), 'blank.html?run_job=true']]
multiple_actions_without_remote_execution + [[_('Run Job'), new_job_invocation_path, false]]
end

def host_title_actions_with_run_button(*args)
title_actions(button_group(link_to(_("Run Job"), new_job_invocation_path(:host_ids => [args.first.id]), :id => :run_button)))
host_title_actions_without_run_button(*args)
end

def multiple_actions_select_with_remote_execution(*args)
# TODO: awful hack to open the job invocation form as a new
# page rather than using the AJAX inside a modal window.
# Since we want for this plugin to be compatible with 1.9, we
# need to monkey patch/js hack for now, but it should be removed
# after we fix and release http://projects.theforeman.org/issues/11309
multiple_actions_select_without_remote_execution(*args) +
<<-JAVASCRIPT.html_safe
<script>
$(function () {
$("#submit_multiple a[onclick*='blank.html?run_job=true']").click(function (e) {
document.location = "#{new_job_invocation_path}?" + $.param({host_ids: $.foremanSelectedHosts});
})
})
</script>
JAVASCRIPT
end
end
end