diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templates/menu.html" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templates/menu.html"
new file mode 100644
index 0000000..2cbdf6f
--- /dev/null
+++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templates/menu.html"
@@ -0,0 +1,6 @@
+
\ No newline at end of file
diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templatetags/__init__.py" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templatetags/__init__.py"
new file mode 100644
index 0000000..9169e02
--- /dev/null
+++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templatetags/__init__.py"
@@ -0,0 +1,11 @@
+#!/user/bin/env python
+# -*- encoding:utf-8 -*-
+'''
+# @Time : 2019/7/12 19:25
+# @Author : John Wang
+# @Site :
+# @File : __init__.py.py
+# @Software: PyCharm
+# @Contact : 635602689@qq.com
+# @License : (C)Copyright 2019-2020, John Wang
+'''
diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templatetags/__pycache__/__init__.cpython-36.pyc" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templatetags/__pycache__/__init__.cpython-36.pyc"
new file mode 100644
index 0000000000000000000000000000000000000000..7ab8148e15a3173f39756350eec0b0c0ddbb60e4
GIT binary patch
literal 375
zcmYjN(MrQG6io->nCu?{zO3N3He=Nmkx7RSGDMspNF~HJYol$_r5U4sfqsIYuwM{-
z@-O!4!@j_G)3S$Nat}H8+#Al#sN3zBy!Uiq0PqVMp*fi7EZQ0(@CYJf4$RiuPv;m;
z?pa2m4i6&Bc88}!8$sLk(6|yWS1J**60b$V;RE4uRh~1opQ+dtOZN<8#+kx+keB+@
zonoQZL{bmlmVQEHRuz506$zDo)ftT)3pr=*WVsxKqE=@tq`aV7g|O$FzQ{|-;zZT{
z`p81oNyE*JX>1QMjzoy@2FRA)u!g@oeVckgA~L!b@->*gX!Bx5iR6sOLAqKjN}N-f
uv7%st_jjAG-RJl2<2_i@=RnacPl=+6#6{3pYui50M6^oj#ZmR4I>A2{M`^$S
literal 0
HcmV?d00001
diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templatetags/__pycache__/my_tags.cpython-36.pyc" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templatetags/__pycache__/my_tags.cpython-36.pyc"
new file mode 100644
index 0000000000000000000000000000000000000000..95f9fed4cb7d13c1443018e10a5ddf38551fba0b
GIT binary patch
literal 643
zcmYjO%Wl&^6rDTcS4x8_KuBz>E{Fu#utQaaM6y7X@Q4s1a%H*pB(WLW>CBjt;;hU9
zK7mi@CxFD3kC-ish!0@T9V4WUbkCf7C7(I>_(8wF^R2#n@)HR8MXnr%{1KKqLP$vp
zf)p?Vu$&57uo>$(6VA-xkh?9JdECqW)M+7gQ|}XLVHTupN(TOK)F1;ef#$_Z#F|^K
zxYk*@P?L*Z!OMEM)P+dUMt2-U7wa*WdWF!CoaCTs&RW=jb{c5W3{Kq*{cx{=5ji>7
zFl`M$9yBbachEpXTPpWchP`u0UXZi>Hzai%$N+75lMD87b6{94h4JD
$A
zI!lqrlpgequeefKRT{S7TH0jH-m~%Kbu=AMr%#?wqNn4x#$Cy*)TXzJ^)kxJd1a_X
zxgyrd(s=VqA{#iym;9{eN=qMQq+QcMc1h$7WPe^Fj2?!|s^I69d>4-LxLj1nJeDOU
z6^eR3Uq>r0i>&i=e|!0T`}N26%jfW%pN9X#)$u}w#X7S0aJ4p$jkkx=Y7c?X>kxnk
zJ8-+Z
cU9P}Q`)P1kRB0{vk^RFeK-i_b5YT}A1#kAPkpKVy
literal 0
HcmV?d00001
diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templatetags/my_tags.py" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templatetags/my_tags.py"
new file mode 100644
index 0000000..03793c2
--- /dev/null
+++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/templatetags/my_tags.py"
@@ -0,0 +1,18 @@
+from django import template
+
+from django.conf import settings
+import re
+
+register = template.Library()
+
+
+@register.inclusion_tag('menu.html')
+def menu(request):
+ menu_list = request.session.get(settings.MENU_SESSION_KEY)
+ print(menu_list)
+ url = request.path_info
+ for i in menu_list:
+ if re.match(r'{}$'.format(i['url']), url):
+ i['class'] = 'active'
+ break
+ return {'menu_list': menu_list}
diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/views/__pycache__/auth.cpython-36.pyc" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/views/__pycache__/auth.cpython-36.pyc"
index 5b222d42c8882d281c2d1abd7bd16024df800e5e..9419b79ba54d9b63a848373cf362fd8827842465 100644
GIT binary patch
delta 494
zcmYjOO-my|5be%<^-N-nCU_8BG^1cH63~khBnN|t_`!~X26uznZJd~y*6t2^2wox{
zyoI^=54?!@1NY!mH@x*TJ_tu8z
zZR~6}yxPET)(+#`R&9HKI3u)Vt`1Nlu_f45he;&{%X|y-lUAI*WFqjT^m!Lc&cT`_nh10J)e{0!}+^wu&K=$*u($nbAn`3nYDZ@&Et;
delta 433
zcmYjNzfS@&6z=_`9zO(u$*2T0;o_*1A&7~qXaa-57z4C{L+(o2BQmhzFQ=2b+4sYvNbTbWi5kpHGno^maltg{YUB>PRMXpX0(w{>9sXd=Lk_s#I!Z8-6
z*C&BUPB8U7#yk?Rj^*QE%Gw?1v70d&c!99I0O6UN6Sj}TAwkqu4#oh7)Z(xDB|kQb
z`Q-y~gY-r;Eg2_9CAlrhUtPlK5q~mfj-#oa(rAfS&Bp$w>`6e%IRjc!ptLLZV<%-IV9h6JI>vQPW=#FKpr;I2{s+{uWDEcR
diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/views/auth.py" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/views/auth.py"
index de02322..d0a65a5 100644
--- "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/views/auth.py"
+++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/web/views/auth.py"
@@ -1,5 +1,5 @@
from django.shortcuts import render, redirect, reverse
-
+from django.conf import settings
from rbac import models
@@ -30,8 +30,8 @@ def login(request):
'icon': i['permissions__icon'],
})
print(menu_list)
- request.session['permissions'] = permissions_list
- request.session['menus'] = menu_list
+ request.session[settings.PERMISSION_SESSION_KEY] = permissions_list
+ request.session[settings.MENU_SESSION_KEY] = menu_list
request.session['is_login'] = True
return redirect(reverse('index'))
return render(request, 'login.html')
--
Gitee