Refactor common code to helper function

Author: GilbertCherrie

app/controllers/vm_cloud_controller.rb

@@ -125,20 +125,15 @@ def prefix_by_nodetype(nodetype)
   end
 
   def set_elements_and_redirect_unauthorized_user
-    params[:id] = normalize_vm_node_id(params[:id])
-    @nodetype, _id = parse_nodetype_and_id(params[:id])
-    prefix = prefix_by_nodetype(@nodetype)
+
+    prefix = setup_node_and_prefix
+    return true if prefix.nil?
 
     # Position in tree that matches selected record
     if role_allows?(:feature => "instances_accord") && prefix == "instances"
       set_active_elements_authorized_user('instances_tree', 'instances')
     elsif role_allows?(:feature => "images_accord") && prefix == "images"
       set_active_elements_authorized_user('images_tree', 'images')
-    elsif prefix.nil?
-      session.delete(:exp_parms)
-      flash_to_session(_("Can't access selected records"), :error)
-      redirect_to(:action => 'explorer', :id => nil)
-      return true
     elsif role_allows?(:feature => "#{prefix}_filter_accord")
       set_active_elements_authorized_user("#{prefix}_filter_tree", "#{prefix}_filter")
     else

app/controllers/vm_common.rb

@@ -800,6 +800,28 @@ def normalize_vm_node_id(id)
     record ? TreeBuilder.build_node_id(record) : id
   end
 
+  # Shared preamble for all VM explorer set_elements_and_redirect_unauthorized_user methods.
+  # Normalises params[:id], parses the nodetype, resolves the accordion prefix, and handles
+  # the case where the prefix is nil (bad/unrecognised node id) by redirecting back to the
+  # explorer with an error flash.
+  #
+  # Returns the resolved prefix string, or nil if a redirect was already issued (in which
+  # case the caller should return immediately).
+  def setup_node_and_prefix
+    params[:id] = normalize_vm_node_id(params[:id])
+    @nodetype, = parse_nodetype_and_id(params[:id])
+    prefix = prefix_by_nodetype(@nodetype)
+
+    if prefix.nil?
+      session.delete(:exp_parms)
+      flash_to_session(_("Can't access selected records"), :error)
+      redirect_to(:action => 'explorer', :id => nil)
+      return nil
+    end
+
+    prefix
+  end
+
   # if node is VM or Template is true - select parent node in explorer tree but show info of Vm/Template
   def resolve_node_info(id)
     nodetype, id = id.split("-")

app/controllers/vm_infra_controller.rb

@@ -52,18 +52,13 @@ def prefix_by_nodetype(nodetype)
   end
 
   def set_elements_and_redirect_unauthorized_user
-    params[:id] = normalize_vm_node_id(params[:id])
-    @nodetype, _id = parse_nodetype_and_id(params[:id])
-    prefix = prefix_by_nodetype(@nodetype)
+
+    prefix = setup_node_and_prefix
+    return true if prefix.nil?
 
     # Position in tree that matches selected record
     if role_allows?(:feature => "vandt_accord")
       set_active_elements_authorized_user('vandt_tree', 'vandt')
-    elsif prefix.nil?
-      session.delete(:exp_parms)
-      flash_to_session(_("Can't access selected records"), :error)
-      redirect_to(:action => 'explorer', :id => nil)
-      return true
     elsif role_allows?(:feature => "#{prefix}_filter_accord")
       set_active_elements_authorized_user("#{prefix}_filter_tree", "#{prefix}_filter")
     else

app/controllers/vm_or_template_controller.rb

@@ -42,17 +42,11 @@ def prefix_by_nodetype(nodetype)
   end
 
   def set_elements_and_redirect_unauthorized_user
-    params[:id] = normalize_vm_node_id(params[:id])
-    @nodetype, = parse_nodetype_and_id(params[:id])
-    prefix = prefix_by_nodetype(@nodetype)
+    prefix = setup_node_and_prefix
+    return true if prefix.nil?
 
     # Position in tree that matches selected record
-    if prefix.nil?
-      session.delete(:exp_parms)
-      flash_to_session(_("Can't access selected records"), :error)
-      redirect_to(:action => 'explorer', :id => nil)
-      return true
-    elsif role_allows?(:feature => "#{prefix}_filter_accord")
+    if role_allows?(:feature => "#{prefix}_filter_accord")
       set_active_elements_authorized_user("#{prefix}_filter_tree", "#{prefix}_filter")
     else
       redirect_to(:controller => 'dashboard', :action => "auth_error")