Merge pull request #3299 from nimrodshn/support_pv_to_pod_relationship

Adding UI support for Pod to PersistentVolume relationship.
ManageIQ · Feb 8, 2018 · 2341a39 · 2341a39
2 parents 7a41058 + 909739e
commit 2341a39
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -236,12 +236,13 @@ def controller_to_model
   }.freeze
 
   HAS_ASSOCATION = {
-    "groups"         => "groups",
-    "users"          => "users",
-    "event_logs"     => "event_logs",
-    "OsProcess"      => "processes",
-    "scan_histories" => "scan_histories",
-    "based_volumes"  => "based_volumes"
+    "groups"           => "groups",
+    "users"            => "users",
+    "event_logs"       => "event_logs",
+    "OsProcess"        => "processes",
+    "scan_histories"   => "scan_histories",
+    "based_volumes"    => "based_volumes",
+    "PersistentVolume" => "persistent_volumes"
   }.freeze
 
   def model_to_report_data

diff --git a/app/helpers/container_group_helper/textual_summary.rb b/app/helpers/container_group_helper/textual_summary.rb
@@ -16,7 +16,7 @@ def textual_group_relationships
       _("Relationships"),
       %i(
         ems container_project container_services container_replicator containers container_node
-        lives_on container_images
+        lives_on container_images persistent_volumes
       )
     )
   end

diff --git a/app/helpers/container_summary_helper.rb b/app/helpers/container_summary_helper.rb
@@ -171,7 +171,7 @@ def textual_persistent_volume
   end
 
   def textual_persistent_volumes
-    textual_link(@record.persistent_volumes)
+    textual_link(@record.persistent_volumes, :as => PersistentVolume)
   end
 
   def textual_parent

diff --git a/app/views/container_group/show.html.haml b/app/views/container_group/show.html.haml
@@ -1,4 +1,4 @@
-- if %w(containers container_services container_images).include?(@display)
+- if %w(containers container_services container_images persistent_volumes).include?(@display)
     = render :partial => "layouts/gtl", :locals => {:action_url => "show/#{@record.id}"}
 - else
     - case @showtype

diff --git a/app/views/layouts/listnav/_container_group.html.haml b/app/views/layouts/listnav/_container_group.html.haml
@@ -36,3 +36,4 @@
         = multiple_relationship_link(@record, :container)
         = multiple_relationship_link(@record, :container_image)
         = single_relationship_link(@record, :container_node)
+        = multiple_relationship_link(@record, :persistent_volume)