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

Merge branch 'master' of github.com:zoneminder/ZoneMinder

pull/3054/head
Isaac Connor 2020-09-15 11:12:27 -04:00
parent df18359f61 b9d95f0833
commit e61d8c37b3
4 changed files with 45 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
web/includes/actions/eventdetail.php
View File

@ -41,7 +41,6 @@ if ( $action == 'eventdetail' ) {
); );
} }
$dbConn->commit(); $dbConn->commit();
$refreshParent = true; $redirect = $_SERVER['HTTP_REFERER'];
$closePopup = true;
} }
?> ?>

25
web/skins/classic/includes/functions.php
View File

@ -1031,22 +1031,23 @@ function getEventDetailHTML($eid='', $eids='') {
$csrf_input = ''; $csrf_input = '';
} }
if ( isset($eid) ){ // Single Event Mode if ( $eid ){ // Single Event Mode
$title = translate('Event').' '.$eid.PHP_EOL;
$inputs .= '<input type="hidden" name="markEids[]" value="' .validInt($eid). '"/>'.PHP_EOL;
$eid = validInt($eid); $eid = validInt($eid);
$title = translate('Event').' '.$eid.PHP_EOL;
$inputs .= '<input type="hidden" name="markEids[]" value="' .$eid. '"/>'.PHP_EOL;
$newEvent = dbFetchOne('SELECT E.* FROM Events AS E WHERE E.Id = ?', NULL, array($eid)); $newEvent = dbFetchOne('SELECT E.* FROM Events AS E WHERE E.Id = ?', NULL, array($eid));
} elseif ( isset($eids) ) { // Multi Event Mode } elseif ( $eids ) { // Multi Event Mode
$title = translate('Events'); $title = translate('Events');
$sql = 'SELECT E.* FROM Events AS E WHERE '; $sql = 'SELECT E.* FROM Events AS E WHERE ';
$sqlWhere = array(); $sqlWhere = array();
$sqlValues = array(); $sqlValues = array();
foreach ( $eids as $eid ) { foreach ( $eids as $eid ) {
$inputs .= '<input type="hidden" name="markEids[]" value="' .validInt($eid). '"/>'.PHP_EOL; $eid = validInt($eid);
$inputs .= '<input type="hidden" name="markEids[]" value="' .$eid. '"/>'.PHP_EOL;
$sqlWhere[] = 'E.Id = ?'; $sqlWhere[] = 'E.Id = ?';
$sqlValues[] = validInt($eid); $sqlValues[] = $eid;
} }
unset($eid); unset($eid);
$sql .= join(' OR ', $sqlWhere); $sql .= join(' OR ', $sqlWhere);
@ -1065,7 +1066,7 @@ function getEventDetailHTML($eid='', $eids='') {
$title = translate('Events'); $title = translate('Events');
} }
$result .= '<div class="modal fade" id="staticBackdrop" data-backdrop="static" data-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">'.PHP_EOL; $result .= '<div class="modal fade" id="eventDetailModal" data-backdrop="static" data-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">'.PHP_EOL;
$result .= '<div class="modal-dialog">'.PHP_EOL; $result .= '<div class="modal-dialog">'.PHP_EOL;
$result .= '<div class="modal-content">'.PHP_EOL; $result .= '<div class="modal-content">'.PHP_EOL;
$result .= '<div class="modal-header">'.PHP_EOL; $result .= '<div class="modal-header">'.PHP_EOL;
@ -1075,26 +1076,26 @@ function getEventDetailHTML($eid='', $eids='') {
$result .= '</button>'.PHP_EOL; $result .= '</button>'.PHP_EOL;
$result .= '</div>'.PHP_EOL; $result .= '</div>'.PHP_EOL;
$result .= '<div class="modal-body">'.PHP_EOL; $result .= '<div class="modal-body">'.PHP_EOL;
$result .= '<form name="contentForm" id="contentForm" method="post" action="?">'.PHP_EOL; $result .= '<form name="contentForm" id="eventDetailForm" method="post" action="?view=eventdetail&action=eventdetail">'.PHP_EOL;
$result .= $csrf_input; $result .= $csrf_input;
$result .= '<input type="hidden" name="action" value="eventdetail"/>'.PHP_EOL; $result .= '<input type="hidden" name="action" value="eventdetail"/>'.PHP_EOL;
$result .= '<input type="hidden" name="view" value="eventdetail"/>'.PHP_EOL; $result .= '<input type="hidden" name="view" value="eventdetail"/>'.PHP_EOL;
$result .= $inputs; $result .= $inputs;
$result .= '<table id="contentTable" class="major">'.PHP_EOL; $result .= '<table id="contentTable" class="table-sm">'.PHP_EOL;
$result .= '<tbody>'.PHP_EOL; $result .= '<tbody>'.PHP_EOL;
$result .= '<tr>'.PHP_EOL; $result .= '<tr>'.PHP_EOL;
$result .= '<th scope="row">' .translate('Cause'). '</th>'.PHP_EOL; $result .= '<th scope="row">' .translate('Cause'). '</th>'.PHP_EOL;
$result .= '<td><input type="text" name="newEvent[Cause]" value="' .validHtmlStr($newEvent['Cause']). '" size="32"/></td>'.PHP_EOL; $result .= '<td><input type="text" name="newEvent[Cause]" value="' .validHtmlStr($newEvent['Cause']). '" size="32"/></td>'.PHP_EOL;
$result .= '</tr>'.PHP_EOL; $result .= '</tr>'.PHP_EOL;
$result .= '<tr>'.PHP_EOL; $result .= '<tr>'.PHP_EOL;
$result .= '<th scope="row">' .translate('Notes'). '</th>'.PHP_EOL; $result .= '<th scope="row" class="align-middle">' .translate('Notes'). '</th>'.PHP_EOL;
$result .= '<td><textarea name="newEvent[Notes]" rows="6" cols="50">' .validHtmlStr($newEvent['Notes']). '</textarea></td>'.PHP_EOL; $result .= '<td><textarea name="newEvent[Notes]" rows="6" cols="33">' .validHtmlStr($newEvent['Notes']). '</textarea></td>'.PHP_EOL;
$result .= '</tr>'.PHP_EOL; $result .= '</tr>'.PHP_EOL;
$result .= '</tbody>'.PHP_EOL; $result .= '</tbody>'.PHP_EOL;
$result .= '</table>'.PHP_EOL; $result .= '</table>'.PHP_EOL;
$result .= '</div>'.PHP_EOL; $result .= '</div>'.PHP_EOL;
$result .= '<div class="modal-footer">'.PHP_EOL; $result .= '<div class="modal-footer">'.PHP_EOL;
$result .= '<button type="submit" class="btn btn-primary" value="save" ' .( !canEdit('Events') ? $disabled : $null ). '>' .translate('Save'). '</button>'.PHP_EOL; $result .= '<button type="submit" name="action" id="eventDetailSaveBtn" class="btn btn-primary" value="save" ' .( !canEdit('Events') ? $disabled : $null ). '>' .translate('Save'). '</button>'.PHP_EOL;
$result .= '<button type="button" class="btn btn-secondary" data-dismiss="modal">' .translate('Cancel'). '</button>'.PHP_EOL; $result .= '<button type="button" class="btn btn-secondary" data-dismiss="modal">' .translate('Cancel'). '</button>'.PHP_EOL;
$result .= '</div>'.PHP_EOL; $result .= '</div>'.PHP_EOL;
$result .= '</form>'.PHP_EOL; $result .= '</form>'.PHP_EOL;

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

@ -230,7 +230,7 @@ if ( $results ) {
<td class="text-center"><?php echo ( $event->Archived() ) ? 'Yes' : 'No' ?></td> <td class="text-center"><?php echo ( $event->Archived() ) ? 'Yes' : 'No' ?></td>
<td class="text-center"><?php echo ( $event->Emailed() ) ? 'Yes' : 'No' ?></td> <td class="text-center"><?php echo ( $event->Emailed() ) ? 'Yes' : 'No' ?></td>
<td><?php echo makePopupLink( '?view=monitor&amp;mid='.$event->MonitorId(), 'zmMonitor'.$event->MonitorId(), 'monitor', $event->MonitorName(), canEdit( 'Monitors' ) ) ?></td> <td><?php echo makePopupLink( '?view=monitor&amp;mid='.$event->MonitorId(), 'zmMonitor'.$event->MonitorId(), 'monitor', $event->MonitorName(), canEdit( 'Monitors' ) ) ?></td>
<td><?php echo makePopupLink( '?view=eventdetail&amp;eid='.$event->Id(), 'zmEventDetail', 'eventdetail', validHtmlStr($event->Cause()), canEdit( 'Events' ), 'title="'.htmlspecialchars($event->Notes()).'"' ) ?> <td><?php echo makeLink( '#', validHtmlStr($event->Cause()), canEdit( 'Events' ), 'title="' .htmlspecialchars($event->Notes()). '" class="eDetailLink" data-eid=' .$event->Id(). '"') ?>
<?php <?php
# display notes as small text # display notes as small text
if ( $event->Notes() ) { if ( $event->Notes() ) {

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

@ -79,6 +79,27 @@ function manageDelConfirmModalBtns() {
}); });
} }
function getEventDetailModal(eid) {
$j.getJSON(thisUrl + '?request=modal&modal=eventdetail&eids[]=' + eid)
.done(function(data) {
if ( $j('#eventDetailModal').length ) {
$j('#eventDetailModal').replaceWith(data.html);
} else {
$j("body").append(data.html);
}
$j('#eventDetailModal').modal('show');
// Manage the Save button
$j('#eventDetailSaveBtn').click(function(evt) {
evt.preventDefault();
$j('#eventDetailForm').submit();
});
})
.fail(function(jqxhr, textStatus, error) {
console.log("Request Failed: " + textStatus + ", " + error);
console.log("Response Text: " + jqxhr.responseText);
});
}
function initPage() { function initPage() {
var backBtn = $j('#backBtn'); var backBtn = $j('#backBtn');
var viewBtn = $j('#viewBtn'); var viewBtn = $j('#viewBtn');
@ -270,6 +291,13 @@ function initPage() {
$j('#deleteConfirm').modal('show'); $j('#deleteConfirm').modal('show');
}); });
// Manage the eventdetail links in the events list
$j(".eDetailLink").click(function(evt) {
evt.preventDefault();
var eid = $j(this).data('eid');
getEventDetailModal(eid);
});
// The table is initially given a hidden style, so now that we are done rendering, show it // The table is initially given a hidden style, so now that we are done rendering, show it
table.show(); table.show();
} }