Merge pull request #14 from ncsuarc/account_pending

Add argument to account_pending

Merge pull request #14 from ncsuarc/account_pending
Add argument to account_pending
6b2deedb · Serge Ahranovich · 0af14640 · c46e286b · 6b2deedb
Commit 6b2deedb authored Aug 07, 2014 by Serge Ahranovich
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

app/controllers/redmine_oauth_controller.rb app/controllers/redmine_oauth_controller.rb +7 -1

No files found.
--- a/app/controllers/redmine_oauth_controller.rb
+++ b/app/controllers/redmine_oauth_controller.rb
@@ -71,7 +71,13 @@ class RedmineOauthController < AccountController
      if user.active?
        successful_authentication(user)
      else
-        account_pending
+        # Redmine 2.4 adds an argument to account_pending
+        if Redmine::VERSION::MAJOR > 2 or
+          (Redmine::VERSION::MAJOR == 2 and Redmine::VERSION::MINOR >= 4)
+          account_pending(user)
+        else
+          account_pending
+        end
      end
    end
  end