From 969611d3aef547f08377352851c16996403d9554 Mon Sep 17 00:00:00 2001 From: yongzy <635602689@qq.com> Date: Mon, 15 Jul 2019 19:51:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E8=8F=9C=E5=8D=95=E9=BB=98?= =?UTF-8?q?=E8=AE=A4=E9=80=89=E4=B8=AD=E5=B9=B6=E5=B1=95=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../5e282b7b-a0d3-4235-bf1c-e245c3112180.xml" | 689 ------------------ .../.idea/workspace.xml" | 161 ++-- .../db.sqlite3" | Bin 69632 -> 69632 bytes .../init_permission.cpython-36.pyc" | Bin 979 -> 962 bytes .../rbac/service/init_permission.py" | 2 +- .../rbac/templates/rbac/menu.html" | 4 +- .../__pycache__/my_tags.cpython-36.pyc" | Bin 816 -> 1007 bytes .../rbac/templatetags/my_tags.py" | 12 +- ...46\344\271\240\347\254\224\350\256\260.md" | 2 +- 9 files changed, 80 insertions(+), 790 deletions(-) delete mode 100644 "DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/.idea/dataSources/5e282b7b-a0d3-4235-bf1c-e245c3112180.xml" diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/.idea/dataSources/5e282b7b-a0d3-4235-bf1c-e245c3112180.xml" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/.idea/dataSources/5e282b7b-a0d3-4235-bf1c-e245c3112180.xml" deleted file mode 100644 index cfb3ce7..0000000 --- "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/.idea/dataSources/5e282b7b-a0d3-4235-bf1c-e245c3112180.xml" +++ /dev/null @@ -1,689 +0,0 @@ - - - - - 3.25.1 - - - 1 - 1 - - - - - - - - - - - - - - - - - - - - - 1 - - - 1 - - - - - 1 - integer|0s - 1 - 1 - - - 2 - varchar(80)|0s - 1 - - - 1 - name - - 1 - - - id - 1 - - - name - sqlite_autoindex_auth_group_1 - - - 1 - integer|0s - 1 - 1 - - - 2 - integer|0s - 1 - - - 3 - integer|0s - 1 - - - group_id -permission_id - - 1 - - - group_id - - - - permission_id - - - - id - 1 - - - group_id - auth_group - id - - - permission_id - auth_permission - id - - - 1 - integer|0s - 1 - 1 - - - 2 - integer|0s - 1 - - - 3 - varchar(100)|0s - 1 - - - 4 - varchar(255)|0s - 1 - - - content_type_id -codename - - 1 - - - content_type_id - - - - id - 1 - - - content_type_id - django_content_type - id - - - 1 - integer|0s - 1 - 1 - - - 2 - varchar(128)|0s - 1 - - - 3 - datetime|0s - - - 4 - bool|0s - 1 - - - 5 - varchar(30)|0s - 1 - - - 6 - varchar(30)|0s - 1 - - - 7 - varchar(254)|0s - 1 - - - 8 - bool|0s - 1 - - - 9 - bool|0s - 1 - - - 10 - datetime|0s - 1 - - - 11 - varchar(150)|0s - 1 - - - 1 - username - - 1 - - - id - 1 - - - username - sqlite_autoindex_auth_user_1 - - - 1 - integer|0s - 1 - 1 - - - 2 - integer|0s - 1 - - - 3 - integer|0s - 1 - - - user_id -group_id - - 1 - - - user_id - - - - group_id - - - - id - 1 - - - user_id - auth_user - id - - - group_id - auth_group - id - - - 1 - integer|0s - 1 - 1 - - - 2 - integer|0s - 1 - - - 3 - integer|0s - 1 - - - user_id -permission_id - - 1 - - - user_id - - - - permission_id - - - - id - 1 - - - user_id - auth_user - id - - - permission_id - auth_permission - id - - - 1 - integer|0s - 1 - 1 - - - 2 - text|0s - - - 3 - varchar(200)|0s - 1 - - - 4 - smallint unsigned|0s - 1 - - - 5 - text|0s - 1 - - - 6 - integer|0s - - - 7 - integer|0s - 1 - - - 8 - datetime|0s - 1 - - - content_type_id - - - - user_id - - - - id - 1 - - - content_type_id - django_content_type - id - - - user_id - auth_user - id - - - 1 - integer|0s - 1 - 1 - - - 2 - varchar(100)|0s - 1 - - - 3 - varchar(100)|0s - 1 - - - app_label -model - - 1 - - - id - 1 - - - 1 - integer|0s - 1 - 1 - - - 2 - varchar(255)|0s - 1 - - - 3 - varchar(255)|0s - 1 - - - 4 - datetime|0s - 1 - - - id - 1 - - - 1 - varchar(40)|0s - 1 - - - 2 - text|0s - 1 - - - 3 - datetime|0s - 1 - - - 1 - session_key - - 1 - - - expire_date - - - - session_key - 1 - sqlite_autoindex_django_session_1 - - - 1 - integer|0s - 1 - 1 - - - 2 - varchar(128)|0s - 1 - - - 3 - varchar(32)|0s - 1 - - - 4 - bool|0s - 1 - - - 5 - varchar(50)|0s - 1 - - - id - 1 - - - 1 - integer|0s - 1 - 1 - - - 2 - varchar(32)|0s - 1 - - - id - 1 - - - 1 - integer|0s - 1 - 1 - - - 2 - integer|0s - 1 - - - 3 - integer|0s - 1 - - - role_id -permission_id - - 1 - - - role_id - - - - permission_id - - - - id - 1 - - - role_id - rbac_role - id - - - permission_id - rbac_permission__old - id - - - 1 - integer|0s - 1 - 1 - - - 2 - varchar(32)|0s - 1 - - - 3 - varchar(32)|0s - 1 - - - id - 1 - - - 1 - integer|0s - 1 - 1 - - - 2 - integer|0s - 1 - - - 3 - integer|0s - 1 - - - user_id -role_id - - 1 - - - user_id - - - - role_id - - - - id - 1 - - - user_id - rbac_user - id - - - role_id - rbac_role - id - - - 1 - text|0s - - - 2 - text|0s - - - 3 - text|0s - - - 4 - int|0s - - - 5 - text|0s - - - 1 - - - 2 - - - 1 - integer|0s - 1 - 1 - - - 2 - varchar(32)|0s - 1 - - - 3 - varchar(32)|0s - 1 - - - 4 - varchar(32)|0s - 1 - - - 5 - varchar(32)|0s - 1 - - - id - 1 - - - 1 - integer|0s - 1 - 1 - - - 2 - integer|0s - 1 - - - 3 - datetime|0s - 1 - - - 4 - integer|0s - 1 - - - customer_id - - - - id - 1 - - - customer_id - web_customer - id - - - \ No newline at end of file diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/.idea/workspace.xml" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/.idea/workspace.xml" index 4ade207..be4073e 100644 --- "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/.idea/workspace.xml" +++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/.idea/workspace.xml" @@ -2,14 +2,8 @@ - - - + - - - - @@ -56,7 +50,7 @@ - + @@ -68,8 +62,8 @@ - - + + @@ -98,8 +92,11 @@ - - + + + + + @@ -107,8 +104,8 @@ - - + + @@ -117,28 +114,10 @@ - - - - - - - - - - - - - - - - - - - - + + @@ -183,21 +162,20 @@ - + - + - - - - - + + + + @@ -207,6 +185,7 @@ + @@ -255,7 +234,6 @@ - @@ -332,21 +310,23 @@ + + - + - + - - + + - + @@ -382,13 +362,7 @@ - - - - - - - + @@ -459,27 +433,28 @@ - - - - - - - + + + + + - + - - + + + + + - + - - + + @@ -490,58 +465,54 @@ - + - - + + - + - - - - - - - - - - - - + + - + - - + + + + + - + - - + + + + + - - + + - - - - + + + + diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/db.sqlite3" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/db.sqlite3" index a4854701cf7718cd37cbc3ba09343477246ee127..8594ef630ab35bef72966f4f00957f40bddcf417 100644 GIT binary patch delta 69 zcmZozz|ydQWr8&0>WMPWjH@>$n4A_dG_*1{vNE*PGc`B0G&5qAV|HYmzKWeuYV)Df N`WpOb(u=;x007Oz6RiLM delta 69 zcmZozz|ydQWr8&0s);hrjH@;#n4A_du(UF@v@$W%Gc__dvov6pV|HYmzKWeuYV)Df N`WpOb(u=;x007WV6Ttug diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/service/__pycache__/init_permission.cpython-36.pyc" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/service/__pycache__/init_permission.cpython-36.pyc" index 04ea2450f3f2c999327982818e26501673749660..46bd343bb467b00ea7d5067cbc81fc55ac643078 100644 GIT binary patch delta 137 zcmcc2eu$mZn3tEUI7KJcbRuUQ {{ menu.title }} - + {% for i in menu.children %} - {{ i.title }} + {{ i.title }} {% endfor %} diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/__pycache__/my_tags.cpython-36.pyc" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/__pycache__/my_tags.cpython-36.pyc" index 2f77bf3d8be2057dec9a724e0172308dd2bcc34d..33f203b378caff776a2e8a8ef4d337006cc777b6 100644 GIT binary patch delta 449 zcmX9)yK3V=6uoyw8a@1os}O@BkVoNVt9>|4$`mOB2^b6}2#*p=k!5={HqP#d6k1rP zND-mZOfh~3v7w6u4?mg!e_nG~5{LhVs|91Uxi1g8ax^n=48Bl}l z#S{fG#3)Hj3%swGm7}x^$cbcY_z73Yk&_=Tr`&p=IbH22dIG~%ZmmICZBRs6$1v~p zVRg2K*eSqVPjZ{v%I54CRz1_5cD4PGvs3BD9(QA3G48dYK!pVnF|W80^V-HVkNYsc z=!2{&QbiVs!0Vei!gJ_0%6JwMQNArj4k zk&Kq1hJiN;)5T>HWwKi@o8*vdZx+b$Wt3h`g=M~>SvD0iu5)WbEA=B%Qy#Q$_L&}c$>ZFi&~Y2k;X}xlFnYoP#{fYgyA;&*uo~d c2HU2#NFBv)`HLLbV#mnJSMn8i%YWp{f9U#k+W-In delta 257 zcmW-bKTE?v9EN{?l1mzG?GTEBIO$O6AZjNaon0K1ViDm^NLpKaxr)LChg7VCgB*Sf z5qG~yzJy=F)8Tn}mIvOS=u0H~&1SMV=?y#dmVAx^00=$oDbD>^$RS5VIal}sCa9o9 z6E5Kyu2G_-MJ!ncuUyjox}{?nwo6`umzh zxgPDUHg42pemTwx(~aFb?HuaAAGIi^+9+9vw>q1cTHIZY=c?!ib)?nIn;Fnl4jLo% oQ2fVw#aC{NH`A6EpcV=2V1jLoQK#;Lw}YCra!=gH)P3{8FVoXL0RR91 diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/my_tags.py" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/my_tags.py" index f832bcc..88612c9 100644 --- "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/my_tags.py" +++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/my_tags.py" @@ -10,10 +10,18 @@ register = template.Library() @register.inclusion_tag('rbac/menu.html') def menu(request): menu_dict = request.session.get(settings.MENU_SESSION_KEY) - # url = request.path_info + url = request.path_info + od = OrderedDict() keys_list = sorted(menu_dict, key=lambda x: menu_dict[x]['weight'], reverse=True) for key in keys_list: od[key] = menu_dict[key] - print(od) + for i in menu_dict.values(): + i['class'] = 'hide' + for m in i['children']: + if re.match(r'{}$'.format(m['url']), url): + m['class'] = 'active' + i['class'] = '' + + print(od.values()) return {'menu_list': od.values()} diff --git "a/Python\345\255\246\344\271\240\347\254\224\350\256\260.md" "b/Python\345\255\246\344\271\240\347\254\224\350\256\260.md" index f54379f..c014303 100644 --- "a/Python\345\255\246\344\271\240\347\254\224\350\256\260.md" +++ "b/Python\345\255\246\344\271\240\347\254\224\350\256\260.md" @@ -8502,7 +8502,7 @@ HTML超文本标记语言 1. ```python @register.filter(name='add_a') def add_xx(value,arg): - return 'addd_xx' + return 'add_xx' @register.simple_tag def join_str(*args,**kwargs): -- Gitee