jay.chang/ibms-dome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/mjm-org/ibms

Browse Source
This commit is contained in:
dev02 2024-01-29 09:28:36 +08:00
commit 2f80407373
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
FrontendWebApi/Controllers/MyBaseController.cs
View File

@ -80,10 +80,13 @@ namespace FrontendWebApi.Controllers
left join role_auth ra on ra.role_guid = us.role_guid left join role_auth ra on ra.role_guid = us.role_guid
left join auth_page ap on ap.AuthCode = ra.AuthCode left join auth_page ap on ap.AuthCode = ra.AuthCode
where us.userinfo_guid = '{myUserInfo.Userinfo_guid}'"); where us.userinfo_guid = '{myUserInfo.Userinfo_guid}'");
var sGetBackendUrlSql = @"SELECT system_value FROM variable WHERE system_type = 'website_config' AND system_key = 'website_url'";
var sBackendUrl = frontendRepository.GetOneAsync<string>(sGetBackendUrlSql)?.Result;
myUserInfo.ShowView = showview.Result; myUserInfo.ShowView = showview.Result;
ViewBag.myUserInfo = myUserInfo; ViewBag.myUserInfo = myUserInfo;
ViewBag.role = showview.Result; ViewBag.role = showview.Result;
ViewBag.BackendUrl = sBackendUrl;
//var showviewt = new List<string>() //var showviewt = new List<string>()
// { // {

4
FrontendWebApi/Views/Shared/_Layout.cshtml
View File

@ -607,7 +607,7 @@
</div> </div>
<!-- app user menu --> <!-- app user menu -->
<div> <div>
<a href="http://60.251.164.125:8849/" target="_blank" id="go-to-setting"><i class="fal fa-cog fs-xxl"></i></a> <a href="@(ViewBag.BackendUrl ?? "#")" target="_blank" id="go-to-setting"><i class="fal fa-cog fs-xxl"></i></a>
@* @*
<a href="#" data-toggle="dropdown" title="drlantern@gotbootstrap.com" class="header-icon d-flex align-items-center justify-content-center ml-2"> <a href="#" data-toggle="dropdown" title="drlantern@gotbootstrap.com" class="header-icon d-flex align-items-center justify-content-center ml-2">
<img src="~/img/demo/avatars/avatar-admin.png" class="profile-image rounded-circle" alt="Dr. Codex Lantern"> <img src="~/img/demo/avatars/avatar-admin.png" class="profile-image rounded-circle" alt="Dr. Codex Lantern">
@ -1062,8 +1062,6 @@
} }
}, 'json'); }, 'json');
} }
</script> </script>
</body> </body>