ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'release-1.34'

This commit is contained in:
Isaac Connor 2021-04-20 09:24:49 -04:00
parent ff2017d8b0 ed39ffeeb6
commit 79cede7cac
2 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/zmaudit.pl.in
View File

@ -308,7 +308,7 @@ MAIN: while( $loop ) {
} else { } else {
my $full_path = join('/', $Storage->Path(), $day_dir, $event_path); my $full_path = join('/', $Storage->Path(), $day_dir, $event_path);
# Check storage id # Check storage id
if ( !$Event->Storage()->Id() ) { if ( $Storage->Id() and !$Event->Storage()->Id() ) {
Info("Correcting StorageId for event $$Event{Id} from $$Event{StorageId} $$Event{Path} to $$Storage{Id} $full_path"); Info("Correcting StorageId for event $$Event{Id} from $$Event{StorageId} $$Event{Path} to $$Storage{Id} $full_path");
$Event->save({ StorageId=>$Storage->Id() }); $Event->save({ StorageId=>$Storage->Id() });
$Event->Path(undef); $Event->Path(undef);

22
web/skins/classic/js/skin.js
View File

@ -126,28 +126,6 @@ function dataOnClick() {
window[fnName](ev); window[fnName](ev);
}; };
}); });
document.querySelectorAll("button[data-on-mousedown]").forEach(function(el) {
var fnName = el.getAttribute("data-on-mousedown");
if ( !window[fnName] ) {
console.error("Nothing found to bind to " + fnName + " on element " + el.name);
return;
}
el.onmousedown = function(ev) {
window[fnName](ev);
};
});
document.querySelectorAll("button[data-on-mouseup]").forEach(function(el) {
var fnName = el.getAttribute("data-on-mouseup");
if ( !window[fnName] ) {
console.error("Nothing found to bind to " + fnName + " on element " + el.name);
return;
}
el.onmouseup = function(ev) {
window[fnName](ev);
};
});
} }