Revert "Some syntax fixes"

This reverts commit ce33bc5.
yast · Feb 26, 2019 · 3d1e5de · 3d1e5de
1 parent ce33bc5
commit 3d1e5de
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/include/iscsi-lio-server/dialogs.rb b/src/include/iscsi-lio-server/dialogs.rb
@@ -485,6 +485,7 @@ def AddDialog
         VStretch()
       )
 
+      help = CWM.MergeHelps(w)
       contents = CWM.PrepareDialog(contents, w)
       Wizard.SetContentsButtons(
         caption,
@@ -553,6 +554,7 @@ def EditDialog
         VStretch()
       )
 
+      help = CWM.MergeHelps(w)
       contents = CWM.PrepareDialog(contents, w)
       Wizard.SetContentsButtons(
         caption,
@@ -585,6 +587,7 @@ def ExpertDialog
         VStretch()
       )
 
+      help = CWM.MergeHelps(w)
       contents = CWM.PrepareDialog(contents, w)
       Wizard.SetContentsButtons(
         caption,

diff --git a/src/include/iscsi-lio-server/helps.rb b/src/include/iscsi-lio-server/helps.rb
@@ -161,7 +161,7 @@ def initialize_iscsi_lio_server_helps(include_target)
             "<p>Under <b>Ip Address</b> and <b>Port Number</b> you specify under which address\n" +
               "and port the service will be available. Default for port number is 3260.\n" +
               "Only ip addresses assigned to one of the network cards are possible."
-          ) + "</p>" + "<p>" + use_login_auth + "</p>",
+          ) + "</p>" +"<p>" + use_login_auth + "</p>",
         # add target
         "target-add"         => _(
           "<h1>iSCSI Target IP/Port and LUN setup</h1>"

diff --git a/src/modules/IscsiLioData.rb b/src/modules/IscsiLioData.rb
@@ -84,13 +84,13 @@ def SetTgt(data, tgt, tpg, m)
     end
 
     def EnableDiscoveryAuth()
-      cmd ="lio_node --setchapdiscenforce=1"
-      LogExecCmd("#{cmd}", do_log: true)
+        cmd ="lio_node --setchapdiscenforce=1"
+        ret = LogExecCmd("#{cmd}", do_log: true)
     end
 
     def DisableDiscoveryAuth()
       cmd ="lio_node --setchapdiscenforce=0"
-      LogExecCmd("#{cmd}", do_log: true)
+      ret = LogExecCmd("#{cmd}", do_log: true)
     end
 
     def FindTcmKey(p)
@@ -401,7 +401,7 @@ def GetNetworkPortal(tgt, tpg)
       ) do |n|
         ip = n["ip"] || ""
         port = n["port"] || 3260
-        FormatIpPort(ip, port)
+        ipp = FormatIpPort(ip, port)
       end
       deep_copy(ret)
     end