Followup to ManageIQ#1663: quadicon and dashboard fix

zeari · Aug 20, 2017 · a504165 · a504165
1 parent f3c6e7c
commit a504165
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 2 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -91,7 +91,8 @@ def pp_choices
       :miq_template    => true,
       :physical_server => true,
       :storage         => true,
-      :vm              => true
+      :vm              => true,
+      :ems_container   => true
     },
     :views     => { # List view setting, by resource type
       :authkeypaircloud                         => "list",

diff --git a/app/controllers/configuration_controller.rb b/app/controllers/configuration_controller.rb
@@ -547,6 +547,7 @@ def get_form_vars
     when "ui_1"                                               # Visual Settings tab
       @edit[:new][:quadicons][:ems] = params[:quadicons_ems] == "true" if params[:quadicons_ems]
       @edit[:new][:quadicons][:ems_cloud] = params[:quadicons_ems_cloud] == "true" if params[:quadicons_ems_cloud]
+      @edit[:new][:quadicons][:ems_container] = params[:quadicons_ems_container] == "true" if params[:quadicons_ems_container]
       @edit[:new][:quadicons][:host] = params[:quadicons_host] == "true" if params[:quadicons_host]
       @edit[:new][:quadicons][:vm] = params[:quadicons_vm] == "true" if params[:quadicons_vm]
       @edit[:new][:quadicons][:physical_server] = params[:quadicons_physical_server] == "true" if params[:quadicons_physical_server]

diff --git a/app/helpers/quadicon_helper.rb b/app/helpers/quadicon_helper.rb
@@ -558,11 +558,21 @@ def render_ext_management_system_quadicon(item, options)
       item_count = case item
                    when EmsPhysicalInfra then item.physical_servers.size
                    when EmsCloud         then item.total_vms
+                   when ::ManageIQ::Providers::ContainerManager then item.containers.size
                    else
                      item.hosts.size
                    end
       output << flobj_p_simple("a72", item_count)
       output << flobj_p_simple("b72", item.total_miq_templates) if item.kind_of?(EmsCloud)
+
+      if item.kind_of?(::ManageIQ::Providers::ContainerManager)
+        if item.enabled?
+          output << flobj_img_simple("svg/currentstate-on.svg", "b72")
+        else
+          output << flobj_img_simple("svg/currentstate-paused.svg", "b72")
+        end
+      end
+
       output << flobj_img_simple("svg/vendor-#{h(item.image_name)}.svg", "c72")
       output << flobj_img_simple(img_for_auth_status(item), "d72")
       output << flobj_img_simple('100/shield.png', "g72") unless item.get_policies.empty?

diff --git a/app/views/configuration/_ui_1.html.haml b/app/views/configuration/_ui_1.html.haml
@@ -15,6 +15,7 @@
           -# Host Item is commented (condition set as false) until we have host item quads
           - [[role_allows?(:feature => "ems_infra_show_list"), ui_lookup(:table => "ems_infra"),          "ems"],
              [role_allows?(:feature => "ems_cloud_show_list"), ui_lookup(:table => "ems_cloud"),          "ems_cloud"],
+             [role_allows?(:feature => "ems_container_show_list"), ui_lookup(:table => "ems_container"),  "ems_container"],
              [role_allows?(:feature => "host_show_list"),      _("Host"),                                 "host"],
              [role_allows?(:feature => "storage_show_list"),   ui_lookup(:table => "storages"),           "storage"],
              [true,                                           _("VM"),                                   "vm"],

diff --git a/app/views/ems_container/_show_dashboard.html.haml b/app/views/ems_container/_show_dashboard.html.haml
@@ -2,7 +2,7 @@
   = render :partial => "layouts/flash_msg"
   .row.row-tile-pf
     .col-xs-12.col-sm-12.col-md-2
-      .card-pf.card-pf-accented.card-pf-aggregate-status.provider-status-card
+      .card-pf.card-pf-accented.card-pf-aggregate-status.provider-status-card{"ng-if" => "isSingleProvider"}
         %h2.card-pf-title
           %img.provider-icon-small{"ng-src" =>"{{providerTypeIconImage}}"}
           {{providerTypeName}}