Add redirect to Tagging page and back

ManageIQ · Dec 12, 2019 · cb7787d · cb7787d
1 parent ddd5db2
commit cb7787d
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 2 deletions.
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -1977,7 +1977,7 @@ def assert_rbac(klass, ids)
   end
 
   def previous_breadcrumb_url
-    @breadcrumbs[-2][:url]
+    url_for_only_path
   end
   helper_method(:previous_breadcrumb_url)
 

diff --git a/app/controllers/pxe_controller.rb b/app/controllers/pxe_controller.rb
@@ -12,6 +12,7 @@ class PxeController < ApplicationController
 
   include Mixins::GenericSessionMixin
   include Mixins::BreadcrumbsMixin
+  include Mixins::GenericShowMixin
 
   PXE_X_BUTTON_ALLOWED_ACTIONS = {
     'pxe_image_edit'                => :pxe_image_edit,
@@ -22,6 +23,7 @@ class PxeController < ApplicationController
     'pxe_server_edit'               => :pxe_server_edit,
     'pxe_server_delete'             => :pxe_server_delete,
     'pxe_server_refresh'            => :pxe_server_refresh,
+    'pxe_server_tag'                => :pxe_server_tags_edit,
     'pxe_wimg_edit'                 => :pxe_wimg_edit,
     'iso_datastore_new'             => :iso_datastore_new,
     'iso_datastore_refresh'         => :iso_datastore_refresh,
@@ -37,6 +39,15 @@ def x_button
     generic_x_button(PXE_X_BUTTON_ALLOWED_ACTIONS)
   end
 
+  # Edit user or group tags
+  def pxe_server_tags_edit
+    tag("PxeServer")
+  end
+
+  def previous_breadcrumb_url
+    url_for_only_path(:action => @lastaction)
+  end
+
   def accordion_select
     super(true)
   end

diff --git a/app/helpers/application_helper/toolbar/pxe_server_center.rb b/app/helpers/application_helper/toolbar/pxe_server_center.rb
@@ -28,4 +28,19 @@ class ApplicationHelper::Toolbar::PxeServerCenter < ApplicationHelper::Toolbar::
       ]
     ),
   ])
+  button_group('pxe_server_policy', [
+    select(
+      :pxe_server_policy_choice,
+      nil,
+      t = N_('Policy'),
+      t,
+      :items => [
+        button(
+          :pxe_server_tag,
+          'pficon pficon-edit fa-lg',
+          N_('Edit Tags for this Pxe Server'),
+          N_('Edit Tags')),
+      ]
+    ),
+  ])
 end
diff --git a/config/routes.rb b/config/routes.rb
@@ -288,7 +288,8 @@
     :catalog                  => {
       :get  => %w(
         catalog_item_form_fields
-        copy_catalog
+
+copy_catalog
         download_data
         explorer
         ot_edit
@@ -2694,6 +2695,7 @@
     :pxe                      => {
       :get  => %w(
         explorer
+        tagging_edit
       ),
       :post => %w(
         accordion_select
@@ -2714,6 +2716,8 @@
         pxe_wimg_edit
         pxe_wimg_form_field_changed
         reload
+        tag_edit_form_field_changed
+        tagging_edit
         template_create_update
         template_form_field_changed
         template_list