split complex methods

yast · Aug 6, 2014 · 1a3a08e · 1a3a08e
1 parent 735e69a
commit 1a3a08e
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 24 deletions.
diff --git a/src/lib/registration/ui/autoyast_config_dialog.rb b/src/lib/registration/ui/autoyast_config_dialog.rb
@@ -174,6 +174,22 @@ def refresh_widget_state
         Yast::UI.ChangeWidget(Id(:reg_server_cert_fingerprint), :Enabled, fingeprint_enabled && enabled)
       end
 
+      def store_config
+        data_widgets = [ :do_registration, :reg_server, :reg_server_cert,
+          :email, :reg_code, :slp_discovery, :install_updates,
+          :reg_server_cert_fingerprint_type, :reg_server_cert_fingerprint
+        ]
+
+        data = data_widgets.map do |w|
+          [w.to_s, Yast::UI.QueryWidget(Id(w), :Value)]
+        end
+
+        import_data = Hash[data]
+        # keep the current addons
+        import_data["addons"] = config.addons
+        config.import(import_data)
+      end
+
       def handle_dialog
         begin
           ret = Yast::UI.UserInput
@@ -189,24 +205,9 @@ def handle_dialog
           end
         end until ret == :next || ret == :back || ret == :addons
 
-        if ret == :next || ret == :addons
-          data_widgets = [ :do_registration, :reg_server, :reg_server_cert,
-            :email, :reg_code, :slp_discovery, :install_updates,
-            :reg_server_cert_fingerprint_type, :reg_server_cert_fingerprint
-          ]
-
-          data = data_widgets.map do |w|
-            [w.to_s, Yast::UI.QueryWidget(Id(w), :Value)]
-          end
-
-          import_data = Hash[data]
-          # keep the current addons
-          import_data["addons"] = config.addons
-          config.import(import_data)
-        end
+        store_config if ret == :next || ret == :addons
 
         ret
-
       end
 
     end

diff --git a/src/lib/registration/ui/import_certificate_dialog.rb b/src/lib/registration/ui/import_certificate_dialog.rb
@@ -49,14 +49,10 @@ def initialize(cert)
       # display the dialog and wait for a button click
       # @return [Symbol] user input (:import, :cancel)
       def run
-        log.info "Displaying certificate import dialog:"
-        log.info " * Issuer: #{certificate.issuer_name}"
-        log.info " * Subject: #{certificate.subject_name}"
-        log.info " * SHA1: #{certificate.sha1_fingerprint}"
-
-        dialog_content = import_dialog_content
-        log.debug "Certificate import dialog: #{dialog_content}"
-        Yast::UI.OpenDialog(Opt(:decorated), dialog_content)
+        log.info "Certificate import dialog: issuer: #{certificate.issuer_name}, " \
+          "subject: #{certificate.subject_name}, SHA1: #{certificate.sha1_fingerprint}"
+
+        Yast::UI.OpenDialog(Opt(:decorated), import_dialog_content)
 
         begin
           Yast::UI.SetFocus(:cancel)