diff --git a/wwwroot/add_adminuser.ui b/wwwroot/add_adminuser.ui index f48332e..7e58462 100644 --- a/wwwroot/add_adminuser.ui +++ b/wwwroot/add_adminuser.ui @@ -1,40 +1,30 @@ { - "widgettype":"PopupWindow", + "widgettype":"ModalForm", "options":{ - "archor":"cc", - "cwidth":16, - "chegith":10, - "title":"add admin user" - }, - "subwidgets":[ - { - "id":"adminuser", - "widgettype":"Form", - "options":{ - "cols":1, - "fields":[ - { - "name":"username", - "label":"用户名", - "uitype":"str" - }, - { - "name":"password", - "label":"密码", - "uitype":"password" - }, - { - "name":"chkpassword", - "label":"确认密码", - "uitype":"password" - } - ] + "cwidth":20, + "cheight":30, + "title":"增加管理员", + "fields":[ + { + "name":"username", + "label":"用户名", + "uitype":"str" + }, + { + "name":"password", + "label":"密码", + "uitype":"password" + }, + { + "name":"chkpassword", + "label":"确认密码", + "uitype":"password" } - } - ], + ] + }, "binds":[ { - "wid":"adminuser", + "wid":"self", "event":"submit", "actiontype":"urlwidget", "target":"self", diff --git a/www/user/login.ui b/wwwroot/user/login.ui similarity index 100% rename from www/user/login.ui rename to wwwroot/user/login.ui diff --git a/www/user/logout.dspy b/wwwroot/user/logout.dspy similarity index 100% rename from www/user/logout.dspy rename to wwwroot/user/logout.dspy diff --git a/www/user/register.dspy b/wwwroot/user/register.dspy similarity index 90% rename from www/user/register.dspy rename to wwwroot/user/register.dspy index c1704b3..e369e55 100644 --- a/www/user/register.dspy +++ b/wwwroot/user/register.dspy @@ -4,7 +4,7 @@ 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, orgid) + ownerid = await get_owner_orgid(sor) await openCustomerAccounts(sor, ownerid, orgid) except Exception as e: fe = format_exc() diff --git a/www/user/register.ui b/wwwroot/user/register.ui similarity index 100% rename from www/user/register.ui rename to wwwroot/user/register.ui diff --git a/www/user/reset_password/index.ui b/wwwroot/user/reset_password/index.ui similarity index 100% rename from www/user/reset_password/index.ui rename to wwwroot/user/reset_password/index.ui diff --git a/www/user/reset_password/reset_password.dspy b/wwwroot/user/reset_password/reset_password.dspy similarity index 100% rename from www/user/reset_password/reset_password.dspy rename to wwwroot/user/reset_password/reset_password.dspy diff --git a/www/user/up_login.dspy b/wwwroot/user/up_login.dspy similarity index 100% rename from www/user/up_login.dspy rename to wwwroot/user/up_login.dspy diff --git a/www/user/user.ui b/wwwroot/user/user.ui similarity index 100% rename from www/user/user.ui rename to wwwroot/user/user.ui diff --git a/www/user/user_menu.ui b/wwwroot/user/user_menu.ui similarity index 100% rename from www/user/user_menu.ui rename to wwwroot/user/user_menu.ui diff --git a/www/user/user_panel.ui b/wwwroot/user/user_panel.ui similarity index 100% rename from www/user/user_panel.ui rename to wwwroot/user/user_panel.ui diff --git a/www/user/userapikey/add_userapikey.dspy b/wwwroot/user/userapikey/add_userapikey.dspy similarity index 100% rename from www/user/userapikey/add_userapikey.dspy rename to wwwroot/user/userapikey/add_userapikey.dspy diff --git a/www/user/userapikey/delete_userapikey.dspy b/wwwroot/user/userapikey/delete_userapikey.dspy similarity index 100% rename from www/user/userapikey/delete_userapikey.dspy rename to wwwroot/user/userapikey/delete_userapikey.dspy diff --git a/www/user/userapikey/get_userapikey.dspy b/wwwroot/user/userapikey/get_userapikey.dspy similarity index 100% rename from www/user/userapikey/get_userapikey.dspy rename to wwwroot/user/userapikey/get_userapikey.dspy diff --git a/www/user/userapikey/index.ui b/wwwroot/user/userapikey/index.ui similarity index 100% rename from www/user/userapikey/index.ui rename to wwwroot/user/userapikey/index.ui diff --git a/www/user/userapikey/update_userapikey.dspy b/wwwroot/user/userapikey/update_userapikey.dspy similarity index 100% rename from www/user/userapikey/update_userapikey.dspy rename to wwwroot/user/userapikey/update_userapikey.dspy diff --git a/www/user/wechat_login.ui b/wwwroot/user/wechat_login.ui similarity index 100% rename from www/user/wechat_login.ui rename to wwwroot/user/wechat_login.ui