Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed error if no geo location backend is selected.

Browse source
This commit is contained in:
Martin Edenhofer 2016-01-14 10:39:52 +01:00
parent b0af4f85ee
commit 92c0cb9da8
6 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/models/user_device.rb
View file

@ -23,7 +23,10 @@ store device for user
# get location info # get location info
location_details = Service::GeoIp.location(ip) location_details = Service::GeoIp.location(ip)
location = 'unknown'
if location_details
location = location_details['country_name'] location = location_details['country_name']
end
# find device by fingerprint # find device by fingerprint
if fingerprint if fingerprint

1
lib/application_lib.rb
View file

@ -20,6 +20,7 @@ returns
def load_adapter_by_setting(setting) def load_adapter_by_setting(setting)
adapter = Setting.get(setting) adapter = Setting.get(setting)
return if !adapter return if !adapter
return if adapter.empty?
# load backend # load backend
load_adapter(adapter) load_adapter(adapter)