Merge pull request #4525 from h-kataria/http_proxy_info_on_rhn_screen

Added HTTP Proxy info on RHN screen
ManageIQ · Aug 22, 2018 · a60e120 · a60e120
2 parents 4ef4764 + efa0757
commit a60e120
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/app/controllers/ops_controller/settings/rhn.rb b/app/controllers/ops_controller/settings/rhn.rb
@@ -90,14 +90,15 @@ def rhn_subscription
     db = MiqDatabase.first
     username, = db.auth_user_pwd(:registration)
     MiqHashStruct.new(
-      :registered        => !username.blank?,
-      :registration_type => db.registration_type,
-      :user_name         => username,
-      :server            => db.registration_server,
-      :company_name      => db.registration_organization_name,
-      :subscription      => rhn_subscription_map[db.registration_type] || 'None',
-      :update_repo_name  => db.update_repo_name,
-      :version_available => db.cfme_version_available
+      :registered                     => !username.blank?,
+      :registration_type              => db.registration_type,
+      :user_name                      => username,
+      :server                         => db.registration_server,
+      :company_name                   => db.registration_organization_name,
+      :subscription                   => rhn_subscription_map[db.registration_type] || 'None',
+      :update_repo_name               => db.update_repo_name,
+      :version_available              => db.cfme_version_available,
+      :registration_http_proxy_server => db.registration_http_proxy_server
     )
   end
 

diff --git a/app/views/ops/rhn/_info_subscribed.html.haml b/app/views/ops/rhn/_info_subscribed.html.haml
@@ -33,6 +33,12 @@
     .col-md-10
       %p.form-control-static
         = @customer.update_repo_name
+  .form-group
+    %label.control-label.col-md-2
+      = _("HTTP Proxy")
+    .col-md-10
+      %p.form-control-static
+        = @customer.registration_http_proxy_server.presence || _("Not Available")
 
 -#
   to be enabled later