summaryrefslogtreecommitdiffstats
path: root/settings/js
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2015-01-09 00:33:22 +0100
committerMorris Jobke <hey@morrisjobke.de>2015-01-09 00:33:22 +0100
commit6a5f12beca175a0b9a951fa844eacfd21a8df3de (patch)
tree8e1b1b00109daaa1c7dd1f24f3f585d94c7a5b52 /settings/js
parent5311d92c5c9dc0de297e36e4009b1e99f386e6bd (diff)
parentf579f2bd948ca73a1af720e19517af9bdde11748 (diff)
downloadnextcloud-server-6a5f12beca175a0b9a951fa844eacfd21a8df3de.tar.gz
nextcloud-server-6a5f12beca175a0b9a951fa844eacfd21a8df3de.zip
Merge pull request #12988 from owncloud/logfile_download
Logfile download
Diffstat (limited to 'settings/js')
-rw-r--r--settings/js/admin.js2
-rw-r--r--settings/js/log.js12
2 files changed, 6 insertions, 8 deletions
diff --git a/settings/js/admin.js b/settings/js/admin.js
index 059e48ebabe..d00d083407f 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -34,7 +34,7 @@ $(document).ready(function(){
$('#loglevel').change(function(){
- $.post(OC.filePath('settings','ajax','setloglevel.php'), { level: $(this).val() },function(){
+ $.post(OC.generateUrl('/settings/admin/log/level'), {level: $(this).val()},function(){
OC.Log.reload();
} );
});
diff --git a/settings/js/log.js b/settings/js/log.js
index 46d1bfefd5f..c3a9a201e83 100644
--- a/settings/js/log.js
+++ b/settings/js/log.js
@@ -20,14 +20,12 @@ OC.Log = {
loaded: 3,//are initially loaded
getMore: function (count) {
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);
- if (!result.remain) {
- $('#moreLog').hide();
- }
- $('#lessLog').show();
+ $.get(OC.generateUrl('/settings/admin/log/entries'), {offset: OC.Log.loaded, count: count}, function (result) {
+ OC.Log.addEntries(result.data);
+ if (!result.remain) {
+ $('#moreLog').hide();
}
+ $('#lessLog').show();
});
},
showLess: function (count) {