Feat: Consistency in the modal window code for confirming the delete action. by IgorA100 · Pull Request #4792 · ZoneMinder/zoneminder

IgorA100 · 2026-05-04T09:33:49Z

Similar to #4749

Moved the getDelConfirmModal() function from options.js to skin.js
Removed the getDelConfirmModal() function (and its call) from report.js, options.js, reports.js, devices.js, controlcaps.js(?view=options&tab=control), and snapshots.js. This is because it's now a single function in skin.js, which is called when the "Delete" button is pressed, rather than during page initialization.
Slightly modified the local functions of manageDelConfirmModalBtns(). Removed the listener, so the code is executed immediately.
You can now call local functions from the global getDelConfirmModal() function (instead of just executing submitThisForm() ). Applies to report.js, reports.js, devices.js, controlcaps.js, snapshots.js
Changed the style of the "Delete" button on the Groups page
Added deletion confirmation to the Storage, Roles, and Groups pages
On the Event page, deletion permissions were broken. Deletes were allowed for those who did NOT have edit permissions, but deletions were blocked for those who did. !
On the Report page, deletion didn't work and still doesn't work. This needs to be addressed, or maybe it's possible to delete reports only on the Reports page. (FIXED...)
On the Devices page, the "canEdit.Device" permissions check was being performed, but it should be performed like this: "canEdit.Devices"
The $action variable was not defined in \ajax\devices.php
Added translations.
Added a style for the disabled "Delete" button
Minor fixes

…_options_servers.php)

- Pass the "formName" argument when calling getDelConfirmModal() - Added a translation

- Removed the getDelConfirmModal() function (and its call) from report.js, options.js, reports.js, devices.js, +++controlcaps.js(?view=options&tab=control), and snapshots.js. This is because it's now a single function in skin.js, which is called when the "Delete" button is pressed, rather than during page initialization. - Slightly modified the local functions of manageDelConfirmModalBtns(). Removed the listener, so the code is executed immediately. - You can now call local functions from the global getDelConfirmModal() function (instead of just executing submitThisForm() ). Applies to report.js, reports.js, devices.js, controlcaps.js, snapshots.js - Changed the style of the "Delete" button on the Groups page - Added deletion confirmation to the Storage, Roles, and Groups pages - On the Event page, deletion permissions were broken. Deletes were allowed for those who did NOT have edit permissions, but deletions were blocked for those who did. ! - On the Report page, deletion didn't work and still doesn't work. This needs to be addressed, or maybe it's possible to delete reports only on the Reports page. (FIXED...) - On the Devices page, the "canEdit.Device" permissions check was being performed, but it should be performed like this: "canEdit.Devices" - The $action variable was not defined in \ajax\devices.php - Added translations. - Added a style for the disabled "Delete" button - Minor fixes

IgorA100 · 2026-05-04T16:27:07Z

@connortechnology
I've completed this PR.
I wanted to quickly add deletion confirmation for a couple of pages, but ended up doing it for all of them (well, almost...).
It took me almost a whole day to get it done.

connortechnology · 2026-05-05T22:55:13Z

+    'ConfirmDeleteRole'     => 'Are you sure you wish to delete the selected roles?',
+    'ConfirmDeleteRoleTitle'=> 'Confirm Role Deletion',
+    'ConfirmDeleteSnapshots'=> 'Are you sure you wish to delete the selected snapshots?',
    'ConfirmPassword'       => 'Confirm Password',


I wonder if we ould get away with just one "Are you sure?"

I don't know.
What are your suggestions, Isaac?

Copilot

Pull request overview

This PR centralizes and standardizes the “Delete” confirmation modal behavior across multiple classic-skin pages by moving modal-loading logic into skin.js, updating page-specific delete handlers to run on confirmation, and adding/adjusting related UI/permission behavior.

Changes:

Introduces a global getDelConfirmModal() in web/skins/classic/js/skin.js and updates multiple pages to invoke it on Delete click (instead of preloading at init).
Updates page-local manageDelConfirmModalBtns() implementations to execute delete actions immediately after confirmation.
Adds delete confirmation support to additional Options tabs (Servers/Storage/Roles) and tweaks styling/translations.

Reviewed changes

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

Show a summary per file

