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

Merge branch 'storageareas' into zma_to_thread

pull/3122/head
Isaac Connor 2018-01-16 17:55:08 -05:00
parent d87e691363 fe7c54bc26
commit b35e6adc8f
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/ZoneMinder/lib/ZoneMinder/Event.pm
View File

@ -476,13 +476,13 @@ sub MoveTo {
last;
}
} # end foreach file.
return $error if $error;
if ( ! $error ) {
# Succeeded in copying all files, so we may now update the Event.
$$self{StorageId} = $$NewStorage{Id};
$$self{Storage} = $NewStorage;
$error .= $self->save();
}
# Succeeded in copying all files, so we may now update the Event.
$$self{StorageId} = $$NewStorage{Id};
$$self{Storage} = $NewStorage;
$error .= $self->save();
return $error if $error;
$self->delete_files( $OldStorage );
return $error;
} # end sub MoveTo

2
web/includes/Storage.php
View File

@ -120,7 +120,7 @@ public static function find_all( $parameters = null, $options = null ) {
}
$used = $this->disk_used_space();
$usage = round( ($used / $total) * 100);
Warning("Used $usage = round( ( $used / $total ) * 100 )");
Logger::Debug("Used $usage = round( ( $used / $total ) * 100 )");
return $usage;
}
public function disk_total_space() {

4
web/skins/classic/views/js/montagereview.js
View File

@ -59,13 +59,13 @@ function SetImageSource( monId, time ) {
if ( storage.ServerId ) {
var server = Servers[storage.ServerId];
if ( server ) {
console.log( server.Hostname + " for event " + eId[i] );
//console.log( server.Hostname + " for event " + eId[i] );
return location.protocol + '//' + server.Hostname + '/index.php?view=image&eid=' + eId[i] + '&fid='+frame + "&width=" + monitorCanvasObj[monId].width + "&height=" + monitorCanvasObj[monId].height;
} else {
console.log("No server found for " + storage.ServerId );
}
}
console.log("No storage found for " + eStorageId[i] );
//console.log("No storage found for " + eStorageId[i] );
return "index.php?view=image&eid=" + eId[i] + '&fid='+frame + "&width=" + monitorCanvasObj[monId].width + "&height=" + monitorCanvasObj[monId].height;
}
} // end for