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

Show a clickable "." when there is a blank domain in the top domain lists #1244

Merged
merged 3 commits into from
May 7, 2020

Conversation

PromoFaux
Copy link
Member

@PromoFaux PromoFaux commented May 6, 2020

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, and have included unit tests where possible.
  • 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)

What does this PR aim to accomplish?:

Fixes #1241

@PromoFaux PromoFaux requested review from XhmikosR, DL6ER and dschaper and removed request for XhmikosR May 6, 2020 22:21
DL6ER
DL6ER previously approved these changes May 7, 2020
@DL6ER
Copy link
Member

DL6ER commented May 7, 2020

This works,
Screenshot from 2020-05-07 07-56-28
however, it will still show the empty domains in the Query Log it links to:
Screenshot from 2020-05-07 07-58-06

scripts/pi-hole/js/index.js Show resolved Hide resolved
scripts/pi-hole/js/index.js Show resolved Hide resolved
@XhmikosR
Copy link
Contributor

XhmikosR commented May 7, 2020

If the above doesn't fix the issue @DL6ER described, just drop the urlText variable and use a ternary in the url itself.

@DL6ER
Copy link
Member

DL6ER commented May 7, 2020

The issue I described exists on another page and is due to missing code there, not a conflict with the proposed change (which works as expected).

@XhmikosR I wonder if your suggestion (replace domain === "" by domain) is equivalent. The former does only check for an empty string whereas the latter would also be triggered by boolean false or null etc. which may be undesired.

@XhmikosR
Copy link
Contributor

XhmikosR commented May 7, 2020

@DL6ER well, that's why I said maybe try with... :)

@DL6ER DL6ER force-pushed the fix/blank-domains-toplists branch from e153c90 to cc4e3c9 Compare May 7, 2020 07:18
Copy link
Member

@DL6ER DL6ER left a comment

Choose a reason for hiding this comment

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

Added code to do the substitution also in the Query Logs. Pending check + merge by @PromoFaux

@PromoFaux PromoFaux merged commit 5909433 into release/v5.0 May 7, 2020
@PromoFaux PromoFaux deleted the fix/blank-domains-toplists branch May 7, 2020 07:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants