Skip to content

Display a modal window confirming the deletion of a user on Options page -> users#4749

Merged
connortechnology merged 12 commits intoZoneMinder:masterfrom
IgorA100:patch-590744
May 1, 2026
Merged

Display a modal window confirming the deletion of a user on Options page -> users#4749
connortechnology merged 12 commits intoZoneMinder:masterfrom
IgorA100:patch-590744

Conversation

@IgorA100
Copy link
Copy Markdown
Contributor

No description provided.

@IgorA100 IgorA100 marked this pull request as ready for review April 22, 2026 10:13
@IgorA100
Copy link
Copy Markdown
Contributor Author

Done.

Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Adds a delete-confirmation modal to the Options → Users tab so user deletions require explicit confirmation.

Changes:

  • Load and inject the shared delconfirm modal via Ajax on the Options page and bind confirm to submit the users delete form.
  • Update the Users delete button to open the modal instead of submitting immediately.
  • Add new translation keys for the user-deletion confirmation title/body (EN/RU) and allow the modal title to be parameterized.

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 6 comments.

Show a summary per file
File Description
web/skins/classic/views/js/options.js Loads delconfirm modal and binds confirm action to submit the users form; adds DeleteUser handler.
web/skins/classic/views/_options_users.php Switches delete button to type="button" and wires it to DeleteUser via data-on-click-this.
web/lang/en_gb.php Adds EN strings for user deletion confirm modal title/body.
web/lang/ru_ru.php Adds RU strings for user deletion confirm modal title/body; tweaks existing delete title string.
web/ajax/modals/delconfirm.php Accepts a request parameter to control the modal title translation key.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread web/skins/classic/views/js/options.js Outdated
Comment thread web/skins/classic/views/js/options.js Outdated
Comment thread web/ajax/modals/delconfirm.php Outdated
Comment thread web/ajax/modals/delconfirm.php Outdated
Comment thread web/lang/en_gb.php Outdated
Comment thread web/lang/ru_ru.php Outdated
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
@IgorA100 IgorA100 marked this pull request as draft April 22, 2026 12:50
IgorA100 and others added 5 commits April 22, 2026 16:22
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
@IgorA100 IgorA100 marked this pull request as ready for review April 22, 2026 19:42
@IgorA100
Copy link
Copy Markdown
Contributor Author

Done.

Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 5 out of 5 changed files in this pull request and generated 1 comment.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread web/skins/classic/views/js/options.js Outdated
I tested adding large amounts of data to the DOM, and the synchronous operation of "replaceWith" and "append" in the insertModalHtml() function works quite correctly.
This was just my extra precaution.
@IgorA100
Copy link
Copy Markdown
Contributor Author

Done.

@connortechnology connortechnology merged commit 45dd04a into ZoneMinder:master May 1, 2026
8 of 9 checks passed
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