Make queries resources fully conform to common behavior (removed additonal routes...

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7657 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index beff2fef6c8c6ee2ba73d5dfd9f88819a52dc988..2fc163e903bb5e4ade4051508c3e6e4a38d13744 100644 (file)
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -1,7 +1,7 @@
 <div class="contextual">
 <% if !@query.new_record? && @query.editable_by?(User.current) %>
-  <%= link_to l(:button_edit), @query.project_id ? edit_project_query_path(:project_id => @query.project, :id => @query) : edit_query_path(@query), :class => 'icon icon-edit' %>
-  <%= link_to l(:button_delete), @query.project_id ? project_query_path(:project_id => @query.project, :id => @query) : query_path(@query), :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del' %>
+  <%= link_to l(:button_edit), edit_query_path(@query), :class => 'icon icon-edit' %>
+  <%= link_to l(:button_delete), query_path(@query), :confirm => l(:text_are_you_sure), :method => :delete, :class => 'icon icon-del' %>
 <% end %>
 </div>
 
@@ -38,7 +38,7 @@
     <%= link_to_function l(:button_apply), 'submit_query_form("query_form")', :class => 'icon icon-checked' %>
     <%= link_to l(:button_clear), { :set_filter => 1, :project_id => @project }, :class => 'icon icon-reload'  %>
     <% if @query.new_record? && User.current.allowed_to?(:save_queries, @project, :global => true) %>
-        <%= link_to_function l(:button_save), "$('query_form').action='#{ @project ? new_project_query_path(@project) : new_query_path }'; submit_query_form('query_form')", :class => 'icon icon-save' %>
+        <%= link_to_function l(:button_save), "$('query_form').action='#{ @project ? new_project_query_path : new_query_path }'; submit_query_form('query_form')", :class => 'icon icon-save' %>
     <% end %>
     </p>
 <% end %>

diff --git a/app/views/queries/edit.html.erb b/app/views/queries/edit.html.erb
index 46a530f1681ae56bcf8cc79f6bb7e3e3884f81ae..610ae01c3e7c12d647483474a23b7ff7ec4e08bd 100644 (file)
--- a/app/views/queries/edit.html.erb
+++ b/app/views/queries/edit.html.erb
@@ -1,6 +1,6 @@
 <h2><%= l(:label_query) %></h2>
 
-<% form_tag(@query.project_id ? project_query_path(:project_id => @query.project, :id => @query) : query_path(@query), :onsubmit => 'selectAllOptions("selected_columns");', :method => :put) do %>
+<% form_tag(query_path(@query), :onsubmit => 'selectAllOptions("selected_columns");', :method => :put) do %>
   <%= render :partial => 'form', :locals => {:query => @query} %>
   <%= submit_tag l(:button_save) %>
 <% end %>

diff --git a/app/views/queries/new.html.erb b/app/views/queries/new.html.erb
index b5809fb88b3301a12ee656376aee9dc03e9493cb..2ec7f66009394929f2e470b6512e584f0f256477 100644 (file)
--- a/app/views/queries/new.html.erb
+++ b/app/views/queries/new.html.erb
@@ -1,6 +1,6 @@
 <h2><%= l(:label_query_new) %></h2>
 
-<% form_tag(@project ? project_queries_path(:project_id => @project) : queries_path, :onsubmit => 'selectAllOptions("selected_columns");') do %>
+<% form_tag(@project ? project_queries_path : queries_path, :onsubmit => 'selectAllOptions("selected_columns");') do %>
   <%= render :partial => 'form', :locals => {:query => @query} %>
   <%= submit_tag l(:button_save) %>
 <% end %>

diff --git a/config/routes.rb b/config/routes.rb
index 8f0f39e488a17c13e5c91c286e56e017f7284035..f5814e0accd45b295712f82c7b2ff737e44a3ac9 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -156,7 +156,7 @@ ActionController::Routing::Routes.draw do |map|
     project.resources :versions, :shallow => true, :collection => {:close_completed => :put}, :member => {:status_by => :post}
     project.resources :news, :shallow => true
     project.resources :time_entries, :controller => 'timelog', :path_prefix => 'projects/:project_id'
-    project.resources :queries, :except => [:show]
+    project.resources :queries, :only => [:new, :create]
 
     project.wiki_start_page 'wiki', :controller => 'wiki', :action => 'show', :conditions => {:method => :get}
     project.wiki_index 'wiki/index', :controller => 'wiki', :action => 'index', :conditions => {:method => :get}

diff --git a/test/integration/routing_test.rb b/test/integration/routing_test.rb
index cfdc5389ebd474de6840aecedd32df68f5f14463..1f978c36e85c86257779c7e475a08aa77166f23c 100644 (file)
--- a/test/integration/routing_test.rb
+++ b/test/integration/routing_test.rb
@@ -222,13 +222,10 @@ class RoutingTest < ActionController::IntegrationTest
     should_route :post, "/projects/redmine/queries", :controller => 'queries', :action => 'create', :project_id => 'redmine'
 
     should_route :get, "/queries/1/edit", :controller => 'queries', :action => 'edit', :id => '1'
-    should_route :get, "/projects/redmine/queries/1/edit", :controller => 'queries', :action => 'edit', :id => '1', :project_id => 'redmine'
 
     should_route :put, "/queries/1", :controller => 'queries', :action => 'update', :id => '1'
-    should_route :put, "/projects/redmine/queries/1", :controller => 'queries', :action => 'update', :id => '1', :project_id => 'redmine'
 
     should_route :delete, "/queries/1", :controller => 'queries', :action => 'destroy', :id => '1'
-    should_route :delete, "/projects/redmine/queries/1", :controller => 'queries', :action => 'destroy', :id => '1', :project_id => 'redmine'
   end
 
   context "repositories" do