Remove UI references to rhn_satellite registration type

https://bugzilla.redhat.com/show_bug.cgi?id=1291872
ManageIQ · Dec 21, 2015 · 7bdc705 · 7bdc705
1 parent 704d040
commit 7bdc705
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/app/views/ops/_settings_rhn_edit_tab.html.haml b/app/views/ops/_settings_rhn_edit_tab.html.haml
@@ -38,7 +38,7 @@
                     :onclick => "miqAjaxButton('#{url_for(:action => 'rhn_default_server', :id => 'rhn_edit')}');")
 
     .form-group
-      - label = @edit[:new][:register_to] == "rhn_satellite" ? _("Channel Name(s):") : _("Repository Name(s):")
+      - label = _("Repository Name(s):")
       %label.col-md-2.control-label
         = label
       .col-md-8
@@ -86,15 +86,7 @@
                           :validate_url => 'rhn_validate',
                           :validate     => true}
 
-    - if 'rhn_satellite' == @edit[:new][:register_to]
-      .form-group
-        %label.col-md-2.control-label
-          = _("Organization ID")
-        .col-md-8
-          = text_field_tag('customer_org', @edit[:new][:customer_org], :maxlength => 200,
-                           :class             => "form-control",
-                           'data-miq_observe' => url_int_jsh)
-    - elsif 'rhn_satellite6' == @edit[:new][:register_to] && !@edit[:organizations].blank?
+    - if 'rhn_satellite6' == @edit[:new][:register_to] && !@edit[:organizations].blank?
       .form-group
         %label.col-md-2.control-label
           = _("Organization")

diff --git a/app/views/ops/rhn/_info_subscribed.html.haml b/app/views/ops/rhn/_info_subscribed.html.haml
@@ -27,7 +27,7 @@
       %p.form-control-static
         = @customer.company_name
   .form-group
-    - label = @customer.registration_type == "rhn_satellite" ? _("Channel Name(s)") : _("Repository Name(s)")
+    - label = _("Repository Name(s)")
     %label.control-label.col-md-2
       = label
     .col-md-10