From b06e1d22e39551271e4d4a575556b576c09e5fa5 Mon Sep 17 00:00:00 2001 From: Welton Moura Date: Tue, 14 Jan 2025 16:53:07 -0300 Subject: [PATCH] feat: logout | testes permissoes | redirecionamento com base no gupo do usuario --- .../comandas/templates/viewcomanda.html | 11 ++++++++--- .../custom_filter_tag.cpython-313.pyc | Bin 909 -> 1232 bytes .../templatetags/custom_filter_tag.py | 7 ++++++- gestaoRaul/db.sqlite3 | Bin 266240 -> 266240 bytes .../home/__pycache__/views.cpython-313.pyc | Bin 3511 -> 3559 bytes gestaoRaul/home/templates/home.html | 1 + gestaoRaul/home/views.py | 2 +- .../login/__pycache__/views.cpython-313.pyc | Bin 1329 -> 1719 bytes gestaoRaul/login/views.py | 8 ++++++-- gestaoRaul/templates/base.html | 7 ++++++- 10 files changed, 28 insertions(+), 8 deletions(-) diff --git a/gestaoRaul/comandas/templates/viewcomanda.html b/gestaoRaul/comandas/templates/viewcomanda.html index e9f84d5..eaa8d1f 100644 --- a/gestaoRaul/comandas/templates/viewcomanda.html +++ b/gestaoRaul/comandas/templates/viewcomanda.html @@ -1,5 +1,7 @@ {% extends "base.html" %} {% load static %} +{% load custom_filter_tag %} + {% block 'title' %} @@ -41,12 +43,13 @@ Detalhes {{comanda.name}} {% endif %} - - + {% endif %} + + {% if user|groupUser:"Gerente" %} + {% endif %} +
diff --git a/gestaoRaul/comandas/templatetags/__pycache__/custom_filter_tag.cpython-313.pyc b/gestaoRaul/comandas/templatetags/__pycache__/custom_filter_tag.cpython-313.pyc index 4ff35c57c1851c4162599f51ff4a8db522817fdf..45dcd7014bb740351fe149a6b095c31581e1b5d8 100644 GIT binary patch delta 443 zcmeBWzre}&nU|M~0SM-9Z%gN9n#d=?IBlYOu3ijV5I;y56$G;dvsf|)vr93ULM4hg z(>XLbC(bZtT)FYgCPqfF$@NU>^|v_Fi}FhgLW@(2l9`ZjVZ)QZgFl44D! zTP&qO7v16lOUCCV=B5^dT&JK=Bnnc;nUPo=50)#E1M-D{xL6rTG%!5i=I^)ew7$+Q zdy!jqfz<_W*$doy*SSqEa+_Y}How4PUL+1w=cmbai!CK9F>msFCNq7I)kR_;0%X`q z2Cx!{MI1J{`6;D2sdhywKq*EbE)JdS&upUkfr*__@`DHi6IZ)@qx^*I2Kft&N*|dR P87)3DGcYNGSzvPjwoX^N delta 113 zcmcb>*~`xNnU|M~0SMk~uS@S>oX97^m@`p5mnEG|lYQbLV@A!5-!?HaicVh1l+Ns@ z$vK&W#YT$fe09LHNRhQpv3Z__AF56-0I|HPmqJCyM-U{G*uKrd{4prP~$XeV7_HsZn4 z61AskOcvk3Vo2o8>;>%V*~G~(Cf+>!PT%kMbNKvDFJh+`vG)(@vk#B9=(BGJU%M+w zDiralh|h@8?=u)5L;~M*qg;mI3`i$1Oag8r_-SVDQWP}}IO|P#`ZN@wrki}QX&tO0 zfRZeLEF^Kb93hxU5`?%^@WomSM0?5NZdn8`0&aF?ufI6)43L&Q$u;z$HuAli$Oqb+C+%JQVtw&kXykTIxBx>u?p2RlQ#WuUeopE$~((Q{?fFI!wM*KLk%SoN^3 zWrrkJOLq9Ze5>!~6+Sz*1a$xkgB{e8>Z+9$Rliazy4il!?ldZ$5zeM~r#6%`&~2OE zZpPjL`)Uf0^od9cO^tJXu@1a#qDi)PY#N2b)?QQ5pYWD}8-LxQ^wQlQNrd23dbW0c zeQ$+%#>|;3=4131vpu`-Tu0ZRhpP1d)P-+L!OQdb+v4TCcuD^d9xNX74?O%h#M1%$ SY4x3YLoe>mT)hc>j{OD_l&g~f delta 370 zcmZozAkeTtV1hKG_e2?IM(>RYi{g3qGcfa3GVoUNNAa0%HdM&wom`n)!e?P+Vr*q< zs%L3pU}|nY`FE}rM~ajSP%Tbqx%4jVu%l5x%fAurS}OH1h=;58pq2W&Z8_ zclamqdu$dgc)_Qs!tBdP$R!*gMU%B=Dm1&V-|oJi@uR;ms^J`R%#Mtcb!SPnr~YRI NVy5k>|CwhC008Y`a-0AF diff --git a/gestaoRaul/home/__pycache__/views.cpython-313.pyc b/gestaoRaul/home/__pycache__/views.cpython-313.pyc index 8b5acebc7b6fdfeb57c0c06a1f52a9c3901cdb4e..bb859bbd964af7b67765c609c02a2e313e64a670 100644 GIT binary patch delta 330 zcmdlk{al*&GcPX}0}$Nb+Lr!lBkvhj#z~WJv05?(u}@}X6P|pJU2w82n<66zkS8-a znvI{4Yw|)iVMgA`^*~V=dn=nfHy_9p5C{?gshIqUU3fApyXa&=X5q=s>|!jT>_HNf zuKv@WgR)(=cnN1m?Vyct*In^1}C!2FNNQ>NJEhx&& zE4jr|TAW&Ri!Hq-ujQoP8e Qc$rK23X96-XIvMV0L*$#7ytkO delta 349 zcmaDZyGflo6zxfgz7Ing_ySUDTYnzrrH5S&aK4699lD BMqU5_ diff --git a/gestaoRaul/home/templates/home.html b/gestaoRaul/home/templates/home.html index ac6f9cb..8f9ab30 100644 --- a/gestaoRaul/home/templates/home.html +++ b/gestaoRaul/home/templates/home.html @@ -3,6 +3,7 @@ + {% block 'head' %} diff --git a/gestaoRaul/home/views.py b/gestaoRaul/home/views.py index 594c90a..c47f3f1 100644 --- a/gestaoRaul/home/views.py +++ b/gestaoRaul/home/views.py @@ -26,7 +26,7 @@ def home(request): @group_required(groupName='Gerente') def chartCuisine(request): - print(request.user.id) + print(request.user.groups.all()) print(request.user.is_authenticated) # fulano = User() tFila = [] diff --git a/gestaoRaul/login/__pycache__/views.cpython-313.pyc b/gestaoRaul/login/__pycache__/views.cpython-313.pyc index 711f8781a011cd6aff1cc25f002930981c1bf019..57bc2bdfcd049ceb21919fac0d34c09c3953b16b 100644 GIT binary patch delta 586 zcmdnUwVjvmGcPX}0}$BlYfE3vvXL*Fk&%6J6{9(m8`I>?jEamuCtqdsXTHF|Fgcb< zdvXv{m~1ZtLo`1~3kXE8m@+|F3JjqPK?0K#nS>dIK%}%NL>!q6W(#JwWDF9Y%*dp~ zkz&R`j1~^K7G+g#pw*Hv1A{qD86j*HWKpikXPK1crD3W<8G^Zkc|sWt7)_aBsx^5h z^D`S*vpS~aX69)!-eSp1%uT(;?w(qdnpcu~izOo;$mK}R&rQrrNi447%E?d9%+t## z$<4XNl9peTtI0Pxg4r_j7E5VyYSAsW^rHOIg5q0jX_+}CAbx5^W^qYz5ev||B9NV$ ztVN(8E|LHdf*?W&M92b(Vpbrb00KoozcJi`SQTHEnOa_?2o&G}srfSbE^}VW4H4<- zJ`;Vei>O}|QNJ#tcTq%dgZl*$y$d2X*F~H!ia1{valI(wdP4oY&Pko?Ua=RwVy}Cp zT=Yu0kX3vENP3lA_o}|=Rejy7_M%tq9ckqSZkMICFNkPA0W!TVOY2_{(VrZ~GMQ0v y@+%f8T{WQ1px`YAh2#fjMn=Z_47&FjtS>THKV`7^#Ky!Z`kQb zJvoReOjV45A(|hg1q32kOqn1o1%_xr2#bLsm~HZIW@UL{7(bLDm_3*yl+l3Elo=wX z!l21H`7g79BuhqqZfX@*PJVi3o?b>tZq6;1wEUu6O|HoqES5e+EI{Q&AU&F_MId(; ziGT=@MMXkD;ucG3acWU9E0C!G0!7>)L5OMbWtpkvMN&WkkYMrb$y}^?+;_y~7qDFx sSHB>jKKTyoWJamU1#D7`@{_ySq=fD=SbSn*VwC;NCB$f1#0%5}0C|u-BLDyZ diff --git a/gestaoRaul/login/views.py b/gestaoRaul/login/views.py index aee3e67..6b6289d 100644 --- a/gestaoRaul/login/views.py +++ b/gestaoRaul/login/views.py @@ -1,11 +1,12 @@ from django.shortcuts import render, redirect from django.contrib.auth import authenticate, login, logout + from django.contrib.auth.forms import AuthenticationForm def logout_view(request): logout(request) - return redirect('login') + return redirect('login') def login_view(request): @@ -17,7 +18,10 @@ def login_view(request): user = authenticate(username=username, password=password) if user is not None: login(request, user) - return redirect('home') + if request.user.groups.filter(name='Admin').exists() or request.user.groups.filter(name='Gerente').exists() : + return redirect('home') + else: + return redirect('comandas') else: pass # Mensagem de erro: Credenciais inválidas diff --git a/gestaoRaul/templates/base.html b/gestaoRaul/templates/base.html index d8a904c..ed6e18f 100644 --- a/gestaoRaul/templates/base.html +++ b/gestaoRaul/templates/base.html @@ -1,4 +1,6 @@ {% load static %} +{% load custom_filter_tag %} + @@ -21,14 +23,15 @@