Merge pull request #108 from ancorgs/action

Make Dialogs::InstUserFirst#action public
yast · Aug 12, 2016 · 5e24d3b · 5e24d3b
2 parents 5fa6a5f + 648f71a
commit 5e24d3b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/package/yast2-users.changes b/package/yast2-users.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Aug 12 14:37:40 UTC 2016 - ancor@suse.com
+
+- The YaST client using the user creation dialog can now know
+  which action was selected by the user (needed to fix bsc#992245)
+- 3.1.55
+
 -------------------------------------------------------------------
 Thu Aug 11 11:37:12 UTC 2016 - ancor@suse.com
 

diff --git a/package/yast2-users.spec b/package/yast2-users.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-users
-Version:        3.1.54
+Version:        3.1.55
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/lib/users/dialogs/inst_user_first.rb b/src/lib/users/dialogs/inst_user_first.rb
@@ -41,6 +41,10 @@ class InstUserFirstDialog < ::UI::InstallationDialog
     }
     private_constant :WIDGETS
 
+    # @return [Symbol] Action selected by the user. Possible values are
+    #     :new_user, :import (only possible during installation) and :skip.
+    attr_reader :action
+
     def initialize
       super
       import_yast_modules
@@ -314,8 +318,6 @@ def set_focus
       UI.SetFocus(Id(widget)) if widget
     end
 
-    attr_reader :action
-
     def action=(value)
       @action = value
       refresh