From 5290a6a12a19494235b94e450f967f91881f611b Mon Sep 17 00:00:00 2001 From: Russ Handorf Date: Mon, 19 Dec 2022 18:24:17 -0500 Subject: [PATCH] improvements --- .../dbview/__pycache__/views.cpython-38.pyc | Bin 2041 -> 3633 bytes logviewer/dbview/alerts.json | 2 +- logviewer/dbview/alerts_view.json | 2 +- logviewer/dbview/devices.json | 2 +- logviewer/dbview/test_alerts.json | 1 + logviewer/dbview/views.py | 83 +++++++++++++++--- .../__pycache__/views.cpython-38.pyc | Bin 854 -> 906 bytes logviewer/kiscontent/views.py | 3 +- .../logviewer/__pycache__/urls.cpython-38.pyc | Bin 1743 -> 1825 bytes logviewer/logviewer/urls.py | 2 + logviewer/test.json | 1 + 11 files changed, 82 insertions(+), 14 deletions(-) create mode 100644 logviewer/dbview/test_alerts.json create mode 100644 logviewer/test.json diff --git a/logviewer/dbview/__pycache__/views.cpython-38.pyc b/logviewer/dbview/__pycache__/views.cpython-38.pyc index 4add98a0b87bd3788a19ba31019983843e545f29..a3dcda134c6975a00c0143396310caeef0ad5cbb 100644 GIT binary patch literal 3633 zcmb7HUvC@75x+eikAFqVl441%9W#oYm?_1h=*o2x*Rd-*wNOVc<2_5!MU3jEF)!+V2y_H$kr8GP=_u&q=4pT_h(bj{&WWVI5w!3?Hr?BaB|7 z0gBME{#qO8k$#+twAbj^fKe)v_Vvy1*H$~|5R0~*E)M99wdb)8;VXWyd*G2nLam7& zvwjuxn~i33wb{72(rm7*-B`JPV`a4-Ppzg!hVAAEF9tlm2k89#7v z3qLJLY@}ul<@GEoAvz8H2^eRAkcL;m_y+(q(w;#w?CJDBo;0{~_>yd?x>r;{RpB&&!FQ z3upQH3hn!+JbnL6&#r)Go&HT}t|$a@_=7<{$^im@9~7cIUV?dfXg{3Sq5@uC)F8^M zl7>GT6oK;bqK2<2|Nb*ZsVcoC{K-h>CyG+RwGm}SQJT0uqF9P@4>v}XRYm!YqU3QC zd?*g>gHP8b`ryM)7i09-5?^n~7BKiH$P8CY#_+RKt94V#!D{6vR_jw`Q^0C`cIIk) z4*V2-sxZ5yFq?{|qz{lSCH!;nsHAe?HfS#^sV|h&bTkd9E(|V27eI0*Dn~O(UX@>^ z_Af={k*{Uw-%+u}nq*d$!O!x9pLdlXA?%7@4Cz>d0=2#wUbZkf@La;;4Q)ZqXvJIm z84J4M7w4`ErxfHkdCo1V3+ihTY7i$~-r`3+5-wQmh;h=f`i#&P;|}k$y0Uur+*ZG* zV%}neF(`JH+a~T_ixJ-MwSv9y%EMsS>sG*%9dEZ!39i6MPESbT+^LyRp}lTch^HMm zzK6qtg^#*U$8*8mu*QfFMYw`J#=Wk~ugTyTr(SorTG^pNr-B{su%J%?KqJxf!RrnZ^fl$t@Lke~Y zwtR>274E_RStDV^rmiLkxWKo|6(cr534Ie-3P#yKC3)=gK8)L zg(tkcU8zlqNMis)rw4KZ4Z>xs*FKW(%|>%|)q(}a!^Bnn*q?J?oP<6$d3KnU;|Y1| z++dE+UKj!y1EKbp^7IXY;J3r87DUOMUGlUKt2hR7LQZzYasu-waaIkPm3#LeuUCAp z``Ns0DfvUL8U_#!tGi{4#9;?4=WVOVYa+Y8wej`F`rU^ob8<@h{?^u`t#J7VEbjQu zE|Uhs4}U;P=7AKV@=*2$Ert4^7A|eqDrd|Y&zVrK48nOR0S+9Ld^YODd2;*Qt2$H^ z&%g5h+Bu}e0v`-FM$qr_YjL3+)`Ym~hBGf9D&htdv#$g0_z-1SfVgDMfc}$kb*Mvb zu2{vX?UfYpBn8$Q;g#*$5~j`}%wMYwwSVdPoItsg24*dC0A*OFo9eLoAq({<+trLP zdJb<3Bj}MXmCLRUal(*$Riq$2gdy>*&Wa2r>fCJSMit*KjFn+Hv&SLYIdwqX@qA*N z@eZ(ys!h^Oq}9kSGRQrjwA4sshxsi^li4XU$ygXNdF&jQxV691d)>a#B&P8*r@I@}Sv#N{ zE&z<`zz~Im+=e?(yqI!R3q4@egbw{kjtp6_h1u)D&gbG%G9^9&V40W>4=Ah4n-P^~ pca;#z@ECyd4nY-)*;}0e_kD6(?o=kLKoK04psAl;)Uz2K{SO7EG*AEl delta 632 zcmdle^OIjYl$V!_0SNZYn4jDUWIYCPkO32r;{e3P1{1Y4cv(_dTNt9)Qka7oG}$K3 z(3MGML{iKGWP`9XNPP|CWOJtM`nnRv6rN_rTILd_8s-$<6qa75V1^ooEQS=mY^I_) zKv{mEEE7oS!#2gJb*TYwVhnA95IRLnI;McAOfMw{scs=B5@GC#I(s zLqz9tRWsTG4K-9uNiEAvh6-yk-(o39EXlaVl3$RTSHuhqX-$^NpShLzICJt7Q{vMy zb5d6_6md@8$7r9xnwgi9TEPm64KE(DLmOsMHwYbHB2eI zDeS#W!3;GZIXl$e~)*rv+{bZ!-!ep-HBNpTeih|(`9Nqflx6pms6ajUq%g5~*XX-1O; bnD)xZfqcj)#3;bX1I9v78pNOcl&KH^+VVe{ delta 219 zcmeBTzsANJ%FD~e00c=>=O_D42kf>X+xIr5U|s0}4-eVA?Ao1#&i{5TgJi4>D$&EXiC5 E09DH}YybcN diff --git a/logviewer/kiscontent/views.py b/logviewer/kiscontent/views.py index b7fe742..668b06e 100644 --- a/logviewer/kiscontent/views.py +++ b/logviewer/kiscontent/views.py @@ -8,11 +8,12 @@ def index(request, loadfile): return HttpResponse(load_file, content_type='application/javascript') elif loadfile[-3:] == "css": return HttpResponse(load_file, content_type='text/css') + elif request.path[:6] == "/fonts": + return HttpResponse(load_file, content_type='font/ttf') elif loadfile[:4] == "font": return HttpResponse(load_file, content_type='font/woff2') elif loadfile[:6] == "images": return HttpResponse(load_file, content_type='image/png') - if request.path[0:11] == "/css/images": return HttpResponse(load_file, content_type='image/png') elif request.path[0:7] == "/images": diff --git a/logviewer/logviewer/__pycache__/urls.cpython-38.pyc b/logviewer/logviewer/__pycache__/urls.cpython-38.pyc index 464746e51e52a21f3826adc07caa0211d0bde3ad..199b310a11feecb2ca1216083379292ee7ec0ba5 100644 GIT binary patch delta 448 zcmX@lyO2*il$V!_0SGEzFG%L&U|@I*;vfS_AjbiSi)|)qE7zwmrm*C&<+4YyGcu&I zrm&{6q_8zJHZuX)?5Rvy99f)THV06g6DrPy#O6j~^B}Q#k=T4dHa}Fa01{ge$gYP; z2q8%b1KBXkM3C5`NNh1Awm6UtGe-hRToQ>bg~XOduoY5d5S$cQ7&~1oiYrAfm_bv1 za|q)!CIL;xTRa{mB?UpL#Rd6!#i^TLF>^49R|%z-rRJ3+l@{xR8O3_##eSOHlfSZ> z@o}eQCFZ5)>tz6S6|qiMXOm~+1qON%?_?h~e;yMclZBs$QGk($dGba!*~tgk_!wUS E0JUUjb^rhX delta 370 zcmZ3;cb-=}l$V!_0SF$>n4i3noq^#oh=U9yfE))PE>@YStz4hVn!=LGlET`|*vtfE zv!ya+v1PG?+3Y}Z4yZUM5}ON&&5gw7L1Oa)*?dsF{77s8B(@-sT@O