Rework coordinates to avoid scientific formatting of small numbers. Fixes #1509

[rails.git] / app / models / client_application.rb

diff --git a/app/models/client_application.rb b/app/models/client_application.rb
index aa7cb1c343e8cd9794bfc0cfc530b5d08557be31..85b6ba68a131664f4fcdb7899bc8c480da5e0bb3 100644 (file)
--- a/app/models/client_application.rb
+++ b/app/models/client_application.rb
@@ -18,7 +18,7 @@ class ClientApplication < ActiveRecord::Base
   attr_accessor :token_callback_url
 
   def self.find_token(token_key)
-    token = OauthToken.find_by_token(token_key, :include => :client_application)
+    token = OauthToken.includes(:client_application).find_by(:token => token_key)
     token if token && token.authorized?
   end
 
@@ -75,9 +75,7 @@ class ClientApplication < ActiveRecord::Base
   # this is the set of permissions that the client can ask for. clients
   # have to say up-front what permissions they want and when users sign up they
   # can agree or not agree to each of them.
-  PERMISSIONS = [:allow_read_prefs, :allow_write_prefs, :allow_write_diary,
-                 :allow_write_api, :allow_read_gpx, :allow_write_gpx,
-                 :allow_write_notes]
+  PERMISSIONS = [:allow_read_prefs, :allow_write_prefs, :allow_write_diary, :allow_write_api, :allow_read_gpx, :allow_write_gpx, :allow_write_notes].freeze
 
   def generate_keys
     self.key = OAuth::Helper.generate_key(40)[0, 40]