Skip to content

Commit eb1481c

Browse files
authored
363399 - Fixing port position not displaying when 1FC (nanego#320)
1 parent 5031ace commit eb1481c

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

app/helpers/servers_helper.rb

+5-2
Original file line numberDiff line numberDiff line change
@@ -121,16 +121,19 @@ def link_to_port_without_label(position, port_data, port_type, card_id, port_id)
121121
end
122122

123123
def link_to_port(position, port_data, port_type, card_id, port_id, default_label = '')
124-
cable_name = port_data.try(:cable_name).present? ? port_data.try(:cable_name) : default_label
124+
cable_name = port_data&.cable_name.presence || default_label
125+
125126
case port_type.name
126127
when 'RJ', 'XRJ'
127128
port_type_name = "RJ"
128129
when 'FC', 'SC'
129130
port_type_name = "FC"
131+
cable_name = position.to_s.rjust(2, "0") if cable_name.blank?
130132
else
131-
cable_name = "#{port_data.try(:cable_name).present? ? port_data.try(:cable_name) : port_type.try(:name)}".html_safe
133+
cable_name = "#{port_data&.cable_name.presence || port_type.try(:name)}".html_safe
132134
port_type_name = port_type.name
133135
end
136+
134137
link_to_port_by_type(cable_name, port_type_name, port_data, position, card_id, port_id)
135138
end
136139

0 commit comments

Comments
 (0)