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

Add correct IP sorting for the ARP table #948

Merged
merged 5 commits into from May 31, 2019
Merged

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented May 30, 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?:

  1. Fix Network overview page is not correctly sorting for IP #947
  2. Fix a bug causing the table to error if the name or macVendor fields are NULL.
    Note that this bug should never be triggered. We always inject (possibly empty) strings. However, manual interaction of the users with the database could trigger this as the columns are not explicitly marked NOT NULL.

How does this PR accomplish the above?:

  1. Add ip-address type for DataTables columns
  2. Check name and macVendor fields against being null before trying to access their .length property

@DL6ER DL6ER added the Bugfix label May 30, 2019
@DL6ER DL6ER added this to the v5.0 milestone May 30, 2019
@DL6ER DL6ER requested a review from a team May 30, 2019 10:38
DL6ER added 2 commits May 30, 2019 12:44
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Copy link
Contributor

@AzureMarker AzureMarker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The codefactor issue has been ignored, but is not reflecting in the check.

Edit: there it goes

@AzureMarker AzureMarker merged commit f4029c7 into devel May 31, 2019
@AzureMarker AzureMarker deleted the fix/arp_IP_sorting branch May 31, 2019 03:12
AzureMarker added a commit that referenced this pull request Sep 11, 2019
Add correct IP sorting for the ARP table
@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

3 participants