Fixes #37948 - Update host output for MultiCV to match AK output

Katello · Oct 29, 2024 · 8e26a75 · 8e26a75
1 parent 1eaac14
commit 8e26a75
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/lib/hammer_cli_katello/activation_key.rb b/lib/hammer_cli_katello/activation_key.rb
@@ -55,7 +55,7 @@ def request_params
         field :format_consumed, _("Host Limit")
         field :multi_content_view_environment, _("Multi Content View Environment"), Fields::Boolean
         field :release_version, _("Release Version"), Fields::Field, :hide_blank => true
-        field :content_view_environment_labels, _("Content View Environments"), Fields::Field
+        field :content_view_environment_labels, _("Content View Environment Labels"), Fields::Field
 
         collection :organization, _("Organization") do
           field :id, _("Id"), Fields::Field, :hide_blank => true

diff --git a/lib/hammer_cli_katello/host_extensions.rb b/lib/hammer_cli_katello/host_extensions.rb
@@ -26,12 +26,9 @@ module HostExtensions
     ::HammerCLIForeman::Host::ListCommand.instance_eval do
       output do
         from :content_facet_attributes do
-          from :content_view do
-            field :name, _('Content View'), Fields::List
-          end
-          from :lifecycle_environment do
-            field :name, _('Lifecycle environment'), Fields::List
-          end
+          field :content_view_environment_labels, _("Content View Environments"),
+                                              Fields::List, :max_width => 300
+          field :multi_content_view_environment, _("Multi Content View Environment"), Fields::Boolean
           from :errata_counts do
             field :security, _("Security"), nil, :sets => ['ALL']
             field :bugfix, _("Bugfix"), nil, :sets => ['ALL']
@@ -46,7 +43,8 @@ module HostExtensions
       output do
         label _('Content Information') do
           from :content_facet_attributes do
-            collection :content_view_environments, _('Content view environments') do
+            field :content_view_environment_labels, _("Content View Environment Labels"), Fields::Field
+            collection :content_view_environments, _('Content View Environments') do
               from :content_view do
                 label _("Content view") do
                   field :id, _("Id")
@@ -60,6 +58,7 @@ module HostExtensions
                   field :name, _("Name")
                 end
               end
+            field :label, _("Label")
             end
 
             label _("Content Source") do