Merge pull request #12475 from himdel/nil-to_s-or-new

Convert (foo.to_s || "new") to (foo || "new").to_s (cherry picked from commit fa4d6c9) https://bugzilla.redhat.com/show_bug.cgi?id=1411362
ManageIQ · Jan 9, 2017 · eff8087 · eff8087
1 parent 166c703
commit eff8087
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/app/controllers/application_controller/buttons.rb b/app/controllers/application_controller/buttons.rb
@@ -116,7 +116,7 @@ def automate_button_field_changed
         page.replace("ab_form", :partial => "shared/buttons/ab_form")
       end
       if params[:visibility_typ]
-        page.replace("form_role_visibility", :partial => "layouts/role_visibility", :locals => {:rec_id => (@custom_button.id.to_s || "new"), :action => "automate_button_field_changed"})
+        page.replace("form_role_visibility", :partial => "layouts/role_visibility", :locals => {:rec_id => (@custom_button.id || "new").to_s, :action => "automate_button_field_changed"})
       end
       unless params[:target_class]
         @changed = (@edit[:new] != @edit[:current])

diff --git a/app/controllers/miq_ae_customization_controller/dialogs.rb b/app/controllers/miq_ae_customization_controller/dialogs.rb
@@ -517,7 +517,7 @@ def field_value_accept
       page << javascript_for_miq_button_visibility(changed)
 
       # replace select tag of default values
-      url = url_for(:action => 'dialog_form_field_changed', :id => (@record.id.to_s || "new"))
+      url = url_for(:action => 'dialog_form_field_changed', :id => (@record.id || "new").to_s)
       none =  [['<None>', nil]]
       values = key[:values].empty? ? none : none + key[:values].collect(&:reverse)
       selected = @edit[:field_default_value]
@@ -557,7 +557,7 @@ def field_value_delete
       page << javascript_for_miq_button_visibility(changed)
 
       # replace select tag of default values
-      url = url_for(:action => 'dialog_form_field_changed', :id => (@record.id.to_s || "new"))
+      url = url_for(:action => 'dialog_form_field_changed', :id => (@record.id || "new").to_s)
       none =  [['<None>', nil]]
       values = key[:values].empty? ? none : none + key[:values].collect(&:reverse)
       selected = @edit[:field_default_value]

diff --git a/app/controllers/ops_controller.rb b/app/controllers/ops_controller.rb
@@ -167,12 +167,12 @@ def change_tab(new_tab_id = nil)
       @scan = @edit[:scan]
       case params[:tab].split("_")[0]
       when "new"
-        redirect_to(:action => "ap_new", :tab => params[:tab], :id => (@scan.id.to_s || "new"))
+        redirect_to(:action => "ap_new", :tab => params[:tab], :id => (@scan.id || "new").to_s)
       when "edit"
-        redirect_to(:action => "ap_edit", :tab => params[:tab], :id => (@scan.id.to_s || "new"))
+        redirect_to(:action => "ap_edit", :tab => params[:tab], :id => (@scan.id || "new").to_s)
       else
         @sb[:miq_tab] = "new#{params[:tab]}"
-        redirect_to(:action => "ap_edit", :tab => "edit#{params[:tab]}", :id => (@scan.id.to_s || "new"))
+        redirect_to(:action => "ap_edit", :tab => "edit#{params[:tab]}", :id => (@scan.id || "new").to_s)
       end
     else
       @sb[:active_tab] = params[:tab_id] || new_tab_id