Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

解决在切换用户登录时，顶部菜单显示的用户名不变的问题 #761

Merged
merged 2 commits into from
Jun 4, 2018
Merged

解决在切换用户登录时，顶部菜单显示的用户名不变的问题 #761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7051bca
解决在切换用户登录时，顶部菜单显示的用户名不变的问题
player2135 Jun 4, 2018
f98b085
提取关键字出错的提示标题改为“提取关键字”，而不是“敏感词”检测
player2135 Jun 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion SiteServer.BackgroundPages/Core/WebUtils.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ function getWordSpliter(){{
$('.nav-pills').children('li').eq(1).find('a').click();
$('#TbTags').val(data).focus();
}}else{{
{AlertUtils.Error("敏感词检测", "对不起，内容不足，无法提取关键字")}
{AlertUtils.Error("提取关键字", "对不起，内容不足，无法提取关键字")}
}}
}});
}}
Expand Down
4 changes: 2 additions & 2 deletions SiteServer.BackgroundPages/PageMain.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public void Page_Load(object sender, EventArgs e)
}

var permissionList = new List<string>(AuthRequest.AdminPermissions.PermissionList);

if (AuthRequest.AdminPermissions.HasSitePermissions(_siteInfo.Id))
{
var websitePermissionList = AuthRequest.AdminPermissions.GetSitePermissions(_siteInfo.Id);
Expand Down Expand Up @@ -360,7 +360,7 @@ private string GetTopMenusHtml()
{
if (!IsConsoleAdministrator && !TabManager.IsValid(tab, permissionList)) continue;

if (tab.Text == "我的账户")
if (tab.Id == "Account")
{
tab.Text = AuthRequest.AdminName;
}
Expand Down