Merge pull request #9168 from GilbertCherrie/fix_output_page_toolbar

Fix output page toolbar bugs

Author: jeffibm

app/controllers/ansible_repository_controller.rb

@@ -48,10 +48,14 @@ def button
         page.replace("gtl_div", :partial => "layouts/gtl")
       end
     when "ansible_repository_reload" # repository reload
-      show
-      render :update do |page|
-        page << javascript_prologue
-        page.replace("main_div", :template => "ansible_repository/show")
+      if @display == "output"
+        show
+        show_output
+        @display = "output" # reset @display back to "output" after show changes it to "main"
+        render_update("output_div", "output", true)
+      else
+        show
+        render_update("main_div", "show", false)
       end
     when "ansible_repository_tag" # tag repositories
       tag(self.class.model)
@@ -146,6 +150,17 @@ def tag_edit_form_field_changed
 
   private
 
+  def render_update(div_id, partial, is_partial)
+    render :update do |page|
+      page << javascript_prologue
+      if is_partial
+        page.replace(div_id, :partial => "ansible_repository/#{partial}")
+      else
+        page.replace(div_id, :template => "ansible_repository/#{partial}")
+      end
+    end
+  end
+
   def textual_group_list
     [%i[properties relationships options smart_management]]
   end

app/controllers/application_controller/tags.rb

@@ -3,17 +3,17 @@ module ApplicationController::Tags
 
   def nested_page?
     (@display == "repositories" && params[:controller] == "ansible_credential") ||
-    (@display == "playbooks" && params[:controller] == "ansible_repository") ||
-    (@display == "repositories" && params[:controller] == "workflow_credential") ||
-    (@display == "workflows" && params[:controller] == "workflow_repository")
+      (@display == "playbooks" && params[:controller] == "ansible_repository") ||
+      (@display == "repositories" && params[:controller] == "workflow_credential") ||
+      (@display == "workflows" && params[:controller] == "workflow_repository")
   end
 
   # Edit user, group or tenant tags
   def tagging_edit(db = nil, assert = true)
     if nested_page?
       assert_privileges("#{controller_for_common_methods}_tag")
-    else
-      assert_privileges("#{@display && @display != "main" ? @display.singularize : controller_for_common_methods}_tag") if assert
+    elsif assert
+      assert_privileges("#{@display && @display != "main" && @display != "output" ? @display.singularize : controller_for_common_methods}_tag")
     end
     @explorer = true if request.xml_http_request? # Ajax request means in explorer
 

app/controllers/workflow_repository_controller.rb

@@ -53,10 +53,14 @@ def button
         page.replace("gtl_div", :partial => "layouts/gtl")
       end
     when "workflow_repository_reload" # repository reload
-      show
-      render :update do |page|
-        page << javascript_prologue
-        page.replace("main_div", :template => "workflow_repository/show")
+      if @display == "output"
+        show
+        show_output
+        @display = "output" # reset @display back to "output" after show changes it to "main"
+        render_update("output_div", "output", true)
+      else
+        show
+        render_update("main_div", "show", false)
       end
     when "ansible_repository_tag" # tag repositories
       tag(self.class.model)
@@ -146,6 +150,17 @@ def download_summary_pdf
 
   private
 
+  def render_update(div_id, partial, is_partial)
+    render :update do |page|
+      page << javascript_prologue
+      if is_partial
+        page.replace(div_id, :partial => "workflow_repository/#{partial}")
+      else
+        page.replace(div_id, :template => "workflow_repository/#{partial}")
+      end
+    end
+  end
+
   def textual_group_list
     [%i[properties relationships options smart_management]]
   end

app/helpers/application_helper/toolbar/ansible_repository_center.rb

@@ -22,7 +22,6 @@ class ApplicationHelper::Toolbar::AnsibleRepositoryCenter < ApplicationHelper::T
           N_('Refresh this Repository'),
           N_('Refresh this Repository'),
           :klass   => ApplicationHelper::Button::EmbeddedAnsible,
-          :url     => "repository_refresh",
           :confirm => N_("Refresh this Repository?"),
           :enabled => true,
         ),

app/helpers/application_helper/toolbar/workflow_repository_center.rb

@@ -23,7 +23,6 @@ class ApplicationHelper::Toolbar::WorkflowRepositoryCenter < ApplicationHelper::
                        N_('Refresh this Repository'),
                        N_('Refresh this Repository'),
                        :klass   => ApplicationHelper::Button::EmbeddedWorkflow,
-                       :url     => "repository_refresh",
                        :confirm => N_("Refresh this Repository?"),
                        :enabled => true,
                      ),

app/views/ansible_repository/_output.html.haml

@@ -1,5 +1,7 @@
-- if @record.last_update_error.nil?
-  = _('No output for the last refresh.')
-- else
-  %pre
-    = @record.last_update_error
+#flash_msg_div
+#output_div
+  - if @record.last_update_error.nil?
+    = _('No output for the last refresh.')
+  - else
+    %pre
+      = @record.last_update_error

app/views/workflow_repository/_output.html.haml

@@ -1,5 +1,7 @@
-- if @record.last_update_error.nil?
-  = _('No output for the last refresh.')
-- else
-  %pre
-    = @record.last_update_error
+#flash_msg_div
+#output_div
+  - if @record.last_update_error.nil?
+    = _('No output for the last refresh.')
+  - else
+    %pre
+      = @record.last_update_error