Merge pull request #761 from player2135/dev

解决在切换用户登录时，顶部菜单显示的用户名不变的问题
siteserver · Jun 4, 2018 · 572b8d1 · 572b8d1
2 parents b90ce93 + f98b085
commit 572b8d1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/SiteServer.BackgroundPages/Core/WebUtils.cs b/SiteServer.BackgroundPages/Core/WebUtils.cs
@@ -379,7 +379,7 @@ function getWordSpliter(){{
             $('.nav-pills').children('li').eq(1).find('a').click();
 			$('#TbTags').val(data).focus();
 		}}else{{
-            {AlertUtils.Error("敏感词检测", "对不起，内容不足，无法提取关键字")}
+            {AlertUtils.Error("提取关键字", "对不起，内容不足，无法提取关键字")}
         }}
 	}});	
 }}

diff --git a/SiteServer.BackgroundPages/PageMain.cs b/SiteServer.BackgroundPages/PageMain.cs
@@ -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);
@@ -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;
                 }