bugfix
This commit is contained in:
parent
4521bcb143
commit
0855761d34
@ -1,3 +1,3 @@
|
||||
#!/usr/bin/bash
|
||||
#!/bin/bash
|
||||
|
||||
xls2ui -m ../models -o ../wwwroot rbac *.json
|
||||
|
@ -55,19 +55,42 @@ async def get_user_roles(userid):
|
||||
roles.append(r.name)
|
||||
return roles
|
||||
|
||||
async def create_org(sor, ns):
|
||||
async def create_org(sor, ns, orgtypes=[]):
|
||||
await sor.C('organization', ns)
|
||||
if orgtypes == []:
|
||||
orgtypes = ['customer']
|
||||
if 'customer' not in orgtypes:
|
||||
orgtypes.append('customer')
|
||||
for ot in orgtypes:
|
||||
otns = {
|
||||
'id':getID(),
|
||||
'orgid':ns.id,
|
||||
'orgtypeid':'customer'
|
||||
'orgtypeid':ot
|
||||
}
|
||||
await sor.C('orgtypes', otns)
|
||||
|
||||
async def create_user(sor, ns):
|
||||
async def create_user(sor, ns, roles=[]):
|
||||
"""
|
||||
role format:
|
||||
{
|
||||
orgtypeid: rr,
|
||||
roles: ['ee', 'bb']
|
||||
}
|
||||
"""
|
||||
await sor.C('users', ns)
|
||||
sql = "select * from role where orgtypeid = 'customer' and name in ('admin', 'customer')"
|
||||
recs = await sor.sqlExe(sql, {})
|
||||
if roles == []:
|
||||
roles = [
|
||||
{
|
||||
'orgtypeid': 'customer',
|
||||
'roles': [ 'customer']
|
||||
}
|
||||
]
|
||||
for rt in roles:
|
||||
sql = "select * from role where orgtypeid = ${otid}$ and name in ${roles}$)"
|
||||
recs = await sor.sqlExe(sql, {
|
||||
'otid': rt['orgtypeid',
|
||||
'roles': rt['roles']
|
||||
})
|
||||
for r in recs:
|
||||
await sor.C('userrole', {
|
||||
'id':getID(),
|
||||
|
Loading…
Reference in New Issue
Block a user