Skip to content

Commit 76ff19e

Browse files
starlyingstarlying
committed
bugfix
1 parent 128de7d commit 76ff19e

22 files changed

Lines changed: 27 additions & 32 deletions

‎SiteServer.BackgroundPages/Settings/PageSiteTemplateOnline.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ private void RptContents_ItemDataBound(object sender, RepeaterItemEventArgs e)
6868

6969
ltlPreviewUrl.Text = $@"<a href=""{templateUrl}"" target=""_blank"">模板详情</a>";
7070

71-
var urlAdd = PageSiteAdd.GetRedirectUrl(string.Empty, title);
71+
var urlAdd = PageUtils.GetSettingsUrl("siteAdd");
72+
PageSiteAdd.GetRedirectUrl(string.Empty, title);
7273
ltlCreateUrl.Text = $@"<a href=""{urlAdd}"">创建站点</a>";
7374

7475
//if (_directoryNameLowerList.Contains($"T_{title}".ToLower().Trim()))

‎SiteServer.BackgroundPages/SiteServer.BackgroundPages.csproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -637,9 +637,6 @@
637637
<Compile Include="Settings\PageSite.cs">
638638
<SubType>ASPXCodeBehind</SubType>
639639
</Compile>
640-
<Compile Include="Settings\PageSiteAdd.cs">
641-
<SubType>ASPXCodeBehind</SubType>
642-
</Compile>
643640
<Compile Include="Settings\PageSiteDelete.cs">
644641
<SubType>ASPXCodeBehind</SubType>
645642
</Compile>
@@ -661,9 +658,6 @@
661658
<Compile Include="Settings\PageSiteTemplate.cs">
662659
<SubType>ASPXCodeBehind</SubType>
663660
</Compile>
664-
<Compile Include="Settings\PageSiteTemplateOnline.cs">
665-
<SubType>ASPXCodeBehind</SubType>
666-
</Compile>
667661
<Compile Include="Settings\PageSiteUrlApi.cs">
668662
<SubType>ASPXCodeBehind</SubType>
669663
</Compile>

‎SiteServer.CMS/DataCache/Content/ContentManager.CountCache.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public static int GetSiteCountIsChecking(SiteInfo siteInfo)
145145
foreach (var tableName in tableNames)
146146
{
147147
var list = GetContentCountInfoList(tableName);
148-
count += list.Where(x => x.SiteId == siteInfo.Id && x.IsChecked == isChecked && x.CheckedLevel != -siteInfo.Additional.CheckContentLevel)
148+
count += list.Where(x => x.SiteId == siteInfo.Id && x.IsChecked == isChecked && x.CheckedLevel != -siteInfo.Additional.CheckContentLevel && x.CheckedLevel != CheckManager.LevelInt.CaoGao)
149149
.Sum(x => x.Count);
150150
}
151151

‎SiteServer.Utils/Enumerations/EUserPasswordRestriction.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public static bool IsValid(string password, string restrictionStr)
146146
{
147147
isDigit = true;
148148
}
149-
else if (char.IsSymbol(c))
149+
else
150150
{
151151
isSymbol = true;
152152
}

‎SiteServer.Web/Controllers/Pages/PagesMainController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public IHttpActionResult GetConfig()
6767
return Ok(new
6868
{
6969
Value = false,
70-
RedirectUrl = PageSiteAdd.GetRedirectUrl()
70+
RedirectUrl = PageUtils.GetSettingsUrl("siteAdd")
7171
});
7272
}
7373

‎SiteServer.Web/Home/pages/contentAdd.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
1111
<link rel="shortcut icon" href="../assets/images/favicon.ico">
1212
<link href="../assets/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
13-
<link href="../assets/lib/vue-multiselect/style-2.1.0.min.css" rel="stylesheet" type="text/css" />
13+
<link href="../assets/lib/vue-multiselect-2.1.0/style.min.css" rel="stylesheet" type="text/css" />
1414
<link href="../assets/css/font-awesome-4.7.0.min.css" rel="stylesheet" type="text/css" />
1515
<link href="../assets/css/ionicons-2.0.0.min.css" rel="stylesheet" type="text/css" />
1616
<link href="../assets/css/siteserver.min.css" rel="stylesheet" type="text/css" />
@@ -283,7 +283,7 @@ <h4 class="m-t-0 m-b-30 header-title">内容设置</h4>
283283
<script src="../assets/js/utils.js" type="text/javascript"></script>
284284
<script src="../config.js" type="text/javascript"></script>
285285

