Private GIT

Skip to content
Snippets Groups Projects
Commit 5dd4ecdb authored by Alexis Tyler's avatar Alexis Tyler
Browse files

Fixes viewlogs not keeping url state

parent 8e636e33
No related branches found
No related tags found
No related merge requests found
...@@ -19,6 +19,7 @@ function(){ ...@@ -19,6 +19,7 @@ function(){
$('#logSearch').prop('disabled', true); $('#logSearch').prop('disabled', true);
url = '${sbRoot}/errorlogs/viewlog/?minLevel='+$('select[name=minLevel]').val()+'&logFilter='+$('select[name=logFilter]').val()+'&logSearch='+$('#logSearch').val() url = '${sbRoot}/errorlogs/viewlog/?minLevel='+$('select[name=minLevel]').val()+'&logFilter='+$('select[name=logFilter]').val()+'&logSearch='+$('#logSearch').val()
$.get(url, function(data){ $.get(url, function(data){
history.pushState('data', '', url);
$('pre').html($(data).find('pre').html()); $('pre').html($(data).find('pre').html());
$('#minLevel').removeProp('disabled'); $('#minLevel').removeProp('disabled');
$('#logFilter').removeProp('disabled'); $('#logFilter').removeProp('disabled');
...@@ -40,14 +41,20 @@ function(){ ...@@ -40,14 +41,20 @@ function(){
document.body.style.cursor='default'; document.body.style.cursor='default';
}); });
$('#logSearch').keyup(function() { $('#logSearch').on('keyup', function() {
if ( $('#logSearch').val().length == 0 ) { if ( $('#logSearch').val().length == 0 ) {
$('#logFilter option[value=\\<NONE\\>]').prop('selected', true); $('#logFilter option[value=<NONE>]').prop('selected', true);
$('#minLevel option[value=20]').prop('selected', true); $('#minLevel option[value=20]').prop('selected', true);
$('#minLevel').prop('disabled', false); $('#minLevel').prop('disabled', false);
$('#logFilter').prop('disabled', false); $('#logFilter').prop('disabled', false);
url = '${sbRoot}/errorlogs/viewlog/?minLevel='+$('select[name=minLevel]').val()+'&logFilter='+$('select[name=logFilter]').val()+'&logSearch='+$('#logSearch').val() url = '${sbRoot}/errorlogs/viewlog/?minLevel='+$('select[name=minLevel]').val()+'&logFilter='+$('select[name=logFilter]').val()+'&logSearch='+$('#logSearch').val()
window.location.href = url $.get(url, function(data){
history.pushState('data', '', url);
$('pre').html($(data).find('pre').html());
$('#minLevel').removeProp('disabled');
$('#logFilter').removeProp('disabled');
$('#logSearch').removeProp('disabled');
});
} else { } else {
$('#minLevel').prop('disabled', true); $('#minLevel').prop('disabled', true);
$('#logFilter').prop('disabled', true); $('#logFilter').prop('disabled', true);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment