Merge pull request #3094 from owncloud/log-ajax
fix logical issue while retrieving log via ajax
This commit is contained in:
commit
63b2699720
|
@ -20,11 +20,6 @@ $htaccessworking=OC_Util::ishtaccessworking();
|
||||||
$entries=OC_Log_Owncloud::getEntries(3);
|
$entries=OC_Log_Owncloud::getEntries(3);
|
||||||
$entriesremain=(count(OC_Log_Owncloud::getEntries(4)) > 3)?true:false;
|
$entriesremain=(count(OC_Log_Owncloud::getEntries(4)) > 3)?true:false;
|
||||||
|
|
||||||
function compareEntries($a, $b) {
|
|
||||||
return $b->time - $a->time;
|
|
||||||
}
|
|
||||||
usort($entries, 'compareEntries');
|
|
||||||
|
|
||||||
$tmpl->assign('loglevel', OC_Config::getValue( "loglevel", 2 ));
|
$tmpl->assign('loglevel', OC_Config::getValue( "loglevel", 2 ));
|
||||||
$tmpl->assign('entries', $entries);
|
$tmpl->assign('entries', $entries);
|
||||||
$tmpl->assign('entriesremain', $entriesremain);
|
$tmpl->assign('entriesremain', $entriesremain);
|
||||||
|
|
|
@ -13,6 +13,9 @@ $offset=(isset($_GET['offset']))?$_GET['offset']:0;
|
||||||
$entries=OC_Log_Owncloud::getEntries($count, $offset);
|
$entries=OC_Log_Owncloud::getEntries($count, $offset);
|
||||||
$data = array();
|
$data = array();
|
||||||
|
|
||||||
OC_JSON::success(array(
|
OC_JSON::success(
|
||||||
|
array(
|
||||||
"data" => $entries,
|
"data" => $entries,
|
||||||
"remain"=>(count(OC_Log_Owncloud::getEntries(1, $offset + $offset)) != 0) ? true : false));
|
"remain"=>(count(OC_Log_Owncloud::getEntries(1, $offset + $count)) != 0) ? true : false
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
Loading…
Reference in New Issue