kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-12 23:45:10 +00:00
Code Issues Projects Releases Wiki Activity

Fix bad location storage.

Browse Source
This commit is contained in:
James Cole
2020-02-29 14:08:11 +01:00
parent d580bf8f43
commit 40cc510057
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Requests/Request.php
View File

@@ -347,6 +347,7 @@ class Request extends FormRequest
$longitudeKey = null === $prefix ? 'longitude' : sprintf('%s_longitude', $prefix); $longitudeKey = null === $prefix ? 'longitude' : sprintf('%s_longitude', $prefix);
$latitudeKey = null === $prefix ? 'latitude' : sprintf('%s_latitude', $prefix); $latitudeKey = null === $prefix ? 'latitude' : sprintf('%s_latitude', $prefix);
$zoomLevelKey = null === $prefix ? 'zoom_level' : sprintf('%s_zoom_level', $prefix); $zoomLevelKey = null === $prefix ? 'zoom_level' : sprintf('%s_zoom_level', $prefix);
$hasLocationKey = null === $prefix ? 'has_location' : sprintf('%s_has_location', $prefix);
// for a POST (store, all fields must be present and accounted for: // for a POST (store, all fields must be present and accounted for:
if ( if (
@@ -354,7 +355,8 @@ class Request extends FormRequest
&& ($this->has($longitudeKey) && $this->has($latitudeKey) && $this->has($zoomLevelKey)) && ($this->has($longitudeKey) && $this->has($latitudeKey) && $this->has($zoomLevelKey))
) { ) {
Log::debug('Method is POST and all fields present.'); Log::debug('Method is POST and all fields present.');
$data['store_location'] = true;
$data['store_location'] = $this->boolean($hasLocationKey);
$data['longitude'] = '' === $this->string($longitudeKey) ? null : $this->string($longitudeKey); $data['longitude'] = '' === $this->string($longitudeKey) ? null : $this->string($longitudeKey);
$data['latitude'] = '' === $this->string($latitudeKey) ? null : $this->string($latitudeKey); $data['latitude'] = '' === $this->string($latitudeKey) ? null : $this->string($latitudeKey);
$data['zoom_level'] = '' === $this->string($zoomLevelKey) ? null : $this->integer($zoomLevelKey); $data['zoom_level'] = '' === $this->string($zoomLevelKey) ? null : $this->integer($zoomLevelKey);

1
resources/views/v1/form/location.twig
View File

@@ -86,6 +86,7 @@
console.log('Set object location: lat(' + e.latlng.lat + '), long(' + e.latlng.lng + '), zoom (' + mymap.getZoom() + ')'); console.log('Set object location: lat(' + e.latlng.lat + '), long(' + e.latlng.lng + '), zoom (' + mymap.getZoom() + ')');
$('input[name="{{ latitudevar }}"]').val(e.latlng.lat); $('input[name="{{ latitudevar }}"]').val(e.latlng.lat);
$('input[name="{{ longitudevar }}"]').val(e.latlng.lng); $('input[name="{{ longitudevar }}"]').val(e.latlng.lng);
$('input[name="{{ haslocationvar }}"]').val('true');
} }
if (typeof e.latlng === 'undefined') { if (typeof e.latlng === 'undefined') {
console.log('Set object zoom level to ' + mymap.getZoom()); console.log('Set object zoom level to ' + mymap.getZoom());