Skip to content

Commit 3cfde31

Browse files
committed
refactor: 将项目中的所有super字段改为admin字段
1 parent 084bc8a commit 3cfde31

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

Pipfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Flask = "==1.0.2"
1212
Flask-SQLAlchemy = "==2.3.2"
1313
Flask-WTF = "==0.14.2"
1414
Flask-Cors = "==2.1.0"
15-
Lin-CMS = "==0.1.1a4"
15+
Lin-CMS = "==0.1.1a6"
1616

1717
[dev-packages]
1818
pytest = "*"

add_super.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
user.nickname = 'super'
1616
user.password = '123456'
1717
user.email = '1234995678@qq.com'
18-
# super为 2 的时候为超级管理员,普通用户为 1
19-
user.super = 2
18+
# admin 2 的时候为超级管理员,普通用户为 1
19+
user.admin = 2
2020
db.session.add(user)

app/api/cms/admin.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from lin import db
1212
from lin.core import get_ep_infos, route_meta, manager, find_user, find_auth_module
1313
from lin.db import get_total_nums
14-
from lin.enums import UserSuper, UserActive
14+
from lin.enums import UserAdmin, UserActive
1515
from lin.exception import Success, NotFound, ParameterException, Forbidden
1616
from lin.jwt import admin_required
1717
from lin.log import Logger
@@ -38,10 +38,10 @@ def get_admin_users():
3838
start, count = paginate()
3939
group_id = request.args.get('group_id')
4040
condition = {
41-
'super': UserSuper.COMMON.value,
41+
'admin': UserAdmin.COMMON.value,
4242
'group_id': group_id
4343
} if group_id else {
44-
'super': UserSuper.COMMON.value
44+
'admin': UserAdmin.COMMON.value
4545
}
4646

4747
users = db.session.query(
@@ -58,7 +58,7 @@ def get_admin_users():
5858
user.hide('update_time', 'delete_time')
5959
user_and_group.append(user)
6060
# 有分组的时候就加入分组条件
61-
# total_nums = get_total_nums(manager.user_model, is_soft=True, super=UserSuper.COMMON.value)
61+
# total_nums = get_total_nums(manager.user_model, is_soft=True, admin=UserAdmin.COMMON.value)
6262
total_nums = get_total_nums(manager.user_model, is_soft=True, **condition)
6363
return jsonify({
6464
"collection": user_and_group,

app/api/cms/notify.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def stream():
3535
@group_required
3636
def get_events():
3737
current_user = get_current_user()
38-
if current_user.is_super:
38+
if current_user.is_admin:
3939
return jsonify({'events': list(MESSAGE_EVENTS)})
4040
event = Event.query.filter_by(group_id=current_user.group_id, soft=False).first()
4141
if event is None:

0 commit comments

Comments
 (0)