backport 1bccc80996e270f928c207cdd3090f4284abaea5

diff --git a/settings/admin.php b/settings/admin.php
index a6928bf82de5fe368630495f4833f2febbe478a9..5ef9daee18d3e50ed980a6b6ce22c903dbcd899b 100644 (file)
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -18,6 +18,8 @@ $forms=OC_App::getForms('admin');
 $htaccessworking=OC_Util::ishtaccessworking();
 
 $entries=OC_Log_Owncloud::getEntries(3);
+$entriesremain=(count(OC_Log_Owncloud::getEntries(4)) > 3)?true:false;
+
 function compareEntries($a,$b){
        return $b->time - $a->time;
 }
@@ -25,6 +27,7 @@ usort($entries, 'compareEntries');
 
 $tmpl->assign('loglevel',OC_Config::getValue( "loglevel", 2 ));
 $tmpl->assign('entries',OC_Util::sanitizeHTML($entries));
+$tmpl->assign('entriesremain', $entriesremain);
 $tmpl->assign('htaccessworking',$htaccessworking);
 $tmpl->assign('forms',array());
 foreach($forms as $form){

diff --git a/settings/ajax/getlog.php b/settings/ajax/getlog.php
index d9e80de37bac1a54836b5c6f918ec79ebcc67c98..d5af22ac339f28fdd4c8e4cbfd712ba5b9ed246a 100644 (file)
--- a/settings/ajax/getlog.php
+++ b/settings/ajax/getlog.php
@@ -14,4 +14,4 @@ $count=(isset($_GET['count']))?$_GET['count']:50;
 $offset=(isset($_GET['offset']))?$_GET['offset']:0;
 
 $entries=OC_Log_Owncloud::getEntries($count,$offset);
-OC_JSON::success(array("data" => OC_Util::sanitizeHTML($entries)));
+OC_JSON::success(array("data" => OC_Util::sanitizeHTML($entries), "remain"=>(count(OC_Log_Owncloud::getEntries(1,$offset + $offset)) != 0)?true:false));

diff --git a/settings/js/log.js b/settings/js/log.js
index fe2e92f7a867f04fd08361d0f794432f4fd55ea0..04a7bf8b2881fff567920181c02563596d9434ec 100644 (file)
--- a/settings/js/log.js
+++ b/settings/js/log.js
@@ -23,6 +23,9 @@ OC.Log={
                        if(result.status=='success'){
                                OC.Log.addEntries(result.data);
                                $('html, body').animate({scrollTop: $(document).height()}, 800);
+                               if(!result.remain){
+                                       $('#moreLog').css('display', 'none');
+                               }
                        }
                });
        },

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index f8c515369e6b5e8acecadbc252aec354f2310d13..82ee7e84838cd4a49225087ef0b99a70c8181e58 100644 (file)
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -50,5 +50,8 @@ if(!$_['htaccessworking']) {
                </tr>
        <?php endforeach;?>
 </table>
+<?php if($_['entriesremain']): ?>
 <input id='moreLog' type='button' value='<?php echo $l->t('More');?>...'></input>
+<?php endif; ?>
+
 </fieldset>