Skip to content

Commit

Permalink
Addressing rubocop warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
h-kataria committed Mar 24, 2020
1 parent 50374b0 commit 304da55
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion app/controllers/application_controller/explorer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def x_history
'start' => :s1, 'stop' => :s1, 'suspend' => :s1,
'reset' => :s1, 'terminate' => :s1, 'pause' => :s1,
'shelve' => :s1, 'shelve_offload' => :s1, 'chargeback' => :s1,
'manager_pause' => :s1, 'manager_resume' => :s1,
'manager_pause' => :s1, 'manager_resume' => :s1,

# group 2
'clone' => :s2, 'compare' => :s2, 'drift' => :s2,
Expand Down
4 changes: 2 additions & 2 deletions app/controllers/configured_system_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ def provision
:escape => false)
else
render_flash(n_("No common configuration profiles available for the selected configured system",
"No common configuration profiles available for the selected configured systems",
provisioning_ids.size), :error)
"No common configuration profiles available for the selected configured systems",
provisioning_ids.size), :error)
end
end

Expand Down
4 changes: 3 additions & 1 deletion app/helpers/configuration_manager_helper/textual_summary.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,13 @@ def textual_group_properties

def textual_description
return nil if @record.try(:description).blank?

{:label => _("Description"), :value => @record.description}
end

def textual_region
return nil if @record.provider_region.blank?

label_val = _('Region')
{:label => label_val, :value => @record.provider_region}
end
Expand All @@ -23,6 +25,7 @@ def textual_hostname

def textual_ipaddress
return nil if @record.ipaddress.blank?

{:label => _("Discovered IP Address"), :value => @record.ipaddress}
end

Expand Down Expand Up @@ -69,5 +72,4 @@ def textual_group_status
def textual_group_tags
%i[tags]
end

end
1 change: 0 additions & 1 deletion app/helpers/configured_system_helper/textual_summary.rb
Original file line number Diff line number Diff line change
Expand Up @@ -117,5 +117,4 @@ def textual_configuration_organizations_name
:value => (@record.configuration_profile.try(:configuration_organizations) || []).collect(&:name).join(", ")
}
end

end
6 changes: 3 additions & 3 deletions app/presenters/menu/default_menu.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ def compute_menu_section

def configuration_menu_section
Menu::Section.new(:conf, N_("Configuration"), 'fa fa-cog', [
Menu::Item.new('configuration_manager', N_('Providers'), 'configuration_manager', {:feature => 'configuration_manager_show_list'}, '/configuration_manager/show_list'),
Menu::Item.new('configuration_profile', N_('Profiles'), 'configuration_profile', {:feature => 'configuration_profile_show_list'}, '/configuration_profile/show_list'),
Menu::Item.new('configured_system', N_('Configured Systems'), 'configured_system', {:feature => 'configured_system_show_list'}, '/configured_system/show_list'),
Menu::Item.new('configuration_manager', N_('Providers'), 'configuration_manager', {:feature => 'configuration_manager_show_list'}, '/configuration_manager/show_list'),
Menu::Item.new('configuration_profile', N_('Profiles'), 'configuration_profile', {:feature => 'configuration_profile_show_list'}, '/configuration_profile/show_list'),
Menu::Item.new('configured_system', N_('Configured Systems'), 'configured_system', {:feature => 'configured_system_show_list'}, '/configured_system/show_list'),
])
end

Expand Down
1 change: 0 additions & 1 deletion app/views/configuration_manager/new.html.haml
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
= render :partial => 'configuration_manager/shared_form'

0 comments on commit 304da55

Please sign in to comment.