Redmine 1.3 and 2.0 compatible routes; file cleanup

planio-gmbh · Jun 6, 2012 · 42cefa6 · 42cefa6
1 parent a9049f3
commit 42cefa6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 32 deletions.
diff --git a/config/routes.rb b/config/routes.rb
@@ -1,3 +1,12 @@
-RedmineApp::Application.routes.draw do
-  get 'attachments/download_inline/:id/:filename', :controller => 'attachments', :action => 'download_inline', :id => /\d+/, :filename => /.*/
+if Gem::Version.new("3.0") > Gem::Version.new(Rails.version) then
+  #Redmine 1.x
+  ActionController::Routing::Routes.draw do |map|
+    map.connect 'attachments/download_inline/:id/:filename', :controller => 'attachments', :action => 'download_inline', :id => /\d+/, :filename => /.*/
+  end
+
+else
+  #Redmine 2.x
+  RedmineApp::Application.routes.draw do
+    get 'attachments/download_inline/:id/:filename', :controller => 'attachments', :action => 'download_inline', :id => /\d+/, :filename => /.*/
+  end
 end
diff --git a/lang/en.yml b/lang/en.yml
diff --git a/lib/attachments_controller_patch.rb b/lib/attachments_controller_patch.rb