Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix sorting of queries with identical timestamps #938

Merged
merged 13 commits into from May 22, 2019

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented May 5, 2019

By submitting this pull request, I confirm the following:

  • I have read and understood the contributors guide, as well as this entire template.
  • I have made only one major change in my proposed changes.
  • I have commented my proposed changes within the code.
  • I have tested my proposed changes.
  • I am willing to help maintain this change if there are issues with it later.
  • I give this submission freely and claim no ownership.
  • It is compatible with the EUPL 1.2 license
  • I have squashed any insignificant commits. (git rebase)
  • I have Signed Off all commits. (git commit --signoff)

What does this PR aim to accomplish?:

Queries with identical timestamps are sorted in the wrong order when looking at the query log data descending. See #934 for further details. This PR fixes #934.

How does this PR accomplish the above?:

Modify timestamps during loading to make them non-unique. Our modification is reverted when we convert the UNIX timestamp to a formatted date string. This allows us to fix this issue with

What documentation changes (if any) are needed to support this PR?:

None, this PR does not break anything.

DL6ER and others added 8 commits April 10, 2019 17:12
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: Adam Warner <me@adamwarner.co.uk>
Set "orderable" to false on last column of network table
…ame second. Fixes #934

Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER added the Bugfix label May 5, 2019
@DL6ER DL6ER added this to the v4.3 milestone May 5, 2019
@DL6ER
Copy link
Member Author

DL6ER commented May 5, 2019

Opened as draft PR as the code changes need to be repeated for the long-term query table.

DL6ER added 2 commits May 6, 2019 07:41
…en the date string is shown.

Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER requested a review from AzureMarker May 6, 2019 05:44
@DL6ER DL6ER marked this pull request as ready for review May 6, 2019 05:44
…ent to a new array

Signed-off-by: DL6ER <dl6er@dl6er.de>
scripts/pi-hole/js/db_queries.js Outdated Show resolved Hide resolved
scripts/pi-hole/js/db_queries.js Outdated Show resolved Hide resolved
Signed-off-by: DL6ER <dl6er@dl6er.de>
@AzureMarker AzureMarker changed the base branch from release/v4.3 to devel May 19, 2019 21:12
@AzureMarker AzureMarker modified the milestones: v4.3, v5.0 May 19, 2019
@AzureMarker AzureMarker merged commit 2e27a29 into devel May 22, 2019
@AzureMarker AzureMarker deleted the fix/query_table_aditional_sorting_by_id branch May 22, 2019 19:40
AzureMarker added a commit that referenced this pull request Sep 11, 2019
…g_by_id

Fix sorting of queries with identical timestamps
@AzureMarker AzureMarker modified the milestones: v5.0, v4.3.2 Sep 12, 2019
@pralor-bot
Copy link

This pull request has been mentioned on Pi-hole Userspace. There might be relevant details there:

https://discourse.pi-hole.net/t/pi-hole-4-3-2-release-notes/23852/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants