Wrapper for accept_api_auth in Redmine < 1.2

snaewe · Aug 3, 2011 · 693830e · 693830e
1 parent 6dff0aa
commit 693830e
Show file tree

Hide file tree

Showing 15 changed files with 43 additions and 39 deletions.
diff --git a/app/controllers/mylyn_connector/application_controller.rb b/app/controllers/mylyn_connector/application_controller.rb
@@ -0,0 +1,13 @@
+class MylynConnector::ApplicationController < ApplicationController
+  unloadable
+
+  def self.accept_api_auth(*actions)
+
+    begin
+      super *actions #Redmine>=1.2
+    rescue
+      accept_key_auth *actions #Redmine<1.2
+    end
+  end
+
+end
diff --git a/app/controllers/mylyn_connector/custom_fields_controller.rb b/app/controllers/mylyn_connector/custom_fields_controller.rb
@@ -1,11 +1,10 @@
 require File.dirname(__FILE__) + '/../../../lib/mylyn_connector'
 
-class MylynConnector::CustomFieldsController < ApplicationController
+class MylynConnector::CustomFieldsController < MylynConnector::ApplicationController
   unloadable
   include MylynConnector::Rescue::ClassMethods
 
-  accept_key_auth :all #Redmine<1.2
-  accept_api_auth :all #Redmine>=1.2
+  accept_api_auth :all
 
   skip_before_filter :verify_authenticity_token
 

diff --git a/app/controllers/mylyn_connector/information_controller.rb b/app/controllers/mylyn_connector/information_controller.rb
@@ -1,11 +1,11 @@
 require File.dirname(__FILE__) + '/../../../lib/mylyn_connector'
 
-class MylynConnector::InformationController < ApplicationController
+class MylynConnector::InformationController < MylynConnector::ApplicationController
   unloadable
   include MylynConnector::Rescue::ClassMethods
+  include MylynConnector::Version::ClassMethods
 
-  accept_key_auth :version, :token #Redmine<1.2
-  accept_api_auth :version, :token, :authtest #Redmine>=1.2
+  accept_api_auth :version, :token, :authtest
 
   skip_before_filter :verify_authenticity_token
 

diff --git a/app/controllers/mylyn_connector/issue_categories_controller.rb b/app/controllers/mylyn_connector/issue_categories_controller.rb
@@ -1,11 +1,10 @@
 require File.dirname(__FILE__) + '/../../../lib/mylyn_connector'
 
-class MylynConnector::IssueCategoriesController < ApplicationController
+class MylynConnector::IssueCategoriesController < MylynConnector::ApplicationController
   unloadable
   include MylynConnector::Rescue::ClassMethods
 
-  accept_key_auth :all #Redmine<1.2
-  accept_api_auth :all #Redmine>=1.2
+  accept_api_auth :all
 
   skip_before_filter :verify_authenticity_token
 

diff --git a/app/controllers/mylyn_connector/issue_priorities_controller.rb b/app/controllers/mylyn_connector/issue_priorities_controller.rb
@@ -1,12 +1,11 @@
 require File.dirname(__FILE__) + '/../../../lib/mylyn_connector'
 
-class MylynConnector::IssuePrioritiesController < ApplicationController
+class MylynConnector::IssuePrioritiesController < MylynConnector::ApplicationController
   unloadable
   include MylynConnector::Rescue::ClassMethods
   include MylynConnector::Version::ClassMethods
 
-  accept_key_auth :all #Redmine<1.2
-  accept_api_auth :all #Redmine>=1.2
+  accept_api_auth :all
 
   skip_before_filter :verify_authenticity_token
 

diff --git a/app/controllers/mylyn_connector/issue_status_controller.rb b/app/controllers/mylyn_connector/issue_status_controller.rb
@@ -1,11 +1,10 @@
 require File.dirname(__FILE__) + '/../../../lib/mylyn_connector'
 
-class MylynConnector::IssueStatusController < ApplicationController
+class MylynConnector::IssueStatusController < MylynConnector::ApplicationController
   unloadable
   include MylynConnector::Rescue::ClassMethods
 
-  accept_key_auth :all #Redmine<1.2
-  accept_api_auth :all #Redmine>=1.2
+  accept_api_auth :all
 
   skip_before_filter :verify_authenticity_token
 

diff --git a/app/controllers/mylyn_connector/issues_controller.rb b/app/controllers/mylyn_connector/issues_controller.rb
@@ -1,11 +1,10 @@
 require File.dirname(__FILE__) + '/../../../lib/mylyn_connector'
 
-class MylynConnector::IssuesController < ApplicationController
+class MylynConnector::IssuesController < MylynConnector::ApplicationController
   unloadable
   include MylynConnector::Rescue::ClassMethods
 
-  accept_key_auth :show, :index, :list, :updated_since #Redmine<1.2
-  accept_api_auth :show, :index, :list, :updated_since #Redmine>=1.2
+  accept_api_auth :show, :index, :list, :updated_since
 
   skip_before_filter :verify_authenticity_token
 

