Skip to content

Commit

Permalink
Merge branch 'bz1283604-script-grid-55' into '5.5.z'
Browse files Browse the repository at this point in the history
MiqRequestMethods - sort_template_grid should call sort_grid('template', ...)

There is no build_script_grid, no prov_script_div, etc.

The other sort_*_grid allways pass the * to sort_grid, so should sort_template_grid.

https://bugzilla.redhat.com/show_bug.cgi?id=1283604
(cherry picked from commit 76b0af2)

5.5 BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1289250

ManageIQ#5624
clean cherry pick

See merge request !550
  • Loading branch information
Dan Clarizio committed Dec 7, 2015
2 parents f8e9c04 + 2e1ad15 commit e19a792
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ def sort_vc_grid
# get the sort column that was clicked on, else use the current one
def sort_template_grid
@edit = session[:edit]
sort_grid('script', @edit[:wf].get_field(:customization_template_id, :customize)[:values])
sort_grid('template', @edit[:wf].get_field(:customization_template_id, :customize)[:values])
end

private ############################
Expand Down

0 comments on commit e19a792

Please sign in to comment.