File	Description
web/skins/classic/views/report.php	Makes report delete button non-submitting and adds `data-report_id`; adjusts early return/footer output.
web/skins/classic/views/js/snapshots.js	Switches snapshots deletion flow to use global modal loader and immediate confirm handler.
web/skins/classic/views/js/reports.js	Switches reports deletion flow to use global modal loader and immediate confirm handler.
web/skins/classic/views/js/report.js	Hooks single-report delete to modal confirmation and deletes via AJAX.
web/skins/classic/views/js/options.js	Routes Options delete actions (user/server/storage/role) through global modal loader.
web/skins/classic/views/js/groups.js	Adds modal confirmation for group deletion and updates delete-button enabling logic.
web/skins/classic/views/js/devices.js	Updates delete confirmation flow and fixes permission key to `canEdit.Devices`.
web/skins/classic/views/js/controlcaps.js	Updates delete confirmation flow to use global modal loader.
web/skins/classic/views/groups.php	Updates Groups delete button styling.
web/skins/classic/views/_options_storage.php	Converts Storage delete to modal-confirmed button action.
web/skins/classic/views/_options_servers.php	Converts Servers delete to modal-confirmed button action.
web/skins/classic/views/_options_roles.php	Converts Roles delete to modal-confirmed button action.
web/skins/classic/js/skin.js	Adds global `getDelConfirmModal()` implementation.
web/skins/classic/css/base/skin.css	Adds disabled styling for `.btn-danger`.
web/lang/ru_ru.php	Adds new delete-confirmation translations (servers/reports/storage/roles/snapshots).
web/lang/en_gb.php	Adds new delete-confirmation translations (servers/reports/storage/roles/snapshots).
web/includes/Report.php	Re-indents defaults array (formatting-only).
web/ajax/reports.php	Adjusts report delete permission check to use `Events` permissions.
web/ajax/devices.php	Defines `$action` and improves unrecognized-action error message.

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

…ns() function is not found (skin.js)

As canEdit analysis has been added to reports in ZoneMinder@2630d55

…port deletion error occurs instead of updating a non-existent '#reportsTable' (report.js)

IgorA100 · 2026-05-06T08:40:10Z

@connortechnology
I have followed all the instructions and left comments.

IgorA100 and others added 2 commits May 4, 2026 12:32

Changed the "Delete" button to confirm deletion of selected servers (…

38a7439

…_options_servers.php)

- Added the DeleteServer() function

a91a297

- Pass the "formName" argument when calling getDelConfirmModal() - Added a translation

IgorA100 marked this pull request as ready for review May 4, 2026 09:42

IgorA100 marked this pull request as draft May 4, 2026 09:44

IgorA100 mentioned this pull request May 4, 2026

Fix broken HTML markup if !$report->FilterId() on Report page #4793

Closed

IgorA100 added 2 commits May 4, 2026 19:09

Fix: ESLint

fa27e46

IgorA100 changed the title ~~Feat: Display a modal window confirming the deletion of a user on Options page -> servers~~ Consistency in the modal window code for confirming the delete action. May 4, 2026

IgorA100 marked this pull request as ready for review May 4, 2026 16:27

IgorA100 changed the title ~~Consistency in the modal window code for confirming the delete action.~~ Feat: Consistency in the modal window code for confirming the delete action. May 4, 2026

connortechnology reviewed May 5, 2026

View reviewed changes

Comment thread web/ajax/reports.php Outdated

connortechnology reviewed May 5, 2026

View reviewed changes

Comment thread web/includes/Report.php

connortechnology reviewed May 5, 2026

View reviewed changes

Comment thread web/skins/classic/js/skin.js Outdated

connortechnology requested a review from Copilot May 5, 2026 22:56

Copilot started reviewing on behalf of connortechnology May 5, 2026 22:57 View session

Copilot AI reviewed May 5, 2026

View reviewed changes

IgorA100 added 9 commits May 6, 2026 10:22

Lost "?" (ru_ru.php)

b4f48b9

Removed warning in the browser console if the manageDelConfirmModalBt…

5c0d75e

…ns() function is not found (skin.js)

Merge branch 'master' into patch-380634

9275684

Use $report->canEdit() instead of canEdit('Events') (reports.php)

bd09651

As canEdit analysis has been added to reports in ZoneMinder@2630d55

Get the "form" for an element (groups.js)

5fc72e9

Update groups.js

39398b1

Replaced casual Russian text with English (skin.js)

3a2d31a

Replaced random Russian text with English Display a message when a re…

6ec7ada

…port deletion error occurs instead of updating a non-existent '#reportsTable' (report.js)

Replacing $j('#eventTable') with tableControlCaps (controlcaps.js)

8bd7612

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Feat: Consistency in the modal window code for confirming the delete action.#4792

Feat: Consistency in the modal window code for confirming the delete action.#4792
IgorA100 wants to merge 13 commits intoZoneMinder:masterfrom
IgorA100:patch-380634

IgorA100 commented May 4, 2026 •

edited

Loading

Uh oh!

IgorA100 commented May 4, 2026

Uh oh!

Uh oh!

Uh oh!

connortechnology May 5, 2026

Uh oh!

IgorA100 May 6, 2026

Uh oh!

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

IgorA100 commented May 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

IgorA100 commented May 4, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

IgorA100 commented May 4, 2026

Uh oh!

Uh oh!

Uh oh!

connortechnology May 5, 2026

Choose a reason for hiding this comment

Uh oh!

IgorA100 May 6, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

IgorA100 commented May 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

IgorA100 commented May 4, 2026 •

edited

Loading