Fixes #25656 - Foreman redirects to logout page

theforeman · May 2, 2019 · ef73d68 · ef73d68
1 parent 5579da3
commit ef73d68
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/app/registries/menu/item.rb b/app/registries/menu/item.rb
@@ -23,7 +23,7 @@ def initialize(name, options)
     end
 
     def to_hash
-      {type: :item, name: @caption || @name, url: url} if authorized?
+      {type: :item, html_options: @html_options, name: @caption || @name, url: url} if authorized?
     end
 
     def url

diff --git a/app/registries/menu/loader.rb b/app/registries/menu/loader.rb
@@ -16,7 +16,7 @@ def self.load
                     :url_hash => {:controller => '/users', :action => 'edit', :id => Proc.new { User.current.id }}
           menu.item :logout,
                     :caption => N_('Log Out'),
-                    :html => {:method => :post},
+                    :html => {:'data-method' => :post},
                     :url_hash => {:controller => '/users', :action => 'logout'}
         end
       end

diff --git a/test/unit/menu_manager_test.rb b/test/unit/menu_manager_test.rb
@@ -51,13 +51,13 @@ def menu_hash
       :name => "User",
       :icon => "fa-icon",
       :children =>
-        [{:type => :item, :name => "Item", :url => "some url"},
-         {:type => :item, :name => "Item 2", :url => "some url"},
-         {:type => :item, :name => "Test Items", :url => "some url"}]},
+        [{:type => :item, :html_options => {}, :name => "Item", :url => "some url"},
+         {:type => :item, :html_options => {}, :name => "Item 2", :url => "some url"},
+         {:type => :item, :html_options => {}, :name => "Test Items", :url => "some url"}]},
      {:type => :sub_menu,
       :name => "User",
       :icon => "fa-icon",
-      :children => [{:type => :item, :name => "Item 3", :url => "some url"}]}]
+      :children => [{:type => :item, :html_options => {}, :name => "Item 3", :url => "some url"}]}]
   end
 
   def create_nested_menu

diff --git a/webpack/assets/javascripts/react_app/components/Layout/components/UserDropdowns.js b/webpack/assets/javascripts/react_app/components/Layout/components/UserDropdowns.js
@@ -42,6 +42,7 @@ const UserDropdowns = ({
                   onClick={() => {
                     changeActiveMenu({ title: 'User' });
                   }}
+                  {...item.html_options}
                 >
                   {__(item.name)}
                 </MenuItem>