Merge branch 'master' into view-refactor

[redakcja.git] / redmine / redmine_publications / routes.rb

diff --git a/redmine/redmine_publications/routes.rb b/redmine/redmine_publications/routes.rb
index d1cf057..8752c69 100644 (file)
--- a/redmine/redmine_publications/routes.rb
+++ b/redmine/redmine_publications/routes.rb
@@ -6,8 +6,5 @@ connect 'publications/:action.:format',
        :controller => 'publications' 
 
 connect 'publications/:action/:pub', 
        :controller => 'publications' 
 
 connect 'publications/:action/:pub', 

-       :controller => 'publications',
-       :format => 'html'
-       
-connect 'publications/:action/:pub.:format', 
-       :controller => 'publications' 
+       :controller => 'publications', :format => 'json',
+     :pub => /[^\/?]+/