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

Ensure blocking mode timer is started even when set via a third-party API call #2917

Merged
merged 1 commit into from
Jan 10, 2024

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Dec 27, 2023

What does this implement/fix?

See title. It works by initiating/resetting the timer whenever the API tells us there is a timer. Before, it was only started when the button in the GUI was clicked.

Fixes the issue originally reported in pi-hole/FTL#1845


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.

… API call

Signed-off-by: DL6ER <dl6er@dl6er.de>
@@ -97,7 +103,7 @@ function countDown() {
ena.text("Enable Blocking (" + secondsTimeSpanToHMS(seconds) + ")");
} else {
ena.text("Enable Blocking");
piholeChanged("enabled");
piholeChanged("enabled", null);
Copy link
Member

Choose a reason for hiding this comment

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

Nit-picky comment: As timer has a default declaration of null in the parameters for piholeChanged, does null need to be explicitly added to the function call here?

Copy link
Member

@yubiuser yubiuser left a comment

Choose a reason for hiding this comment

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

Works nicely. Approving in case nit-picking is ignored/dismissed, otherwise fix it and I'll re-approve.

@DL6ER
Copy link
Member Author

DL6ER commented Jan 10, 2024

Not needed because defaults are always used when not explicitly specified.

@DL6ER DL6ER merged commit fef1def into development-v6 Jan 10, 2024
7 checks passed
@DL6ER DL6ER deleted the fix/blocking_timer branch January 10, 2024 18:33
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.

None yet

3 participants