refactor(重构程序&目录结构)
This commit is contained in:
@@ -2,8 +2,8 @@ from flask import render_template
|
||||
from flask_login import login_required, current_user
|
||||
from sqlalchemy import desc
|
||||
|
||||
from applications.common.utils.rights import permission_required, view_logging_required
|
||||
from applications.models import LoggingModel, RightsRole, CompanyUser
|
||||
from common.utils.rights import permission_required, view_logging_required
|
||||
from models import LogModel, RoleModels, UserModels
|
||||
from . import index_bp
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ def users_main():
|
||||
@view_logging_required
|
||||
@permission_required("admin:user:add")
|
||||
def users_add_view():
|
||||
roles = RightsRole.query.all()
|
||||
roles = RoleModels.query.all()
|
||||
return render_template('admin/users/users_add.html', roles=roles)
|
||||
|
||||
|
||||
@@ -28,8 +28,8 @@ def users_add_view():
|
||||
@permission_required("admin:user:edit")
|
||||
def users_user_id_view(user_id):
|
||||
# 获取编辑用户信息
|
||||
user = CompanyUser.query.filter_by(id=user_id).first()
|
||||
roles = RightsRole.query.all()
|
||||
user = UserModels.query.filter_by(id=user_id).first()
|
||||
roles = RoleModels.query.all()
|
||||
checked_roles = []
|
||||
for r in user.role:
|
||||
checked_roles.append(r.id)
|
||||
@@ -39,8 +39,8 @@ def users_user_id_view(user_id):
|
||||
@index_bp.get('/users/center')
|
||||
@login_required
|
||||
def users_center():
|
||||
user_logs = LoggingModel.query.filter_by(url='/passport/login').filter_by(uid=current_user.id).order_by(
|
||||
desc(LoggingModel.create_at)).limit(10)
|
||||
user_logs = LogModel.query.filter_by(url='/passport/login').filter_by(uid=current_user.id).order_by(
|
||||
desc(LogModel.create_at)).limit(10)
|
||||
return render_template('admin/users/profile.html', user_info=current_user, user_logs=user_logs)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user