Merge pull request #461 from yast/fix_cwm_help

Fix cwm help

library/cwm/src/lib/cwm/widget.rb

@@ -60,6 +60,7 @@ module CWM
   class AbstractWidget
     include Yast::UIShortcuts
     include Yast::I18n
+    include Yast::Logger
 
     # By default, {#handle} has no argument and it is called
     # only for events of its own widget.
@@ -675,8 +676,6 @@ def cwm_widgets
       @cwm_widgets = Yast::CWM.CreateWidgets(names, definition)
     end
 
-  protected
-
     # help that is result of used widget helps.
     # If overwritting, do not forget to use `super`, otherwise widget helps will
     # be missing
@@ -734,6 +733,10 @@ def validate
       Yast::CWM.validateWidgets(@current_tab.cwm_definition["widgets"], "ID" => @current_tab.widget_id)
     end
 
+    def help
+      @current_tab ? @current_tab.help : ""
+    end
+
   protected
 
     # gets visual order of tabs
@@ -756,6 +759,8 @@ def switch_tab(tab_id)
       Yast::UI.ReplaceWidget(Id(replace_point_id), tab.cwm_definition["custom_widget"])
       Yast::CWM.initWidgets(tab.cwm_definition["widgets"])
       @current_tab = tab
+
+      Yast::CWM.ReplaceWidgetHelp(widget_id, help)
     end
 
     # visually mark currently active tab

package/yast2.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Apr 19 12:02:28 UTC 2016 - jreidinger@suse.com
+
+- CWM: fix showing help for tabs widgets
+  found during fixing bnc#952633)
+- 3.1.185
+
 -------------------------------------------------------------------
 Mon Apr 11 07:55:44 UTC 2016 - lslezak@suse.cz
 

package/yast2.spec

@@ -17,7 +17,7 @@
 
 
 Name:           yast2
-Version:        3.1.184
+Version:        3.1.185
 Release:        0
 Url:            https://github.com/yast/yast-yast2