Skip to content

Commit

Permalink
update from review
Browse files Browse the repository at this point in the history
  • Loading branch information
jreidinger committed Apr 29, 2019
1 parent df56249 commit 221c73d
Showing 1 changed file with 16 additions and 13 deletions.
29 changes: 16 additions & 13 deletions src/lib/y2firewall/clients/proposal.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
# find current contact information at www.suse.com.

require "yast"
require "erb"
require "y2firewall/firewalld/api"
require "y2firewall/proposal_settings"
require "y2firewall/dialogs/proposal"
Expand Down Expand Up @@ -134,8 +135,8 @@ def cpu_mitigations_proposal

mitigations = bl.cpu_mitigations

res = _("CPU Mitigations: ") + format("<a href=\"%s\">", LINK_CPU_MITIGATIONS) +
mitigations.to_human_string + "</a>"
res = _("CPU Mitigations: ") + "<a href=\"#{LINK_CPU_MITIGATIONS}\">" +
ERB::Util.html_escape(mitigations.to_human_string) + "</a>"
log.info "mitigations output #{res.inspect}"
res
end
Expand All @@ -144,18 +145,20 @@ def bootloader_dialog
require "bootloader/config_dialog"
Yast.import "Bootloader"

# do it in own dialog window
Yast::Wizard.CreateDialog
dialog = ::Bootloader::ConfigDialog.new(initial_tab: :kernel)
settings = Yast::Bootloader.Export
result = dialog.run
if result != :next
Yast::Bootloader.Import(settings)
else
Yast::Bootloader.proposed_cfg_changed = true
begin
# do it in own dialog window
Yast::Wizard.CreateDialog
dialog = ::Bootloader::ConfigDialog.new(initial_tab: :kernel)
settings = Yast::Bootloader.Export
result = dialog.run
if result != :next
Yast::Bootloader.Import(settings)
else
Yast::Bootloader.proposed_cfg_changed = true
end
ensure
Yast::Wizard.CloseDialog
end
ensure
Yast::Wizard.CloseDialog
end

# Returns the VNC-port part of the firewall proposal description
Expand Down

0 comments on commit 221c73d

Please sign in to comment.