ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2125 from connortechnology/fix_2124 

Fix #2124.  Always allow selection of checkboxes, include canEdit(Eve…
pull/2130/head
Andrew Bauer 2018-06-15 14:52:08 -05:00 committed by GitHub
parent 4fd33c2a13 55f2e7c6a2
commit c84a08a431
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/skins/classic/js/skin.js.php
View File

@ -34,6 +34,8 @@ var skinPath = "<?php echo ZM_SKIN_PATH ?>";
var canEditSystem = <?php echo canEdit('System' )?'true':'false' ?>; var canEditSystem = <?php echo canEdit('System' )?'true':'false' ?>;
var canViewSystem = <?php echo canView('System' )?'true':'false' ?>; var canViewSystem = <?php echo canView('System' )?'true':'false' ?>;
var canEditEvents = <?php echo canEdit('Events' )?'true':'false' ?>;
var canViewEvents = <?php echo canView('Events' )?'true':'false' ?>;
var canEditGroups = <?php echo canEdit('Groups' )?'true':'false' ?>; var canEditGroups = <?php echo canEdit('Groups' )?'true':'false' ?>;

7
web/skins/classic/views/events.php
View File

@ -142,7 +142,6 @@ if ( $pages > 1 ) {
$count = 0; $count = 0;
$disk_space_total = 0; $disk_space_total = 0;
Logger::Debug("EventSql: $eventsSql");
$results = dbQuery($eventsSql); $results = dbQuery($eventsSql);
while ( $event_row = dbFetchNext($results) ) { while ( $event_row = dbFetchNext($results) ) {
$event = new Event($event_row); $event = new Event($event_row);
@ -173,7 +172,7 @@ while ( $event_row = dbFetchNext($results) ) {
} }
if ( ZM_WEB_EVENT_DISK_SPACE ) { if ( ZM_WEB_EVENT_DISK_SPACE ) {
?> ?>
<th class="colDiskSpace"><a href="<?php echo sortHeader( 'DiskSpace' ) ?>"><?php echo translate('DiskSpace') ?><?php echo sortTag( 'DiskSpace' ) ?></a></th> <th class="colDiskSpace"><a href="<?php echo sortHeader('DiskSpace') ?>"><?php echo translate('DiskSpace') ?><?php echo sortTag('DiskSpace') ?></a></th>
<?php <?php
} }
if ( ZM_WEB_LIST_THUMBS ) { if ( ZM_WEB_LIST_THUMBS ) {
@ -182,7 +181,7 @@ while ( $event_row = dbFetchNext($results) ) {
<?php <?php
} }
?> ?>
<th class="colMark"><input type="checkbox" name="toggleCheck" value="1" onclick="toggleCheckbox( this, 'markEids' );"<?php if ( !canEdit( 'Events' ) ) { ?> disabled="disabled"<?php } ?>/></th> <th class="colMark"><input type="checkbox" name="toggleCheck" value="1" onclick="toggleCheckbox(this, 'markEids');"/></th>
</tr> </tr>
<?php <?php
} }
@ -226,7 +225,7 @@ while ( $event_row = dbFetchNext($results) ) {
echo '</td>'; echo '</td>';
} // end if ZM_WEB_LIST_THUMBS } // end if ZM_WEB_LIST_THUMBS
?> ?>
<td class="colMark"><input type="checkbox" name="markEids[]" value="<?php echo $event->Id() ?>" onclick="configureButton( this, 'markEids' );"<?php if ( !canEdit( 'Events' ) ) { ?> disabled="disabled"<?php } ?>/></td> <td class="colMark"><input type="checkbox" name="markEids[]" value="<?php echo $event->Id() ?>" onclick="configureButton(this, 'markEids');"/></td>
</tr> </tr>
<?php <?php
} }

36
web/skins/classic/views/js/events.js
View File

@ -11,13 +11,13 @@ function toggleCheckbox( element, name ) {
for (var i = 0; i < form.elements.length; i++) for (var i = 0; i < form.elements.length; i++)
if (form.elements[i].name.indexOf(name) == 0) if (form.elements[i].name.indexOf(name) == 0)
form.elements[i].checked = checked; form.elements[i].checked = checked;
form.viewBtn.disabled = !checked; form.viewBtn.disabled = !(canViewEvents && checked);
form.editBtn.disabled = !checked; form.editBtn.disabled = !(canEditEvents && checked);
form.archiveBtn.disabled = unarchivedEvents?!checked:true; form.archiveBtn.disabled = unarchivedEvents?!checked:true;
form.unarchiveBtn.disabled = archivedEvents?!checked:true; form.unarchiveBtn.disabled = !(canEditEvents && archivedEvents && checked);
form.downloadBtn.disabled = !checked; form.downloadBtn.disabled = !(canViewEvents && checked);
form.exportBtn.disabled = !checked; form.exportBtn.disabled = !(canViewEvents && checked);
form.deleteBtn.disabled = !checked; form.deleteBtn.disabled = !(canEditEvents && checked);
} }
function configureButton( element, name ) { function configureButton( element, name ) {
@ -35,16 +35,20 @@ function configureButton( element, name ) {
} }
if ( !element.checked ) if ( !element.checked )
form.toggleCheck.checked = false; form.toggleCheck.checked = false;
form.viewBtn.disabled = !checked; form.viewBtn.disabled = !(canViewEvents && checked);
form.editBtn.disabled = !checked; form.editBtn.disabled = !(canEditEvents && checked);
form.archiveBtn.disabled = (!checked)||(!unarchivedEvents); form.archiveBtn.disabled = (!checked)||(!unarchivedEvents);
form.unarchiveBtn.disabled = (!checked)||(!archivedEvents); form.unarchiveBtn.disabled = !(canEditEvents && checked && archivedEvents);
form.downloadBtn.disabled = !checked; form.downloadBtn.disabled = !(canViewEvents && checked);
form.exportBtn.disabled = !checked; form.exportBtn.disabled = !(canViewEvents && checked);
form.deleteBtn.disabled = !checked; form.deleteBtn.disabled = !(canEditEvents && checked);
} }
function deleteEvents( element, name ) { function deleteEvents( element, name ) {
if ( ! canEditEvents ) {
alert("You do not have permission to delete events.");
return;
}
var form = element.form; var form = element.form;
var count = 0; var count = 0;
for (var i = 0; i < form.elements.length; i++) { for (var i = 0; i < form.elements.length; i++) {
@ -64,6 +68,10 @@ function deleteEvents( element, name ) {
} }
function editEvents( element, name ) { function editEvents( element, name ) {
if ( ! canEditEvents ) {
alert("You do not have permission to delete events.");
return;
}
var form = element.form; var form = element.form;
var eids = new Array(); var eids = new Array();
for (var i = 0; i < form.elements.length; i++) { for (var i = 0; i < form.elements.length; i++) {
@ -125,6 +133,10 @@ function archiveEvents( element, name ) {
} }
function unarchiveEvents(element, name) { function unarchiveEvents(element, name) {
if ( ! canEditEvents ) {
alert("You do not have permission to delete events.");
return;
}
var form = element.form; var form = element.form;
form.elements['action'].value = 'unarchive'; form.elements['action'].value = 'unarchive';
form.submit(); form.submit();