Fix #522, html code is shown in select widget page.

SeriaWei · Nov 19, 2024 · d7f56cf · d7f56cf
1 parent 51728e3
commit d7f56cf
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 15 deletions.
diff --git a/src/EasyFrameWork/Mvc/RazorPages/LocalizeString.cs b/src/EasyFrameWork/Mvc/RazorPages/LocalizeString.cs
@@ -63,10 +63,5 @@ public override string ToString()
         {
             return this.Get();
         }
-
-        public static implicit operator string(LocalizeString content)
-        {
-            return content.ToString();
-        }
     }
 }
diff --git a/src/ZKEACMS.Article/Views/ArticleType/Select.cshtml b/src/ZKEACMS.Article/Views/ArticleType/Select.cshtml
@@ -1,7 +1,7 @@
 @using Easy.ViewPort.jsTree
 @using ZKEACMS.Article.Models
 @{
-    this.WorkContext().CurrentPage.Title = L("Article Category");
+    this.WorkContext().CurrentPage.Title = L("Article Category").Text;
     Layout = Layouts.PopUp;
     Style.Reqiured("jsTree").AtHead();
     Script.Reqiured("jsTree").AtFoot();

diff --git a/src/ZKEACMS.Product/Views/ProductCategory/Select.cshtml b/src/ZKEACMS.Product/Views/ProductCategory/Select.cshtml
@@ -1,7 +1,7 @@
 @using Easy.ViewPort.jsTree
 @using ZKEACMS.Article.Models
 @{
-    this.WorkContext().CurrentPage.Title = L("Product Category");
+    this.WorkContext().CurrentPage.Title = L("Product Category").Text;
     Layout = Layouts.PopUp;
     Style.Reqiured("jsTree").AtHead();
     Script.Reqiured("jsTree").AtFoot();

diff --git a/src/ZKEACMS.Shop/Views/CustomOrder/Failed.cshtml b/src/ZKEACMS.Shop/Views/CustomOrder/Failed.cshtml
@@ -1,6 +1,6 @@
 @{
     Layout = Layouts.CustomerCenter;
-    this.WorkContext().CurrentPage.Title = L("Order failed to pay");
+    this.WorkContext().CurrentPage.Title = L("Order failed to pay").Text;
 }
 <div class="text-center">
     <div class="page-header">

diff --git a/src/ZKEACMS.WebHost/Views/Account/Edit.cshtml b/src/ZKEACMS.WebHost/Views/Account/Edit.cshtml
@@ -1,6 +1,6 @@
 @model Easy.Modules.User.Models.UserEntity
 @{
-    this.WorkContext().CurrentPage.Title = L("Account Center");
+    this.WorkContext().CurrentPage.Title = L("Account Center").Text;
     Layout = Layouts.CustomerCenter;
     Script.Reqiured("validate").AtFoot();
 }

diff --git a/src/ZKEACMS.WebHost/Views/Account/Index.cshtml b/src/ZKEACMS.WebHost/Views/Account/Index.cshtml
@@ -1,5 +1,5 @@
 @{
-    this.WorkContext().CurrentPage.Title = L("Account Center");
+    this.WorkContext().CurrentPage.Title = L("Account Center").Text;
     Layout = Layouts.CustomerCenter;
 }
 <div class="panel panel-default user-info">

diff --git a/src/ZKEACMS.WebHost/Views/Account/PassWord.cshtml b/src/ZKEACMS.WebHost/Views/Account/PassWord.cshtml
@@ -1,5 +1,5 @@
 @{
-    this.WorkContext().CurrentPage.Title = L("Account Center");
+    this.WorkContext().CurrentPage.Title = L("Account Center").Text;
     Layout = Layouts.CustomerCenter;
     Script.Reqiured("validate").AtFoot();
 }

diff --git a/src/ZKEACMS.WebHost/Views/Media/Index.cshtml b/src/ZKEACMS.WebHost/Views/Media/Index.cshtml
@@ -1,7 +1,7 @@
 @using ZKEACMS.Common.ViewModels
 @model MediaViewModel
 @{
-    this.WorkContext().CurrentPage.Title = L("Media");
+    this.WorkContext().CurrentPage.Title = L("Media").Text;
     var action = Html.ViewContext.RouteData.Values["action"].ToString();
 
     Script.Reqiured("image-viewer").AtFoot();

diff --git a/src/ZKEACMS.WebHost/Views/Navigation/Select.cshtml b/src/ZKEACMS.WebHost/Views/Navigation/Select.cshtml
@@ -3,7 +3,7 @@
 @using Easy.ViewPort.jsTree
 
 @{
-    this.WorkContext().CurrentPage.Title = L("Navigation");
+    this.WorkContext().CurrentPage.Title = L("Navigation").Text;
     Layout = Layouts.PopUp;
     Script.Reqiured("jsTree").AtFoot();
     Style.Reqiured("jsTree").AtHead();

diff --git a/src/ZKEACMS.WebHost/Views/Page/Select.cshtml b/src/ZKEACMS.WebHost/Views/Page/Select.cshtml
@@ -1,6 +1,6 @@
 @using Easy.ViewPort.jsTree;
 @{
-    this.WorkContext().CurrentPage.Title = L("Page");
+    this.WorkContext().CurrentPage.Title = L("Page").Text;
     Script.Reqiured("jsTree").AtFoot();
     Style.Reqiured("jsTree").AtHead();
     Layout = Layouts.PopUp;

diff --git a/src/ZKEACMS.WebHost/Views/User/PassWord.cshtml b/src/ZKEACMS.WebHost/Views/User/PassWord.cshtml
@@ -1,5 +1,5 @@
 @{
-    this.WorkContext().CurrentPage.Title = L("Change Password");
+    this.WorkContext().CurrentPage.Title = L("Change Password").Text;
     Script.Reqiured("validate").AtFoot();
 }
 @using (Html.BeginForm())