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

We always return an associative array now

pull/2112/head
Isaac Connor 2018-05-18 09:04:47 -04:00
parent 25703fb2d4
commit 8276386a44
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/api/app/Plugin/Crud

@ -1 +1 @@
Subproject commit c3976f1478c681b0bbc132ec3a3e82c3984eeed5
Subproject commit 0bd63fb464957080ead342db58ca9e01532cf1ef

11
web/skins/classic/views/js/log.js
View File

@ -229,21 +229,22 @@ function updateFilterSelectors() {
if ( key == 'Level' ) {
Object.each(values,
function( value, label ) {
selector.options[selector.options.length] = new Option( value, label );
selector.options[selector.options.length] = new Option(value, label);
}
);
} else if ( key == 'ServerId' ) {
Object.each(values,
function( value, label ) {
selector.options[selector.options.length] = new Option( value, label );
selector.options[selector.options.length] = new Option(value, label);
}
);
} else {
values.each(
function( value ) {
selector.options[selector.options.length] = new Option( value );
Object.each(values,
function( value, label ) {
selector.options[selector.options.length] = new Option(value, label);
}
);
}
}
if ( filter[key] )
selector.set('value', filter[key]);