Merge pull request #9389 from GilbertCherrie/fix_tag_category_pages

Fix tag category pages

Author: Fryguy

app/controllers/ops_controller.rb

@@ -436,7 +436,7 @@ def set_active_tab(nodetype)
       case node[0]
       when "root"
         @sb[:active_tab] = "settings_details"
-        @sb[:active_subtab] = "settings_co_categories"
+        @sb[:active_subtab] = "settings_my_company_categories"
       when "z"
         @sb[:active_tab] = "settings_evm_servers"
       when "xx", "sis", "msc", "l", "lr", "ld"
@@ -512,7 +512,7 @@ def set_form_locals
           action_url = "zone_edit"
           record_id = @edit[:zone_id] ? @edit[:zone_id] : nil
         end
-      elsif @sb[:active_tab] == "settings_tags" && @sb[:active_subtab] == "settings_co_categories" && @in_a_form
+      elsif @sb[:active_tab] == "settings_tags" && @sb[:active_subtab] == "settings_my_company_categories" && @in_a_form
         action_url = "category_edit"
         record_id = @category.try(:id)
       elsif @sb[:active_tab] == "settings_tags" && @sb[:active_subtab] == "settings_label_tag_mapping" && @in_a_form
@@ -651,7 +651,7 @@ def settings_replace_right_cell(nodetype, presenter)
       presenter[:update_partials][partial_div] = r[:partial => "zone_form"]
     when "ce" # category edit
       # when editing/adding category in settings tree
-      presenter.update(:settings_co_categories, r[:partial => "category_form"])
+      presenter.update(:my_company_categories, r[:partial => "category_form"])
       @right_cell_text = if !@category
                            _("Adding a new Category")
                          else

app/controllers/ops_controller/settings/tags.rb

@@ -29,7 +29,7 @@ def category_delete
         page << javascript_prologue
         page.replace("flash_msg_div", :partial => "layouts/flash_msg")
         page << "miqScrollTop();" if @flash_array.present?
-        page.replace_html('settings_co_categories', :partial => 'settings_co_categories_tab')
+        page.replace_html('my_company_categories', :partial => 'settings_my_company_categories_tab')
       end
     else
       category.errors.each { |error| add_flash("#{error.attribute.to_s.capitalize} #{error.message}", :error) }
@@ -45,14 +45,24 @@ def cancel_category
       add_flash(_("Edit of Category \"%{name}\" was cancelled by the user") % {:name => category.name})
     end
     get_node_info(x_node)
-    replace_right_cell(:nodetype => "root")
+    render :update do |page|
+      page << javascript_prologue
+      page.replace("flash_msg_div", :partial => "layouts/flash_msg")
+      page << "miqScrollTop();" if @flash_array.present?
+      page.replace_html('my_company_categories', :partial => 'settings_my_company_categories_tab')
+    end
   end
 
   def add_category
     category = Classification.find(params[:id])
     add_flash(_("Category \"%{name}\" was added") % {:name => category.name})
     get_node_info(x_node)
-    replace_right_cell(:nodetype => "root")
+    render :update do |page|
+      page << javascript_prologue
+      page.replace("flash_msg_div", :partial => "layouts/flash_msg")
+      page << "miqScrollTop();" if @flash_array.present?
+      page.replace_html('my_company_categories', :partial => 'settings_my_company_categories_tab')
+    end
   end
 
   def save_category

app/views/ops/_all_tabs.html.haml

@@ -76,7 +76,7 @@
                     })
                   .tab-content
                     = settings_tags_content(:my_company_categories) do
-                      = render :partial => "settings_co_categories_tab"
+                      = render :partial => "settings_my_company_categories_tab"
                     = settings_tags_content(:my_company_tags) do
                       = render :partial => "settings_co_tags_tab"
                     = settings_tags_content(:import_tags) do