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

Base expert icon on expert class not FTL advanced flag #3043

Merged
merged 1 commit into from
Jun 5, 2024

Conversation

yubiuser
Copy link
Member

@yubiuser yubiuser commented Jun 4, 2024

What does this PR aim to accomplish?:

Show the wrench icon for expert level settings based on the expert class of the the parents (set manually) not based on the FTL 'advanced-setting' flag.

This PR is the counterpart for pi-hole/FTL#1883 which will remove the advanced flag, but keeps the wrench icon at the setting boxes when they are considered expert-level.

For background see #2882 (comment)


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 and I have tested my changes.
  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)
  6. I have checked that another pull request for this purpose does not exist.
  7. I have considered, and confirmed that this submission will be valuable to others.
  8. I accept that this submission may not be used, and the pull request closed at the will of the maintainer.
  9. I give this submission freely, and claim no ownership to its content.

  • I have read the above and my PR is ready for review. Check this box to confirm

@yubiuser yubiuser changed the title Base expert icon on expert class no FTL advanced flag Base expert icon on expert class not FTL advanced flag Jun 4, 2024
@yubiuser yubiuser force-pushed the settings/advanced branch 2 times, most recently from 3bfa228 to 947bb88 Compare June 4, 2024 20:54
@yubiuser yubiuser requested a review from a team June 5, 2024 03:57
@PromoFaux
Copy link
Member

Tested and working as expected. e.g Running this branch alongside the companion FTL PR, the wrench icon is restored on the "Query Anonymization" box where it is not present with the tweak/remove_expert_flag FTL branch alone.

@yubiuser DCObot is not happy it seems.... Once that's sorted I'll drop an approve!

@yubiuser
Copy link
Member Author

yubiuser commented Jun 5, 2024

I don't know why it's not happy. The commit is signed-off...

@yubiuser yubiuser force-pushed the settings/advanced branch from 947bb88 to 9585aed Compare June 5, 2024 20:04
@yubiuser yubiuser requested a review from PromoFaux June 5, 2024 20:05
@yubiuser yubiuser merged commit 04363c0 into development-v6 Jun 5, 2024
8 checks passed
@yubiuser yubiuser deleted the settings/advanced branch June 5, 2024 20:10
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.

2 participants