Skip to content

Commit

Permalink
权限板块升级完毕
Browse files Browse the repository at this point in the history
  • Loading branch information
wkunzhi committed Dec 7, 2019
1 parent 08ae9cd commit e4f8fb7
Show file tree
Hide file tree
Showing 7 changed files with 138 additions and 395 deletions.
200 changes: 67 additions & 133 deletions .idea/workspace.xml

Large diffs are not rendered by default.

Binary file modified rbac/__pycache__/urls.cpython-37.pyc
Binary file not shown.
1 change: 0 additions & 1 deletion rbac/templates/layout.html
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@
<a href="javascript:;" layadmin-event="about"><i class="layui-icon layui-icon-more-vertical"></i></a>
</li>
</ul>
>
</div>
<!--下部-->
<div class="pg-body">
Expand Down
321 changes: 66 additions & 255 deletions rbac/templates/rbac/distribute_permissions.html

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions rbac/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
url(r'^role/del/(?P<pk>\d+)/$', role.role_del, name='role_del'), # {% url 'rbac:role_edit' %}

# 用户管理
path('user/list/', user.user_list, name='user_list'),
path('user/add/', user.user_add, name='user_add'),
url(r'^user/edit/(?P<pk>\d+)/$', user.user_edit, name='user_edit'), # {% url 'rbac:user_edit' %}
url(r'^user/del/(?P<pk>\d+)/$', user.user_del, name='user_del'), # {% url 'rbac:user_edit' %}
url(r'^user/reset/password/(?P<pk>\d+)/$', user.user_reset_pwd, name='user_reset_pwd'), # {% url 'rbac:user_edit' %}
# path('user/list/', user.user_list, name='user_list'),
# path('user/add/', user.user_add, name='user_add'),
# url(r'^user/edit/(?P<pk>\d+)/$', user.user_edit, name='user_edit'), # {% url 'rbac:user_edit' %}
# url(r'^user/del/(?P<pk>\d+)/$', user.user_del, name='user_del'), # {% url 'rbac:user_edit' %}
# url(r'^user/reset/password/(?P<pk>\d+)/$', user.user_reset_pwd, name='user_reset_pwd'), # {% url 'rbac:user_edit' %}


# 权限分配菜单(一级菜单)
Expand Down
Binary file modified rbac/views/__pycache__/menu.cpython-37.pyc
Binary file not shown.
1 change: 0 additions & 1 deletion rbac/views/menu.py
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,6 @@ def distribute_permissions(request):
:param request:
:return:
"""
print(request.POST)
# 取业务中的用户表(因为设计成了可插拔式)
user_model_class = import_string(settings.RBAC_USER_MODEL_CLASS)

Expand Down

0 comments on commit e4f8fb7

Please sign in to comment.