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

Finalize renaming adlists -> lists #2756

Merged
merged 5 commits into from
Nov 4, 2023
Merged

Finalize renaming adlists -> lists #2756

merged 5 commits into from
Nov 4, 2023

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Oct 16, 2023

What does this implement/fix?

Finish the only partially done renaming adlists -> lists on the dashboard. This fixes a few broken links such as "Manage lists" on the dashboard as well as the generated links from the Search Lists page to the Groups -> Lists page with enabled list row highlighting

Related issue or feature (if applicable): N/A

Pull request in docs with documentation (if applicable): N/A


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)

Checklist:

  • The code change is tested and works locally.
  • I based my code and PRs against the repositories developmental branch.
  • I signed off all commits. Pi-hole enforces the DCO for all contributions
  • I signed all my commits. Pi-hole requires signatures to verify authorship
  • I have read the above and my PR is ready for review.

@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

…oard. This fixes a few broken links such as "Manage lists" on the dashboard as well as the generated links from the Search Lists page to the Groups -> Lists page with enabled list row highlighting

Signed-off-by: DL6ER <[email protected]>
@github-actions
Copy link
Contributor

Conflicts have been resolved.

@yubiuser
Copy link
Member

yubiuser commented Oct 16, 2023

I'm not so happy with that change. I know gravity can now contain also allowlists (anti-gravity) and adlists is not the best term anymore. However, a generic 'list' makes it impossible to distinguish gravity from manually managed allow/deny lists.

@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions
Copy link
Contributor

Conflicts have been resolved.

@DL6ER
Copy link
Member Author

DL6ER commented Oct 17, 2023

Github says:
Screenshot from 2023-10-17 22-24-58

yet on the CLI:

$ git merge development-v6 

Auto-merging scripts/pi-hole/js/groups-lists.js
Merge made by the 'ort' strategy.
 scripts/pi-hole/js/gravity.js      | 3 +--
 scripts/pi-hole/js/groups-lists.js | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

🤔 🤷‍♂️

@PromoFaux
Copy link
Member

However, a generic 'list' makes it impossible to distinguish gravity from manually managed allow/deny lists.

Would you mind expanding on this a little? Do you have an alternative suggestion?

@DL6ER
Copy link
Member Author

DL6ER commented Oct 20, 2023

Maybe along the lines of subscriptions or subscribed lists but they are pretty long phrases. Or we go German and say Abos (which means subscriptions)

@yubiuser
Copy link
Member

In the end it comes down to the difference between subscibed lists and self-curated lists (and a few different supported syntax on the lists). I think subscriptions is a nice term - it can be both "adlist" and "anti-adlists" now. And domainlist can stay as it is

@DL6ER
Copy link
Member Author

DL6ER commented Oct 24, 2023

Screenshot from 2023-10-24 19-31-37

This is just too long to be good...

@github-actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@PromoFaux
Copy link
Member

Coming back to this... I think lists is an adequate descriptor for this, and to be honest I'm failing to see where the confusion would lie. Subscriptions is a change of terminology all together, and would possibly cause even more confusion...

@github-actions
Copy link
Contributor

Conflicts have been resolved.

PromoFaux
PromoFaux previously approved these changes Oct 28, 2023
Copy link

@NittanySeaLion NittanySeaLion left a comment

Choose a reason for hiding this comment

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

In groups-lists.lp, line 65, consider changing "List of subscribed lists" to "Subscribed lists"

@DL6ER DL6ER merged commit c27bf73 into development-v6 Nov 4, 2023
7 checks passed
@DL6ER DL6ER deleted the fix/adlist_list branch November 4, 2023 06:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants