Skip to content

Commit 662e251

Browse files
committed
bugfix
1 parent 8de8463 commit 662e251

File tree

149 files changed

+1590
-1057
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+1590
-1057
lines changed

SiteServer.BackgroundPages/Cms/ModalSpecialAdd.cs

-162
This file was deleted.

SiteServer.BackgroundPages/Cms/ModalSpecialUpload.cs

-78
This file was deleted.

SiteServer.BackgroundPages/Cms/PageChannelDelete.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ public void Page_Load(object sender, EventArgs e)
4949
if (!HasChannelPermissions(channelId, ConfigManager.ChannelPermissions.ChannelDelete)) continue;
5050

5151
var channelInfo = ChannelManager.GetChannelInfo(SiteId, channelId);
52-
var onlyAdminId = AuthRequest.AdminPermissionsImpl.GetOnlyAdminId(SiteId, channelId);
52+
var adminId = AuthRequest.AdminPermissionsImpl.GetAdminId(SiteId, channelId);
5353
var displayName = channelInfo.ChannelName;
54-
var count = ContentManager.GetCount(SiteInfo, channelInfo, onlyAdminId);
54+
var count = ContentManager.GetCount(SiteInfo, channelInfo, adminId);
5555
if (count > 0)
5656
{
5757
displayName += $"({count})";

SiteServer.BackgroundPages/Cms/PageChannelTranslate.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ public string GetTitle(ChannelInfo channelInfo)
140140
}
141141
str = string.Concat(str, channelInfo.IsLastNode ? "└" : "├");
142142
str = string.Concat(str, channelInfo.ChannelName);
143-
var onlyAdminId = AuthRequest.AdminPermissionsImpl.GetOnlyAdminId(SiteId, channelInfo.Id);
144-
var count = ContentManager.GetCount(SiteInfo, channelInfo, onlyAdminId);
143+
var adminId = AuthRequest.AdminPermissionsImpl.GetAdminId(SiteId, channelInfo.Id);
144+
var count = ContentManager.GetCount(SiteInfo, channelInfo, adminId);
145145
if (count != 0)
146146
{
147147
str = $"{str} ({count})";

SiteServer.BackgroundPages/Cms/PageContentSearch.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,12 @@ public void Page_Load(object sender, EventArgs e)
109109
RptContents.ItemDataBound += RptContents_ItemDataBound;
110110

111111
var allAttributeNameList = TableColumnManager.GetTableColumnNameList(tableName, DataType.Text);
112-
var onlyAdminId = _isAdminOnly
112+
var adminId = _isAdminOnly
113113
? AuthRequest.AdminId
114-
: AuthRequest.AdminPermissionsImpl.GetOnlyAdminId(SiteInfo.Id, _channelInfo.Id);
114+
: AuthRequest.AdminPermissionsImpl.GetAdminId(SiteInfo.Id, _channelInfo.Id);
115115
var whereString = DataProvider.ContentDao.GetPagerWhereSqlString(SiteInfo, _channelInfo,
116116
searchType, keyword,
117-
dateFrom, dateTo, state, _isCheckOnly, false, _isTrashOnly, _isWritingOnly, onlyAdminId,
117+
dateFrom, dateTo, state, _isCheckOnly, false, _isTrashOnly, _isWritingOnly, adminId,
118118
AuthRequest.AdminPermissionsImpl,
119119
allAttributeNameList);
120120

SiteServer.BackgroundPages/Cms/PageSpecial.cs

-108
This file was deleted.

0 commit comments

Comments
 (0)