From c30c4a5d633212240c3a9b60c4724a7e49d224fb Mon Sep 17 00:00:00 2001 From: yumoqing Date: Fri, 21 Feb 2025 14:02:38 +0800 Subject: [PATCH] bugfix --- json/build.sh | 3 +++ json/permission.json | 3 ++- rbac/check_perm.py | 13 ------------- wwwroot/user/register.dspy | 7 ++----- wwwroot/user/user.ui | 5 +++-- 5 files changed, 10 insertions(+), 21 deletions(-) create mode 100755 json/build.sh diff --git a/json/build.sh b/json/build.sh new file mode 100755 index 0000000..b59d2d9 --- /dev/null +++ b/json/build.sh @@ -0,0 +1,3 @@ +#!/usr/bin/bash + +xls2ui -m ../models -o ../wwwroot rbac *.json diff --git a/json/permission.json b/json/permission.json index e072d9e..cb4d36b 100644 --- a/json/permission.json +++ b/json/permission.json @@ -4,7 +4,8 @@ "title":"权限", "params":{ "idField":"id", - "textField":"name", + "textField":"path", + "sortby":"path", "editable":true, "browserfields":{ "alters":{} diff --git a/rbac/check_perm.py b/rbac/check_perm.py index 83b770f..de14700 100644 --- a/rbac/check_perm.py +++ b/rbac/check_perm.py @@ -13,7 +13,6 @@ from ahserver.globalEnv import password_encode from ahserver.serverenv import ServerEnv, get_serverenv, set_serverenv import jwt -ownerid = None defualt_password_key = "!@#$%^&*(*&^%$QWERTYUIqwertyui234567" defualt_secret_key="test1234!@#$2222354" @@ -56,18 +55,6 @@ async def get_user_roles(userid): roles.append(r.name) return roles -async def get_owner_orgid(sor, *args): - debug('uyyyyyyyyyyyyyyyy') - global ownerid - if ownerid: - return ownerid - - sql = "select * from orgtypes where orgtypeid = 'owner'" - recs = await sor.sqlExe(sql, {}) - if len(recs) > 0: - ownerid = recs[0].orgid - return ownerid - async def create_org(sor, ns): await sor.C('organization', ns) otns = { diff --git a/wwwroot/user/register.dspy b/wwwroot/user/register.dspy index e3e7eea..25fd15d 100644 --- a/wwwroot/user/register.dspy +++ b/wwwroot/user/register.dspy @@ -3,11 +3,8 @@ db = DBPools() dbname = await rfexe('get_module_dbname', 'sage') async with db.sqlorContext(dbname) as sor: orgid = await register_user(sor, params_kw) - try: - ownerid = await get_owner_orgid(sor) + if get_owner_orgid and openCustomerAccounts: + ownerid = await get_owner_orgid(sor, orgid) await openCustomerAccounts(sor, ownerid, orgid) - except Exception as e: - fe = format_exc() - exception(f'{e=}\n{fe}') return UiMessage(title="Success", message="register success") return UiError(title='Error', message="register failed") diff --git a/wwwroot/user/user.ui b/wwwroot/user/user.ui index fa55e87..fd60ea4 100644 --- a/wwwroot/user/user.ui +++ b/wwwroot/user/user.ui @@ -3,6 +3,7 @@ "widgettype":"HBox", "options":{ "css":"clickable", + "tip":"用户功能", "cwidth":12 }, "binds":[ @@ -44,12 +45,12 @@ "tools":[ { "name":"login", - "tip":"user login", + "tip":"点击登录", "icon":"{{entire_url('/imgs/login.png')}}" }, { "name":"register", - "tip":"user register", + "tip":"点击注册", "icon":"{{entire_url('/imgs/register.png')}}" } ]