Extract duplicated code for loading instance variables

ManageIQ · Jun 28, 2017 · 0635b87 · 0635b87
1 parent 8a48ca0
commit 0635b87
Showing 1 changed file with 13 additions and 18 deletions.
diff --git a/app/controllers/mixins/actions/vm_actions/ownership.rb b/app/controllers/mixins/actions/vm_actions/ownership.rb
@@ -86,19 +86,10 @@ def ownership(ownership_ids = [])
         def build_ownership_info(ownership_ids)
           @edit ||= {}
           klass = get_class_from_controller_param(params[:controller])
-          @ownershipitems ||= find_records_with_rbac(klass, ownership_ids).sort_by(&:name)
-
-          if ownership_ids.length > 1
-            @user = @group = 'dont-change'
-          else
-            record = @ownershipitems.first
-            @user = record.evm_owner&.id&.to_s
-            @group = record.miq_group&.id&.to_s
-          end
+          load_user_group_items(ownership_ids)
 
           @groups = {} # Create new entries hash (2nd pulldown)
           Rbac.filtered(MiqGroup.non_tenant_groups).each { |g| @groups[g.description] = g.id.to_s }
-
           @edit[:object_ids] = ownership_ids
           @view = get_db_view(klass == VmOrTemplate ? Vm : klass) # Instantiate the MIQ Report view object
           @view.table = MiqFilter.records2table(ownershipitems, @view.cols + ['id'])
@@ -109,14 +100,7 @@ def build_ownership_info(ownership_ids)
         def build_ownership_hash(ownership_ids)
           klass = get_class_from_controller_param(params[:controller])
           @ownershipitems ||= find_records_with_rbac(klass, ownership_ids).sort_by(&:name)
-
-          if ownership_ids.length > 1
-            @user = @group = 'dont-change'
-          else
-            record = @ownershipitems.first
-            @user = record.evm_owner&.id.to_s
-            @group = record.miq_group&.id&.to_s
-          end
+          load_user_group_items(ownership_ids)
 
           @groups = {}
           Rbac.filtered(MiqGroup).each { |g| @groups[g.description] = g.id.to_s }
@@ -141,6 +125,17 @@ def ownership_update
 
         private
 
+        def load_user_group_items(ownership_ids)
+          @ownershipitems ||= find_records_with_rbac(klass, ownership_ids).sort_by(&:name)
+          if ownership_ids.length > 1
+            @user = @group = 'dont-change'
+          else
+            record = @ownershipitems.first
+            @user = record.evm_owner&.id&.to_s
+            @group = record.miq_group&.id&.to_s
+          end
+        end
+
         def ownership_handle_cancel_button
           add_flash(_("Set Ownership was cancelled by the user"))
           if @sb[:explorer]