Skip to content

Commit

Permalink
Merge pull request #12833 from ZitaNemeckova/add_tags_phase_2
Browse files Browse the repository at this point in the history
Add tags to objects in list view in Cloud Tenant
(cherry picked from commit 5ac8b32)

https://bugzilla.redhat.com/show_bug.cgi?id=1401957
  • Loading branch information
mzazrivec authored and simaishi committed Jan 6, 2017
1 parent 57f1a0e commit 9a0c83f
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
1 change: 1 addition & 0 deletions app/controllers/application_controller/tags.rb
Expand Up @@ -155,6 +155,7 @@ def tagging_edit_tags_reset
@in_a_form = true
session[:changed] = false
add_flash(_("All changes have been reset"), :warning) if params[:button] == "reset"
@title = _('Tag Assignment')
if tagging_explorer_controller?
@refresh_partial = "layouts/tagging"
replace_right_cell(@sb[:action]) if params[:button]
Expand Down
10 changes: 10 additions & 0 deletions app/controllers/cloud_tenant_controller.rb
Expand Up @@ -17,6 +17,16 @@ def button
params[:display] = @display if %w(vms instances images).include?(@display)
params[:page] = @current_page unless @current_page.nil? # Save current page for list refresh
return tag("CloudTenant") if params[:pressed] == 'cloud_tenant_tag'
return tag('CloudSubnet') if params[:pressed] == 'cloud_subnet_tag'
return tag('SecurityGroup') if params[:pressed] == 'security_group_tag'
return tag('CloudNetwork') if params[:pressed] == 'cloud_network_tag'
return tag('NetworkRouter') if params[:pressed] == 'network_router_tag'
return tag('FloatingIp') if params[:pressed] == 'floating_ip_tag'
return tag('NetworkPort') if params[:pressed] == 'network_port_tag'
return tag('CloudVolume') if params[:pressed] == 'cloud_volume_tag'
return tag('CloudObjectStoreObject') if params[:pressed] == 'cloud_object_store_object_tag'
return tag("CloudVolumeSnapshot") if params[:pressed] == 'cloud_volume_snapshot_tag'

if params[:pressed].starts_with?("vm_", # Handle buttons from sub-items screen
"miq_template_",
"guest_",
Expand Down

0 comments on commit 9a0c83f

Please sign in to comment.