Skip to content

Fixes #38891 - Refactor @subtotal assignment for API hosts action #1015

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

Merged
adamruzicka merged 1 commit into from
Nov 25, 2025
Merged

Fixes #38891 - Refactor @subtotal assignment for API hosts action #1015

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions app/controllers/api/v2/job_invocations_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,11 @@ def output
def hosts
set_hosts_and_template_invocations
set_statuses_and_smart_proxies
@total = @job_invocation.targeting.hosts.size
Copy link
Member Author

@ofedoren ofedoren Nov 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is removed since it's essentially this: https://github.com/theforeman/foreman_remote_execution/blob/master/app/controllers/api/v2/job_invocations_controller.rb#L304, although not sure 'cause of .where later when params[:search] is present.

@total = @hosts.size
@hosts = @hosts.search_for(params[:search], :order => params[:order]).paginate(:page => params[:page], :per_page => params[:per_page])
@subtotal = @hosts.total_entries
if params[:awaiting]
@hosts = @hosts.select { |host| @host_statuses[host.id] == 'N/A' }
@subtotal = @hosts.size
else
@subtotal = @hosts.respond_to?(:total_entries) ? @hosts.total_entries : @hosts.sizes
end
render :hosts, :layout => 'api/v2/layouts/index_layout'
end
Expand Down Expand Up @@ -303,7 +301,7 @@ def set_hosts_and_template_invocations
@pattern_template_invocations = @job_invocation.pattern_template_invocations.includes(:input_values)
@hosts = @job_invocation.targeting.hosts.authorized(:view_hosts, Host)

unless params[:search].nil?
if params[:search].present?
@hosts = @hosts.joins(:template_invocations)
.where(:template_invocations => { :job_invocation_id => @job_invocation.id})
end
Expand Down
Loading