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 cfb3ce7a93d3a613d027eec2876a0a56e0e91792..0000000000000000000000000000000000000000 --- "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 4ade2079444b00fb4229cbb2bc57d523ae4ee604..be4073e65fa23bda57f1f2e951f79b1b5128038f 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 Binary files "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/db.sqlite3" and "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/db.sqlite3" differ 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 Binary files "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/service/__pycache__/init_permission.cpython-36.pyc" and "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/service/__pycache__/init_permission.cpython-36.pyc" differ diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/service/init_permission.py" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/service/init_permission.py" index 67ccb009b145887141f86b66687c8ffd77136af1..0508e1727bd6034349116c20d932ff28b86b3370 100644 --- "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/service/init_permission.py" +++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/service/init_permission.py" @@ -42,7 +42,7 @@ def init_permission(request, obj): menu_dict[i['permissions__menu_id']]['children'].append( {'title': i['permissions__title'], 'url': i['permissions__url']} ) - print(menu_dict) + # print(menu_dict) request.session[settings.PERMISSION_SESSION_KEY] = permissions_list request.session[settings.MENU_SESSION_KEY] = menu_dict request.session['is_login'] = True diff --git "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templates/rbac/menu.html" "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templates/rbac/menu.html" index 37b510442e81e64964be82619a936363c278927d..0fa0bf90cffd8d37eecd8341c7777e4b9779f8dc 100644 --- "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templates/rbac/menu.html" +++ "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templates/rbac/menu.html" @@ -10,9 +10,9 @@ {% for menu in menu_list %} {{ 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 Binary files "a/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/__pycache__/my_tags.cpython-36.pyc" and "b/DjangoLearning/luffy_permission-\347\251\272\347\231\275\347\211\210/rbac/templatetags/__pycache__/my_tags.cpython-36.pyc" differ 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 f832bcc2ebbd6ac32f41797f7461e32769f92fa6..88612c94a8663c935aa46c637c34dfad99804182 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 f54379f53e03d2bdef06d707be0258e58a3c6f20..c014303debb741ad9af802c7224e33e8c9573cfa 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):