ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

log viewer minor cleanup

merge-requests/7/head
Moe 2018-07-02 22:07:50 -07:00
parent 5893313e71
commit 876a9e66ae
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
web/libs/js/main.dash2.js
View File

@ -2883,25 +2883,28 @@ $.log.e.on('shown.bs.modal', function () {
$.log.lm.change() $.log.lm.change()
}) })
$.log.lm.change(function(){ $.log.lm.change(function(){
e = { e = {}
_this : this
}
e.v = $(this).val(); e.v = $(this).val();
e.urlSelector = e.v+'';
if(e.v === 'all'){ if(e.v === 'all'){
e.v='' e.urlSelector = ''
} }
e.dateRange = $.log.dateRange.data('daterangepicker'); e.dateRange = $.log.dateRange.data('daterangepicker');
$.log.loaded.startDate = e.dateRange.startDate $.log.loaded.startDate = e.dateRange.startDate
$.log.loaded.endDate = e.dateRange.endDate $.log.loaded.endDate = e.dateRange.endDate
var url = $.ccio.init('location',$user)+$user.auth_token+'/logs/'+$user.ke+'/'+e.v+'?start='+$.ccio.init('th',$.log.loaded.startDate)+'&end='+$.ccio.init('th',$.log.loaded.endDate) var url = $.ccio.init('location',$user)+$user.auth_token+'/logs/'+$user.ke+'/'+e.urlSelector+'?start='+$.ccio.init('th',$.log.loaded.startDate)+'&end='+$.ccio.init('th',$.log.loaded.endDate)
$.get(url,function(d){ $.get(url,function(d){
$.log.loaded.url = url $.log.loaded.url = url
$.log.loaded.query = $(e._this).val() $.log.loaded.query = e.v
$.log.loaded.rows = d $.log.loaded.rows = d
e.tmp=''; e.tmp='';
$.each(d,function(n,v){ if(d.length === 0){
e.tmp+='<tr class="search-row"><td title="'+v.time+'" class="livestamp"></td><td>'+v.time+'</td><td>'+v.mid+'</td><td>'+$.ccio.init('jsontoblock',v.info)+'</td></tr>' e.tmp = '<tr class="text-center"><td><%-cleanLang(lang.NoLogsFoundForDateRange)%></td></tr>'
}) }else{
$.each(d,function(n,v){
e.tmp+='<tr class="search-row"><td title="'+v.time+'" class="livestamp"></td><td>'+v.time+'</td><td>'+v.mid+'</td><td>'+$.ccio.init('jsontoblock',v.info)+'</td></tr>'
})
}
$.log.table.find('tbody').html(e.tmp) $.log.table.find('tbody').html(e.tmp)
// $.log.table.bootstrapTable() // $.log.table.bootstrapTable()
$.ccio.init('ls') $.ccio.init('ls')

2
web/pages/blocks/logs.ejs
View File

@ -22,7 +22,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<label><div><span><%-lang.Search%></span></div> <label><div><span><%-lang.Search%></span></div>
<div><input type="text" class="form-control search-controller" value="<%-lang.Search%>" /></div> <div><input type="text" class="form-control search-controller" placeholder="<%-lang.Search%>" /></div>
</label> </label>
</div> </div>
<div class="form-group"> <div class="form-group">