github
/
spug
mirror of https://github.com/openspug/spug
1
0
Fork 0
Code Issues Releases Wiki Activity

F 更新LDAP

pull/31/head v2.2.0-beta.1
zypo 2020-03-09 14:01:07 +08:00
parent 48a090c20f
commit 7208ba803e
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spug_api/apps/account/models.py
View File

@ -34,7 +34,7 @@ class User(models.Model, ModelMixin):
@property @property
def page_perms(self): def page_perms(self):
if self.role.page_perms: if self.role and self.role.page_perms:
data = [] data = []
perms = json.loads(self.role.page_perms) perms = json.loads(self.role.page_perms)
for m, v in perms.items(): for m, v in perms.items():

2
spug_api/apps/account/views.py
View File

@ -148,7 +148,7 @@ def login(request):
is_success, message = ldap.valid_user(form.username, form.password) is_success, message = ldap.valid_user(form.username, form.password)
if is_success: if is_success:
if not user: if not user:
user = User.objects.create(username=form.username, nickname=form.username) user = User.objects.create(username=form.username, nickname=form.username, type=form.type)
return handle_user_info(user, x_real_ip) return handle_user_info(user, x_real_ip)
elif message: elif message:
return json_response(error=message) return json_response(error=message)

2
spug_web/src/pages/system/account/Table.js
View File

@ -55,7 +55,7 @@ class ComTable extends React.Component {
<Divider type="vertical"/> <Divider type="vertical"/>
<LinkButton className="span-button" onClick={() => store.showForm(info)}>编辑</LinkButton> <LinkButton className="span-button" onClick={() => store.showForm(info)}>编辑</LinkButton>
<Divider type="vertical"/> <Divider type="vertical"/>
<LinkButton className="span-button" onClick={() => this.handleReset(info)}>重置密码</LinkButton> <LinkButton disabled={info['type'] === 'ldap'} className="span-button" onClick={() => this.handleReset(info)}>重置密码</LinkButton>
<Divider type="vertical"/> <Divider type="vertical"/>
<LinkButton className="span-button" onClick={() => this.handleDelete(info)}>删除</LinkButton> <LinkButton className="span-button" onClick={() => this.handleDelete(info)}>删除</LinkButton>
</span> </span>