Skip to content

Commit

Permalink
Fixed physical server textual groups creation and display
Browse files Browse the repository at this point in the history
  • Loading branch information
MaysaMacedo committed May 4, 2017
1 parent 7c4aaf3 commit 02d035c
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 3 deletions.
5 changes: 5 additions & 0 deletions app/controllers/physical_server_controller.rb
Expand Up @@ -31,4 +31,9 @@ def show_list

process_show_list
end

def textual_group_list
[%i(properties relationships assets)]
end
helper_method :textual_group_list
end
3 changes: 3 additions & 0 deletions app/helpers/physical_server_helper.rb
@@ -0,0 +1,3 @@
module PhysicalServerHelper
include_concern 'TextualSummary'
end
15 changes: 12 additions & 3 deletions app/helpers/physical_server_helper/textual_summary.rb
@@ -1,17 +1,26 @@
module PhysicalServerHelper::TextualSummary
def textual_group_properties
%i(name model product_name manufacturer machine_type serial_number ems_ref)
TextualGroup.new(
_("Properties"),
%i(name model product_name manufacturer machine_type serial_number ems_ref)
)
end

def textual_group_relationships
%i(host)
TextualGroup.new(
_("Relationships"),
%i(host)
)
end

def textual_group_compliance
end

def textual_group_assets
%i(support_contact description location room_id rack_name lowest_rack_unit)
TextualGroup.new(
_("Assets"),
%i(support_contact description location room_id rack_name lowest_rack_unit)
)
end

def textual_host
Expand Down
2 changes: 2 additions & 0 deletions app/views/physical_server/show.html.haml
Expand Up @@ -2,5 +2,7 @@
- arr = %w(physical_server physical_servers)
- if arr.include?(@display) && @showtype != "compare"
= render(:partial => "layouts/gtl", :locals => {:action_url => "show/#{@ph_server.id}"})
- elsif @showtype == 'main'
= render :partial => "layouts/textual_groups_generic"
- else
= render(:partial => @showtype)

0 comments on commit 02d035c

Please sign in to comment.