Merge remote-tracking branch 'upstream/pull/2190'

[rails.git] / app / controllers / api_controller.rb

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 511748d8d6775ab4d3b1080ae1398a7d2b7404e8..df7cfe93be97d9ffa704db88d759be75523ffc32 100644 (file)
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -16,6 +16,15 @@ class ApiController < ApplicationController
     end
   end
 
     end
   end
 

+  def current_ability
+    # Use capabilities from the oauth token if it exists and is a valid access token
+    if Authenticator.new(self, [:token]).allow?
+      ApiAbility.new(nil).merge(ApiCapability.new(current_token))
+    else
+      ApiAbility.new(current_user)
+    end
+  end
+

   def deny_access(_exception)
     if current_token
       set_locale
   def deny_access(_exception)
     if current_token
       set_locale


@@ -32,7 +41,7 @@ class ApiController < ApplicationController
 
   def gpx_status
     status = database_status
 
   def gpx_status
     status = database_status

-    status = :offline if status == :online && Settings.status == "gpx_offline"
+    status = "offline" if status == "online" && Settings.status == "gpx_offline"

     status
   end
 
     status
   end