286-
<script src="../assets/lib/vue-multiselect/script-2.1.0.min.js"></script>
286+
<script src="../assets/lib/vue-multiselect-2.1.0/script.min.js"></script>
287287
<script src="../assets/lib/vue2-datepicker-2.4.3.min.js"></script>
288288
<script type="text/javascript">
289289
window.UEDITOR_HOME_URL = "../assets/lib/ueditor/";

‎SiteServer.Web/Home/pages/contentAddLayerImage.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
1111
<link rel="shortcut icon" href="../assets/images/favicon.ico">
1212
<link href="../assets/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
13-
<link href="../assets/lib/vue-multiselect/style-2.1.0.min.css" rel="stylesheet" type="text/css" />
13+
<link href="../assets/lib/vue-multiselect-2.1.0/style.min.css" rel="stylesheet" type="text/css" />
1414
<link href="../assets/css/font-awesome-4.7.0.min.css" rel="stylesheet" type="text/css" />
1515
<link href="../assets/css/ionicons-2.0.0.min.css" rel="stylesheet" type="text/css" />
1616
<link href="../assets/css/siteserver.min.css" rel="stylesheet" type="text/css" />

‎SiteServer.Web/Home/pages/contents.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
1111
<link rel="shortcut icon" href="../assets/images/favicon.ico">
1212
<link href="../assets/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
13-
<link href="../assets/lib/vue-multiselect/style-2.1.0.min.css" rel="stylesheet" type="text/css" />
13+
<link href="../assets/lib/vue-multiselect-2.1.0/style.min.css" rel="stylesheet" type="text/css" />
1414
<link href="../assets/css/font-awesome-4.7.0.min.css" rel="stylesheet" type="text/css" />
1515
<link href="../assets/css/ionicons-2.0.0.min.css" rel="stylesheet" type="text/css" />
1616
<link href="../assets/css/siteserver.min.css" rel="stylesheet" type="text/css" />
@@ -346,5 +346,5 @@ <h4 class="page-title">稿件管理</h4>
346346
<script src="../assets/js/utils.js" type="text/javascript"></script>
347347
<script src="../config.js" type="text/javascript"></script>
348348

349-
<script src="../assets/lib/vue-multiselect/script-2.1.0.min.js"></script>
349+
<script src="../assets/lib/vue-multiselect-2.1.0/script.min.js"></script>
350350
<script src="contents.js" type="text/javascript"></script>

‎SiteServer.Web/Home/pages/contentsLayerArrange.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
1111
<link rel="shortcut icon" href="../assets/images/favicon.ico">
1212
<link href="../assets/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
13-
<link href="../assets/lib/vue-multiselect/style-2.1.0.min.css" rel="stylesheet" type="text/css" />
13+
<link href="../assets/lib/vue-multiselect-2.1.0/style.min.css" rel="stylesheet" type="text/css" />
1414
<link href="../assets/css/font-awesome-4.7.0.min.css" rel="stylesheet" type="text/css" />
1515
<link href="../assets/css/ionicons-2.0.0.min.css" rel="stylesheet" type="text/css" />
1616
<link href="../assets/css/siteserver.min.css" rel="stylesheet" type="text/css" />

‎SiteServer.Web/Home/pages/contentsLayerAttributes.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
1111
<link rel="shortcut icon" href="../assets/images/favicon.ico">
1212
<link href="../assets/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
13-
<link href="../assets/lib/vue-multiselect/style-2.1.0.min.css" rel="stylesheet" type="text/css" />
13+
<link href="../assets/lib/vue-multiselect-2.1.0/style.min.css" rel="stylesheet" type="text/css" />
1414
<link href="../assets/css/font-awesome-4.7.0.min.css" rel="stylesheet" type="text/css" />
1515
<link href="../assets/css/ionicons-2.0.0.min.css" rel="stylesheet" type="text/css" />
1616
<link href="../assets/css/siteserver.min.css" rel="stylesheet" type="text/css" />

0 commit comments

Comments
 (0)