diff --git a/app/controllers/mylyn_connector/projects_controller.rb b/app/controllers/mylyn_connector/projects_controller.rb
@@ -1,11 +1,10 @@
 require File.dirname(__FILE__) + '/../../../lib/mylyn_connector'
 
-class MylynConnector::ProjectsController < ApplicationController
+class MylynConnector::ProjectsController < MylynConnector::ApplicationController
   unloadable
   include MylynConnector::Rescue::ClassMethods
 
-  accept_key_auth :all #Redmine<1.2
-  accept_api_auth :all #Redmine>=1.2
+  accept_api_auth :all
 
   skip_before_filter :verify_authenticity_token
 

diff --git a/app/controllers/mylyn_connector/queries_controller.rb b/app/controllers/mylyn_connector/queries_controller.rb
@@ -1,11 +1,10 @@
 require File.dirname(__FILE__) + '/../../../lib/mylyn_connector'
 
-class MylynConnector::QueriesController < ApplicationController
+class MylynConnector::QueriesController < MylynConnector::ApplicationController
   unloadable
   include MylynConnector::Rescue::ClassMethods
 
-  accept_key_auth :all #Redmine<1.2
-  accept_api_auth :all #Redmine>=1.2
+  accept_api_auth :all
 
   skip_before_filter :verify_authenticity_token
 

diff --git a/app/controllers/mylyn_connector/settings_controller.rb b/app/controllers/mylyn_connector/settings_controller.rb
@@ -1,11 +1,10 @@
 require File.dirname(__FILE__) + '/../../../lib/mylyn_connector'
 
-class MylynConnector::SettingsController < ApplicationController
+class MylynConnector::SettingsController < MylynConnector::ApplicationController
   unloadable
   include MylynConnector::Rescue::ClassMethods
 
-  accept_key_auth :all #Redmine<1.2
-  accept_api_auth :all #Redmine>=1.2
+  accept_api_auth :all
 
   skip_before_filter :verify_authenticity_token
 

diff --git a/app/controllers/mylyn_connector/time_entry_activities_controller.rb b/app/controllers/mylyn_connector/time_entry_activities_controller.rb
@@ -1,12 +1,11 @@
 require File.dirname(__FILE__) + '/../../../lib/mylyn_connector'
 
-class MylynConnector::TimeEntryActivitiesController < ApplicationController
+class MylynConnector::TimeEntryActivitiesController < MylynConnector::ApplicationController
   unloadable
   include MylynConnector::Rescue::ClassMethods
   include MylynConnector::Version::ClassMethods
 
-  accept_key_auth :all #Redmine<1.2
-  accept_api_auth :all #Redmine>=1.2
+  accept_api_auth :all
 
   skip_before_filter :verify_authenticity_token
 

diff --git a/app/controllers/mylyn_connector/trackers_controller.rb b/app/controllers/mylyn_connector/trackers_controller.rb
@@ -1,11 +1,10 @@
 require File.dirname(__FILE__) + '/../../../lib/mylyn_connector'
 
-class MylynConnector::TrackersController < ApplicationController
+class MylynConnector::TrackersController < MylynConnector::ApplicationController
   unloadable
   include MylynConnector::Rescue::ClassMethods
 
-  accept_key_auth :all #Redmine<1.2
-  accept_api_auth :all #Redmine>=1.2
+  accept_api_auth :all
 
   skip_before_filter :verify_authenticity_token
 

diff --git a/app/controllers/mylyn_connector/users_controller.rb b/app/controllers/mylyn_connector/users_controller.rb
@@ -1,12 +1,11 @@
 require File.dirname(__FILE__) + '/../../../lib/mylyn_connector'
 
-class MylynConnector::UsersController < ApplicationController
+class MylynConnector::UsersController < MylynConnector::ApplicationController
   unloadable
   include MylynConnector::Rescue::ClassMethods
   include MylynConnector::Version::ClassMethods
 
-  accept_key_auth :all #Redmine<1.2
-  accept_api_auth :all #Redmine>=1.2
+  accept_api_auth :all
 
   skip_before_filter :verify_authenticity_token
 

diff --git a/app/controllers/mylyn_connector/versions_controller.rb b/app/controllers/mylyn_connector/versions_controller.rb
@@ -1,11 +1,10 @@
 require File.dirname(__FILE__) + '/../../../lib/mylyn_connector'
 
-class MylynConnector::VersionsController < ApplicationController
+class MylynConnector::VersionsController < MylynConnector::ApplicationController
   unloadable
   include MylynConnector::Rescue::ClassMethods
 
-  accept_key_auth :all #Redmine<1.2
-  accept_api_auth :all #Redmine>=1.2
+  accept_api_auth :all
 
   skip_before_filter :verify_authenticity_token
 

diff --git a/release-note.txt b/release-note.txt
@@ -1,3 +1,6 @@
+Version 2.7.4
+  chg   : Wrapper for accept_api_auth in Redmine < 1.2
+
 Version 2.7.3
   chg   : Fixtures adapted for Redmine 1.2
   add   : Support for accept_api_auth (new in Redmine 1.2)