latitude and longitude on devices/device fetch #8504
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
laf
requested changes
Apr 5, 2018
html/includes/api_functions.inc.php
Outdated
| @@ -347,7 +347,7 @@ function list_devices() | |||
| $param[] = $_SESSION['user_id']; | |||
| } | |||
| $devices = array(); | |||
| $dev_query = "SELECT $select FROM `devices` AS d $join WHERE $sql GROUP BY d.`hostname` ORDER BY $order"; | |||
| $dev_query = "SELECT dev.*, lat, lng FROM (SELECT $select FROM `devices` AS d $join WHERE $sql GROUP BY d.`hostname` ORDER BY $order) dev LEFT JOIN locations ON locations.location=dev.location"; | |||
There was a problem hiding this comment.
Revert this line back to how it was and use this patch instead:
|
A lot of thanks for your help @laf. Is merging blocked until I sign as "axsor"? Because I will need to change github username now. If is necessary I will do it temporary. |
|
Yes it is but if you squash your commit to use the first name then it will be fine. |
|
I close and reopen de pull request because I can't resolve it... |
|
The inspection completed: No new issues |
|
Really... |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
DO NOT DELETE THIS TEXT
Please note
Testers
If you would like to test this pull request then please run:
./scripts/github-apply <pr_id>, i.e./scripts/github-apply 5926