Move up and deduplicate the flash_msg_div on the Settings/Region screen

ManageIQ · Oct 26, 2017 · e084120 · e084120
1 parent c7e29dc
commit e084120
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 5 deletions.
diff --git a/app/views/ops/_all_tabs.html.haml b/app/views/ops/_all_tabs.html.haml
@@ -46,6 +46,7 @@
           #settings_list
             = render :partial => "settings_list_tab"
       - else
+        = render(:partial => "layouts/flash_msg")
         %ul.nav.nav-tabs
           = miq_tab_header("settings_details", @sb[:active_tab]) do
             = _("Details")
@@ -63,7 +64,6 @@
           = miq_tab_content("settings_cu_collection", @sb[:active_tab]) do
             = render :partial => "settings_cu_collection_tab"
           = miq_tab_content("settings_tags", @sb[:active_tab]) do
-            = render(:partial => "layouts/flash_msg")
             #ops_tags_subtabs
               %ul.nav.nav-tabs.nav-tabs-pf{:style => 'font-size: 12px'}
                 = miq_tab_header("settings_co_categories", @sb[:active_subtab]) do

diff --git a/app/views/ops/_settings_cu_collection_tab.html.haml b/app/views/ops/_settings_cu_collection_tab.html.haml
@@ -5,7 +5,6 @@
              :id     => "config_form",
              :class  => "form-horizontal",
              :method => :post) do
-    = render :partial => "layouts/flash_msg"
     .row
       .col-md-12.col-lg-6
         %fieldset

diff --git a/app/views/ops/_settings_details_tab.html.haml b/app/views/ops/_settings_details_tab.html.haml
@@ -1,6 +1,5 @@
 - if @sb[:active_tab] == "settings_details"
   - if super_admin_user?
-    = render :partial => "layouts/flash_msg"
     - region = MiqRegion.my_region
     - if @edit
       - url = url_for_only_path(:action => 'region_form_field_changed', :id => (region.id || "new"))

diff --git a/app/views/ops/_settings_replication_tab.html.haml b/app/views/ops/_settings_replication_tab.html.haml
@@ -4,7 +4,6 @@
   %form.form-horizontal#form_div{"name"          => "angularForm",
                                  "ng-controller" => "pglogicalReplicationFormController",
                                  "ng-show"       => "afterGet"}
-    = render :partial => "layouts/flash_msg"
     .form-group{"ng-class" => "{'has-error': angularForm.subscriptions.$invalid}"}
       %label.col-md-2.control-label
         = _('Type')

diff --git a/app/views/ops/_settings_rhn_tab.html.haml b/app/views/ops/_settings_rhn_tab.html.haml
@@ -6,7 +6,6 @@
     @updates[]  -- update information for individual servers passed to the server_table partial
 
 - if @sb[:active_tab] == "settings_rhn"
-  = render :partial => 'layouts/flash_msg'
 
   %h3
     Red Hat Software Updates