Merge pull request #3118 from abonas/removeMiddlewareDefaultSettings

Remove middleware default view settings configuration
ManageIQ · Dec 22, 2017 · 2dcb6d9 · 2dcb6d9
2 parents a8f0df6 + 36ddf18
commit 2dcb6d9
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 25 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -146,15 +146,8 @@ def pp_choices
       :manageiq_providers_inframanager          => "grid",
       :manageiq_providers_inframanager_vm       => "grid",
       :manageiq_providers_inframanager_template => "list",
-      :manageiq_providers_middlewaremanager     => "grid",
       :manageiq_providers_physicalinframanager  => "list",
       :manageiq_providers_storagemanager        => "list",
-      :middlewaredatasource                     => "list",
-      :middlewaredeployment                     => "list",
-      :middlewaredomain                         => "list",
-      :middlewaremessaging                      => "list",
-      :middlewareserver                         => "list",
-      :middlewareservergroup                    => "list",
       :miqaction                                => "list",
       :miqaeclass                               => "list",
       :miqaeinstance                            => "list",

diff --git a/app/views/configuration/_ui_2.html.haml b/app/views/configuration/_ui_2.html.haml
@@ -78,23 +78,6 @@
               :javascript
                 miqInitBootstrapSwitch("display_vms", "#{url}")
       .col-md-12.col-lg-6
-        - if has_any_role?(%w(ems_middleware_show_list middleware_server_show_list middleware_deployment_show_list middleware_datasource_show_list middleware_domain_show_list middleware_server_group_show_list middleware_messaging_show_list))
-          %fieldset
-            %h3
-              = _('Middleware')
-            - {:manageiq_providers_middlewaremanager => ["ems_middleware_show_list",           _('Middleware Providers')],
-               :middlewareserver                     => ["middleware_server_show_list",        _('Middleware Servers')],
-               :middlewaredeployment                 => ["middleware_deployment_show_list",    _('Middleware Deployments')],
-               :middlewaredatasource                 => ["middleware_datasource_show_list",    _('Middleware Datasources')],
-               :middlewaredomain                     => ["middleware_domain_show_list",        _('Middleware Domains')],
-               :middlewareservergroup                => ["middleware_server_groups_show_list", _('Middleware Server Groups')],
-               :middlewaremessaging                  => ["middleware_messaging_show_list",     _('Middleware Messaging')]}.each do |resource, (feature, view_name)|
-              - if role_allows?(:feature => feature)
-                .form-group
-                  %label.col-md-3.control-label
-                    = view_name
-                  .col-md-8
-                    %ul.list-inline= render_view_buttons(resource, @edit[:new][:views][resource])
         - if has_any_role?(%w(ems_cloud_show_list availability_zone_show_list host_aggregate_show_list cloud_tenant_show_list flavor_show_list instances_accord instances_filter_accord images_filter_accord orchestration_stack_show_list cloud_volume_show_list cloud_volume_snapshot_show_list cloud_object_store_container_show_list))
           %fieldset
             %h3
@@ -155,6 +138,6 @@
                   %label.col-md-3.control-label
                     = view_name
                   .col-md-8
-                    %ul.list-inline= render_view_buttons(resource, @edit[:new][:views][resource])  
+                    %ul.list-inline= render_view_buttons(resource, @edit[:new][:views][resource])
 
     = render :partial => "/layouts/form_buttons"