From 5720bd296dbd5f0459ea53c12d488999193801da Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 16 Apr 2012 12:21:12 +0200
Subject: merge log into admin

---
 settings/js/log.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'settings/js/log.js')

diff --git a/settings/js/log.js b/settings/js/log.js
index ae83f0a6283..bccf2c88269 100644
--- a/settings/js/log.js
+++ b/settings/js/log.js
@@ -6,14 +6,15 @@
 
 OC.Log={
 	levels:['Debug','Info','Warning','Error','Fatal'],
-	loaded:50,//are initially loaded
+	loaded:3,//are initially loaded
 	getMore:function(){
-		$.get(OC.filePath('settings','ajax','getlog.php'),{offset:OC.Log.loaded},function(result){
+		$.get(OC.filePath('settings','ajax','getlog.php'),{offset:OC.Log.loaded,count:10},function(result){
 			if(result.status=='success'){
 				OC.Log.addEntries(result.data);
+				$('html, body').animate({scrollTop: $(document).height()}, 800);
 			}
 		});
-		OC.Log.loaded+=50;
+		OC.Log.loaded+=10;
 	},
 	addEntries:function(entries){
 		for(var i=0;i<entries.length;i++){
-- 
cgit v1.2.3


From e59c87ee3691b85ef747dc50518f250fdd00af37 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 16 Apr 2012 12:27:21 +0200
Subject: reload log after changing log level

---
 settings/js/admin.js |  4 +++-
 settings/js/log.js   | 17 ++++++++++++++---
 2 files changed, 17 insertions(+), 4 deletions(-)

(limited to 'settings/js/log.js')

diff --git a/settings/js/admin.js b/settings/js/admin.js
index a3585f7e1c2..4f295ab6f5d 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -1,5 +1,7 @@
 $(document).ready(function(){
 	$('#loglevel').change(function(){
-		$.post(OC.filePath('settings','ajax','setloglevel.php'), { level: $(this).val() } );
+		$.post(OC.filePath('settings','ajax','setloglevel.php'), { level: $(this).val() },function(){
+			OC.Log.reload();
+		} );
 	})
 });
\ No newline at end of file
diff --git a/settings/js/log.js b/settings/js/log.js
index bccf2c88269..5dd9c94ae0c 100644
--- a/settings/js/log.js
+++ b/settings/js/log.js
@@ -5,16 +5,27 @@
  */
 
 OC.Log={
+	reload:function(count){
+		if(!count){
+			count=OC.Log.loaded;
+		}
+		OC.Log.loaded=0;
+		$('#log tbody').empty();
+		OC.Log.getMore(count);
+	},
 	levels:['Debug','Info','Warning','Error','Fatal'],
 	loaded:3,//are initially loaded
-	getMore:function(){
-		$.get(OC.filePath('settings','ajax','getlog.php'),{offset:OC.Log.loaded,count:10},function(result){
+	getMore:function(count){
+		if(!count){
+			count=10;
+		}
+		$.get(OC.filePath('settings','ajax','getlog.php'),{offset:OC.Log.loaded,count:count},function(result){
 			if(result.status=='success'){
 				OC.Log.addEntries(result.data);
 				$('html, body').animate({scrollTop: $(document).height()}, 800);
 			}
 		});
-		OC.Log.loaded+=10;
+		OC.Log.loaded+=count;
 	},
 	addEntries:function(entries){
 		for(var i=0;i<entries.length;i++){
-- 
cgit v1.2.3


From 31d623f426ac7475588b771036ecfeb2f69b9fe5 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Wed, 2 May 2012 15:26:42 -0400
Subject: Fix log viewing bug

---
 lib/log/owncloud.php | 2 +-
 settings/js/log.js   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'settings/js/log.js')

diff --git a/lib/log/owncloud.php b/lib/log/owncloud.php
index 881c67d2664..0b7a231d304 100644
--- a/lib/log/owncloud.php
+++ b/lib/log/owncloud.php
@@ -73,7 +73,7 @@ class OC_Log_Owncloud {
 		$end=max(count($contents)-$offset-1, 0);
 		$start=max($end-$limit,0);
 		$i=$end;
-		while(count($entries)<$limit){
+		while($i>$start){
 			$entry=json_decode($contents[$i]);
 			if($entry->level>=$minLevel){
 				$entries[]=$entry;
diff --git a/settings/js/log.js b/settings/js/log.js
index 5dd9c94ae0c..6063c7d9a9f 100644
--- a/settings/js/log.js
+++ b/settings/js/log.js
@@ -25,7 +25,6 @@ OC.Log={
 				$('html, body').animate({scrollTop: $(document).height()}, 800);
 			}
 		});
-		OC.Log.loaded+=count;
 	},
 	addEntries:function(entries){
 		for(var i=0;i<entries.length;i++){
@@ -48,6 +47,7 @@ OC.Log={
 			row.append(timeTd);
 			$('#log').append(row);
 		}
+		OC.Log.loaded += entries.length;
 	}
 }
 
-- 
cgit v1.2.3