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

Fix DHCP tables button column #1982

Merged
merged 2 commits into from
Nov 21, 2021
Merged

Fix DHCP tables button column #1982

merged 2 commits into from
Nov 21, 2021

Conversation

yubiuser
Copy link
Member

  • 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?:

#1948 introduced text rendering to all table's column rendering. This fails in case of the DHCP tables, as the last column (Action) with the delete buttons should not be rendered as text.

https://github.com/pi-hole/AdminLTE/blob/21cba361e03bfbc6f241497066c2558a57c13c8e/scripts/pi-hole/js/settings.js#L245-L251

How does this PR accomplish the above?:

Limit the rendering to the first three columns

Signed-off-by: Christian König <[email protected]>
@yubiuser yubiuser requested a review from a team November 21, 2021 12:20
@yubiuser yubiuser added the PR: Approval Required Open Pull Request, needs approval label Nov 21, 2021
Signed-off-by: Christian König <[email protected]>
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.

Screenshot from 2021-11-21 13-41-31

@DL6ER DL6ER merged commit 4f559a5 into devel Nov 21, 2021
@DL6ER DL6ER deleted the fix/DHCP_table branch November 21, 2021 12:42
@DL6ER DL6ER mentioned this pull request Dec 22, 2021
@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-ftl-v5-12-web-v5-9-and-core-v5-7-released/51795/1

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR: Approval Required Open Pull Request, needs approval
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants