Named routed for RSS/API keys (#20997).

git-svn-id: http://svn.redmine.org/redmine/trunk@14677 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/my/_sidebar.html.erb b/app/views/my/_sidebar.html.erb
index 7f0aefa1695ace4cb45bf17e5604ede8b1275031..e372425aaa1cb765f0a83c8c48acf82b936d875c 100644 (file)
--- a/app/views/my/_sidebar.html.erb
+++ b/app/views/my/_sidebar.html.erb
@@ -15,13 +15,13 @@
 <% else %>
 <%= l(:label_missing_feeds_access_key) %>
 <% end %>
-(<%= link_to l(:button_reset), {:action => 'reset_rss_key'}, :method => :post %>)
+(<%= link_to l(:button_reset), my_rss_key_path, :method => :post %>)
 </p>
 
 <% if Setting.rest_api_enabled? %>
 <h4><%= l(:label_api_access_key) %></h4>
 <div>
-  <%= link_to l(:button_show), {:action => 'show_api_key'}, :remote => true %>
+  <%= link_to l(:button_show), my_api_key_path, :remote => true %>
   <pre id='api-access-key' class='autoscroll'></pre>
 </div>
 <%= javascript_tag("$('#api-access-key').hide();") %>
@@ -31,6 +31,6 @@
 <% else %>
 <%= l(:label_missing_api_access_key) %>
 <% end %>
-(<%= link_to l(:button_reset), {:action => 'reset_api_key'}, :method => :post %>)
+(<%= link_to l(:button_reset), my_api_key_path, :method => :post %>)
 </p>
 <% end %>

diff --git a/config/routes.rb b/config/routes.rb
index 532546fdaf77a580441666444c6e46a6d8b5576b..d7ddac190a3fcc881979dad46a6aec2031de21f2 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -72,9 +72,9 @@ Rails.application.routes.draw do
   match 'my/account/destroy', :controller => 'my', :action => 'destroy', :via => [:get, :post]
   match 'my/page', :controller => 'my', :action => 'page', :via => :get
   match 'my', :controller => 'my', :action => 'index', :via => :get # Redirects to my/page
-  match 'my/reset_rss_key', :controller => 'my', :action => 'reset_rss_key', :via => :post
-  match 'my/reset_api_key', :controller => 'my', :action => 'reset_api_key', :via => :post
-  match 'my/api_key', :controller => 'my', :action => 'show_api_key', :via => :get
+  get 'my/api_key', :to => 'my#show_api_key', :as => 'my_api_key'
+  post 'my/api_key', :to => 'my#reset_api_key'
+  post 'my/rss_key', :to => 'my#reset_rss_key', :as => 'my_rss_key'
   match 'my/password', :controller => 'my', :action => 'password', :via => [:get, :post]
   match 'my/page_layout', :controller => 'my', :action => 'page_layout', :via => :get
   match 'my/add_block', :controller => 'my', :action => 'add_block', :via => :post

diff --git a/test/integration/routing/my_test.rb b/test/integration/routing/my_test.rb
index 585764a0bc0909a98540652cb61d51d19c14c80c..f10c107a517613e52e35f4bf868235f16aa6db48 100644 (file)
--- a/test/integration/routing/my_test.rb
+++ b/test/integration/routing/my_test.rb
@@ -28,9 +28,9 @@ class RoutingMyTest < Redmine::RoutingTest
     should_route 'GET /my/page' => 'my#page'
     should_route 'GET /my' => 'my#index'
 
-    should_route 'POST /my/reset_rss_key' => 'my#reset_rss_key'
-    should_route 'POST /my/reset_api_key' => 'my#reset_api_key'
     should_route 'GET /my/api_key' => 'my#show_api_key'
+    should_route 'POST /my/api_key' => 'my#reset_api_key'
+    should_route 'POST /my/rss_key' => 'my#reset_rss_key'
 
     should_route 'GET /my/password' => 'my#password'
     should_route 'POST /my/password' => 'my#password'