diff --git a/AssemblyInfoShare/SharedAssemblyInfo.cs b/AssemblyInfoShare/SharedAssemblyInfo.cs index eb746daf7..8318693f6 100644 Binary files a/AssemblyInfoShare/SharedAssemblyInfo.cs and b/AssemblyInfoShare/SharedAssemblyInfo.cs differ diff --git a/Telerik.Sitefinity.Frontend.Blogs/Telerik.Sitefinity.Frontend.Blogs.csproj b/Telerik.Sitefinity.Frontend.Blogs/Telerik.Sitefinity.Frontend.Blogs.csproj index 513c04f78..ff227b941 100644 --- a/Telerik.Sitefinity.Frontend.Blogs/Telerik.Sitefinity.Frontend.Blogs.csproj +++ b/Telerik.Sitefinity.Frontend.Blogs/Telerik.Sitefinity.Frontend.Blogs.csproj @@ -80,7 +80,7 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll @@ -168,31 +168,31 @@ - ..\packages\Telerik.Sitefinity.Content.13.2.7500\lib\net48\Telerik.Sitefinity.ContentModules.dll + ..\packages\Telerik.Sitefinity.Content.13.3.7600\lib\net48\Telerik.Sitefinity.ContentModules.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Personalization.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Personalization.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Utilities.dll True - ..\packages\Telerik.Sitefinity.Feather.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Frontend.dll + ..\packages\Telerik.Sitefinity.Feather.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Frontend.dll True - ..\packages\Telerik.Sitefinity.Mvc.13.2.7500\lib\net48\Telerik.Sitefinity.Mvc.dll + ..\packages\Telerik.Sitefinity.Mvc.13.3.7600\lib\net48\Telerik.Sitefinity.Mvc.dll True diff --git a/Telerik.Sitefinity.Frontend.Blogs/packages.config b/Telerik.Sitefinity.Frontend.Blogs/packages.config index 5ac313e57..b57ef400a 100644 --- a/Telerik.Sitefinity.Frontend.Blogs/packages.config +++ b/Telerik.Sitefinity.Frontend.Blogs/packages.config @@ -12,10 +12,10 @@ - + - - - - + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Card/Mvc/Views/web.config b/Telerik.Sitefinity.Frontend.Card/Mvc/Views/web.config new file mode 100644 index 000000000..07a36e665 --- /dev/null +++ b/Telerik.Sitefinity.Frontend.Card/Mvc/Views/web.config @@ -0,0 +1,426 @@ + + + + + +
+
+ +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Card/Telerik.Sitefinity.Frontend.Card.csproj b/Telerik.Sitefinity.Frontend.Card/Telerik.Sitefinity.Frontend.Card.csproj index 03d457b6e..424aa8fe4 100644 --- a/Telerik.Sitefinity.Frontend.Card/Telerik.Sitefinity.Frontend.Card.csproj +++ b/Telerik.Sitefinity.Frontend.Card/Telerik.Sitefinity.Frontend.Card.csproj @@ -79,7 +79,7 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll @@ -150,31 +150,31 @@ - ..\packages\Telerik.Sitefinity.Content.13.2.7500\lib\net48\Telerik.Sitefinity.ContentModules.dll + ..\packages\Telerik.Sitefinity.Content.13.3.7600\lib\net48\Telerik.Sitefinity.ContentModules.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Personalization.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Personalization.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Utilities.dll True - ..\packages\Telerik.Sitefinity.Feather.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Frontend.dll + ..\packages\Telerik.Sitefinity.Feather.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Frontend.dll True - ..\packages\Telerik.Sitefinity.Mvc.13.2.7500\lib\net48\Telerik.Sitefinity.Mvc.dll + ..\packages\Telerik.Sitefinity.Mvc.13.3.7600\lib\net48\Telerik.Sitefinity.Mvc.dll True diff --git a/Telerik.Sitefinity.Frontend.Card/packages.config b/Telerik.Sitefinity.Frontend.Card/packages.config index 5ac313e57..b57ef400a 100644 --- a/Telerik.Sitefinity.Frontend.Card/packages.config +++ b/Telerik.Sitefinity.Frontend.Card/packages.config @@ -12,10 +12,10 @@ - + - - - - + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Comments/Mvc/Models/CommentsModel.cs b/Telerik.Sitefinity.Frontend.Comments/Mvc/Models/CommentsModel.cs index 89dfd31af..c243d5a76 100644 --- a/Telerik.Sitefinity.Frontend.Comments/Mvc/Models/CommentsModel.cs +++ b/Telerik.Sitefinity.Frontend.Comments/Mvc/Models/CommentsModel.cs @@ -159,7 +159,7 @@ protected string LoginPageUrl { get { - var loginRedirectUrl = string.Format("{0}?ReturnUrl={1}", this.GetDefaultLoginUrl(), HttpUtility.UrlEncode(Telerik.Sitefinity.Web.UrlPath.ResolveAbsoluteUrl(SystemManager.CurrentHttpContext.Request.Url.AbsoluteUri))); + var loginRedirectUrl = string.Format("{0}?{1}={2}", this.GetDefaultLoginUrl(), SecurityManager.AuthenticationReturnUrl, HttpUtility.UrlEncode(Telerik.Sitefinity.Web.UrlPath.ResolveAbsoluteUrl(SystemManager.CurrentHttpContext.Request.Url.AbsoluteUri))); return loginRedirectUrl; } diff --git a/Telerik.Sitefinity.Frontend.Comments/Mvc/Views/web.config b/Telerik.Sitefinity.Frontend.Comments/Mvc/Views/web.config new file mode 100644 index 000000000..07a36e665 --- /dev/null +++ b/Telerik.Sitefinity.Frontend.Comments/Mvc/Views/web.config @@ -0,0 +1,426 @@ + + + + + +
+
+ +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Comments/Telerik.Sitefinity.Frontend.Comments.csproj b/Telerik.Sitefinity.Frontend.Comments/Telerik.Sitefinity.Frontend.Comments.csproj index 5a338770f..16d78abaa 100644 --- a/Telerik.Sitefinity.Frontend.Comments/Telerik.Sitefinity.Frontend.Comments.csproj +++ b/Telerik.Sitefinity.Frontend.Comments/Telerik.Sitefinity.Frontend.Comments.csproj @@ -164,31 +164,31 @@ - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Services.Comments.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Services.Comments.dll True - ..\packages\Telerik.Sitefinity.Content.13.2.7500\lib\net48\Telerik.Sitefinity.ContentModules.dll + ..\packages\Telerik.Sitefinity.Content.13.3.7600\lib\net48\Telerik.Sitefinity.ContentModules.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Utilities.dll True - ..\packages\Telerik.Sitefinity.Feather.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Frontend.dll + ..\packages\Telerik.Sitefinity.Feather.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Frontend.dll True - ..\packages\Telerik.Sitefinity.Mvc.13.2.7500\lib\net48\Telerik.Sitefinity.Mvc.dll + ..\packages\Telerik.Sitefinity.Mvc.13.3.7600\lib\net48\Telerik.Sitefinity.Mvc.dll True diff --git a/Telerik.Sitefinity.Frontend.Comments/packages.config b/Telerik.Sitefinity.Frontend.Comments/packages.config index a43a527c0..8a5e3676c 100644 --- a/Telerik.Sitefinity.Frontend.Comments/packages.config +++ b/Telerik.Sitefinity.Frontend.Comments/packages.config @@ -9,8 +9,8 @@ - - - - + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.ContentBlock/Mvc/Views/web.config b/Telerik.Sitefinity.Frontend.ContentBlock/Mvc/Views/web.config new file mode 100644 index 000000000..07a36e665 --- /dev/null +++ b/Telerik.Sitefinity.Frontend.ContentBlock/Mvc/Views/web.config @@ -0,0 +1,426 @@ + + + + + +
+
+ +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.ContentBlock/Telerik.Sitefinity.Frontend.ContentBlock.csproj b/Telerik.Sitefinity.Frontend.ContentBlock/Telerik.Sitefinity.Frontend.ContentBlock.csproj index 8995e3a8f..9789a554c 100644 --- a/Telerik.Sitefinity.Frontend.ContentBlock/Telerik.Sitefinity.Frontend.ContentBlock.csproj +++ b/Telerik.Sitefinity.Frontend.ContentBlock/Telerik.Sitefinity.Frontend.ContentBlock.csproj @@ -150,31 +150,31 @@ - ..\packages\Telerik.Sitefinity.Content.13.2.7500\lib\net48\Telerik.Sitefinity.ContentModules.dll + ..\packages\Telerik.Sitefinity.Content.13.3.7600\lib\net48\Telerik.Sitefinity.ContentModules.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Personalization.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Personalization.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Utilities.dll True - ..\packages\Telerik.Sitefinity.Feather.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Frontend.dll + ..\packages\Telerik.Sitefinity.Feather.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Frontend.dll True - ..\packages\Telerik.Sitefinity.Mvc.13.2.7500\lib\net48\Telerik.Sitefinity.Mvc.dll + ..\packages\Telerik.Sitefinity.Mvc.13.3.7600\lib\net48\Telerik.Sitefinity.Mvc.dll True diff --git a/Telerik.Sitefinity.Frontend.ContentBlock/packages.config b/Telerik.Sitefinity.Frontend.ContentBlock/packages.config index bb502397c..2642699dc 100644 --- a/Telerik.Sitefinity.Frontend.ContentBlock/packages.config +++ b/Telerik.Sitefinity.Frontend.ContentBlock/packages.config @@ -9,8 +9,8 @@ - - - - + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.DynamicContent/Mvc/Views/web.config b/Telerik.Sitefinity.Frontend.DynamicContent/Mvc/Views/web.config new file mode 100644 index 000000000..07a36e665 --- /dev/null +++ b/Telerik.Sitefinity.Frontend.DynamicContent/Mvc/Views/web.config @@ -0,0 +1,426 @@ + + + + + +
+
+ +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.DynamicContent/Telerik.Sitefinity.Frontend.DynamicContent.csproj b/Telerik.Sitefinity.Frontend.DynamicContent/Telerik.Sitefinity.Frontend.DynamicContent.csproj index 8b872c18a..3a885c86c 100644 --- a/Telerik.Sitefinity.Frontend.DynamicContent/Telerik.Sitefinity.Frontend.DynamicContent.csproj +++ b/Telerik.Sitefinity.Frontend.DynamicContent/Telerik.Sitefinity.Frontend.DynamicContent.csproj @@ -77,7 +77,7 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll @@ -211,35 +211,35 @@ - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Services.Events.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Services.Events.dll True - ..\packages\Telerik.Sitefinity.Content.13.2.7500\lib\net48\Telerik.Sitefinity.ContentModules.dll + ..\packages\Telerik.Sitefinity.Content.13.3.7600\lib\net48\Telerik.Sitefinity.ContentModules.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Personalization.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Personalization.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Utilities.dll True - ..\packages\Telerik.Sitefinity.Feather.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Frontend.dll + ..\packages\Telerik.Sitefinity.Feather.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Frontend.dll True - ..\packages\Telerik.Sitefinity.Mvc.13.2.7500\lib\net48\Telerik.Sitefinity.Mvc.dll + ..\packages\Telerik.Sitefinity.Mvc.13.3.7600\lib\net48\Telerik.Sitefinity.Mvc.dll True diff --git a/Telerik.Sitefinity.Frontend.DynamicContent/packages.config b/Telerik.Sitefinity.Frontend.DynamicContent/packages.config index c14253fa2..aa43bcd3f 100644 --- a/Telerik.Sitefinity.Frontend.DynamicContent/packages.config +++ b/Telerik.Sitefinity.Frontend.DynamicContent/packages.config @@ -12,10 +12,10 @@ - + - - - - + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.EmailCampaigns/Mvc/Views/web.config b/Telerik.Sitefinity.Frontend.EmailCampaigns/Mvc/Views/web.config new file mode 100644 index 000000000..07a36e665 --- /dev/null +++ b/Telerik.Sitefinity.Frontend.EmailCampaigns/Mvc/Views/web.config @@ -0,0 +1,426 @@ + + + + + +
+
+ +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.EmailCampaigns/Telerik.Sitefinity.Frontend.EmailCampaigns.csproj b/Telerik.Sitefinity.Frontend.EmailCampaigns/Telerik.Sitefinity.Frontend.EmailCampaigns.csproj index 3e7306dab..7803f85e7 100644 --- a/Telerik.Sitefinity.Frontend.EmailCampaigns/Telerik.Sitefinity.Frontend.EmailCampaigns.csproj +++ b/Telerik.Sitefinity.Frontend.EmailCampaigns/Telerik.Sitefinity.Frontend.EmailCampaigns.csproj @@ -86,7 +86,7 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll @@ -173,27 +173,27 @@ - ..\packages\Telerik.Sitefinity.Content.13.2.7500\lib\net48\Telerik.Sitefinity.ContentModules.dll + ..\packages\Telerik.Sitefinity.Content.13.3.7600\lib\net48\Telerik.Sitefinity.ContentModules.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Utilities.dll True - ..\packages\Telerik.Sitefinity.Feather.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Frontend.dll + ..\packages\Telerik.Sitefinity.Feather.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Frontend.dll True - ..\packages\Telerik.Sitefinity.Mvc.13.2.7500\lib\net48\Telerik.Sitefinity.Mvc.dll + ..\packages\Telerik.Sitefinity.Mvc.13.3.7600\lib\net48\Telerik.Sitefinity.Mvc.dll True diff --git a/Telerik.Sitefinity.Frontend.EmailCampaigns/packages.config b/Telerik.Sitefinity.Frontend.EmailCampaigns/packages.config index d0c3a350a..555f1632f 100644 --- a/Telerik.Sitefinity.Frontend.EmailCampaigns/packages.config +++ b/Telerik.Sitefinity.Frontend.EmailCampaigns/packages.config @@ -12,10 +12,10 @@ - + - - - - + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Events/Mvc/Views/web.config b/Telerik.Sitefinity.Frontend.Events/Mvc/Views/web.config new file mode 100644 index 000000000..07a36e665 --- /dev/null +++ b/Telerik.Sitefinity.Frontend.Events/Mvc/Views/web.config @@ -0,0 +1,426 @@ + + + + + +
+
+ +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Events/Telerik.Sitefinity.Frontend.Events.csproj b/Telerik.Sitefinity.Frontend.Events/Telerik.Sitefinity.Frontend.Events.csproj index a0db52e39..1633ef127 100644 --- a/Telerik.Sitefinity.Frontend.Events/Telerik.Sitefinity.Frontend.Events.csproj +++ b/Telerik.Sitefinity.Frontend.Events/Telerik.Sitefinity.Frontend.Events.csproj @@ -79,7 +79,7 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll @@ -186,39 +186,39 @@ - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Services.Events.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Services.Events.dll True - ..\packages\Telerik.Sitefinity.Content.13.2.7500\lib\net48\Telerik.Sitefinity.ContentModules.dll + ..\packages\Telerik.Sitefinity.Content.13.3.7600\lib\net48\Telerik.Sitefinity.ContentModules.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Personalization.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Personalization.dll True - ..\packages\Telerik.Sitefinity.Content.13.2.7500\lib\net48\Telerik.Sitefinity.RecurrentRules.dll + ..\packages\Telerik.Sitefinity.Content.13.3.7600\lib\net48\Telerik.Sitefinity.RecurrentRules.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Utilities.dll True - ..\packages\Telerik.Sitefinity.Feather.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Frontend.dll + ..\packages\Telerik.Sitefinity.Feather.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Frontend.dll True - ..\packages\Telerik.Sitefinity.Mvc.13.2.7500\lib\net48\Telerik.Sitefinity.Mvc.dll + ..\packages\Telerik.Sitefinity.Mvc.13.3.7600\lib\net48\Telerik.Sitefinity.Mvc.dll True diff --git a/Telerik.Sitefinity.Frontend.Events/packages.config b/Telerik.Sitefinity.Frontend.Events/packages.config index 76fa92d54..b4e46eaf8 100644 --- a/Telerik.Sitefinity.Frontend.Events/packages.config +++ b/Telerik.Sitefinity.Frontend.Events/packages.config @@ -13,10 +13,10 @@ - + - - - - + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Forms/Mvc/Scripts/EmailTextField/designerview-simple.js b/Telerik.Sitefinity.Frontend.Forms/Mvc/Scripts/EmailTextField/designerview-simple.js index ad23c587a..f805df29a 100644 --- a/Telerik.Sitefinity.Frontend.Forms/Mvc/Scripts/EmailTextField/designerview-simple.js +++ b/Telerik.Sitefinity.Frontend.Forms/Mvc/Scripts/EmailTextField/designerview-simple.js @@ -27,7 +27,7 @@ $scope.$watch( 'defaultValue.value', function (newDefaultValue, oldDefaultValue) { - if (newDefaultValue !== oldDefaultValue) { + if (newDefaultValue !== oldDefaultValue && $scope.properties) { $scope.properties.Model.MetaField.DefaultValue.PropertyValue = angular.element("#predefinedValue").val(); } }, diff --git a/Telerik.Sitefinity.Frontend.Forms/Mvc/Scripts/FileField/designerview-simple.js b/Telerik.Sitefinity.Frontend.Forms/Mvc/Scripts/FileField/designerview-simple.js index a1fc0811f..31f0c0ff2 100644 --- a/Telerik.Sitefinity.Frontend.Forms/Mvc/Scripts/FileField/designerview-simple.js +++ b/Telerik.Sitefinity.Frontend.Forms/Mvc/Scripts/FileField/designerview-simple.js @@ -69,7 +69,10 @@ function (newValue, oldValue) { if (newValue === 'All') { $scope.state.selectedFileTypeCategories = []; - $scope.properties.Model.AllowedFileTypes.PropertyValue = 'All'; + + if ($scope.properties) { + $scope.properties.Model.AllowedFileTypes.PropertyValue = 'All'; + } } }, true @@ -78,7 +81,7 @@ $scope.$watch( 'state.commaSeparatedFileTypes', function (newValue, oldValue) { - if (newValue) + if (newValue && $scope.properties) $scope.properties.Model.OtherFileTypes.PropertyValue = newValue.split(',').join(';'); } ); diff --git a/Telerik.Sitefinity.Frontend.Forms/Mvc/Scripts/MultipleChoiceField/designerview-simple.js b/Telerik.Sitefinity.Frontend.Forms/Mvc/Scripts/MultipleChoiceField/designerview-simple.js index 444026283..7aa12ce04 100644 --- a/Telerik.Sitefinity.Frontend.Forms/Mvc/Scripts/MultipleChoiceField/designerview-simple.js +++ b/Telerik.Sitefinity.Frontend.Forms/Mvc/Scripts/MultipleChoiceField/designerview-simple.js @@ -9,7 +9,7 @@ $scope.$watch( 'defaultValue', function (newDefaultValue, oldDefaultValue) { - if (newDefaultValue) { + if (newDefaultValue && $scope.properties) { $scope.properties.Model.ValidatorDefinition.Required.PropertyValue = 'False'; } }, diff --git a/Telerik.Sitefinity.Frontend.Forms/Mvc/Scripts/TextField/designerview-simple.js b/Telerik.Sitefinity.Frontend.Forms/Mvc/Scripts/TextField/designerview-simple.js index cada451d5..d440b5fb2 100644 --- a/Telerik.Sitefinity.Frontend.Forms/Mvc/Scripts/TextField/designerview-simple.js +++ b/Telerik.Sitefinity.Frontend.Forms/Mvc/Scripts/TextField/designerview-simple.js @@ -27,7 +27,7 @@ $scope.$watch( 'defaultValue.value', function (newDefaultValue, oldDefaultValue) { - if (newDefaultValue !== oldDefaultValue) { + if (newDefaultValue !== oldDefaultValue && $scope.properties) { $scope.properties.Model.MetaField.DefaultValue.PropertyValue = angular.element("#predefinedValue").val(); } }, diff --git a/Telerik.Sitefinity.Frontend.Forms/Mvc/Views/EmailTextField/DesignerView.Simple.cshtml b/Telerik.Sitefinity.Frontend.Forms/Mvc/Views/EmailTextField/DesignerView.Simple.cshtml index 19667a84d..685128775 100644 --- a/Telerik.Sitefinity.Frontend.Forms/Mvc/Views/EmailTextField/DesignerView.Simple.cshtml +++ b/Telerik.Sitefinity.Frontend.Forms/Mvc/Views/EmailTextField/DesignerView.Simple.cshtml @@ -36,7 +36,7 @@
-

@Html.Resource("ExampleExplanation")

diff --git a/Telerik.Sitefinity.Frontend.Forms/Mvc/Views/FileField/DesignerView.Simple.cshtml b/Telerik.Sitefinity.Frontend.Forms/Mvc/Views/FileField/DesignerView.Simple.cshtml index b529c6ad5..205094e4f 100644 --- a/Telerik.Sitefinity.Frontend.Forms/Mvc/Views/FileField/DesignerView.Simple.cshtml +++ b/Telerik.Sitefinity.Frontend.Forms/Mvc/Views/FileField/DesignerView.Simple.cshtml @@ -26,7 +26,7 @@
-

@Html.Resource("ExampleExplanation")

diff --git a/Telerik.Sitefinity.Frontend.Forms/Mvc/Views/ParagraphTextField/DesignerView.Simple.cshtml b/Telerik.Sitefinity.Frontend.Forms/Mvc/Views/ParagraphTextField/DesignerView.Simple.cshtml index 9e916c55e..23d8ed00f 100644 --- a/Telerik.Sitefinity.Frontend.Forms/Mvc/Views/ParagraphTextField/DesignerView.Simple.cshtml +++ b/Telerik.Sitefinity.Frontend.Forms/Mvc/Views/ParagraphTextField/DesignerView.Simple.cshtml @@ -23,7 +23,7 @@ -
@Html.Resource("ExampleExplanation")
diff --git a/Telerik.Sitefinity.Frontend.Forms/Mvc/Views/TextField/DesignerView.Simple.cshtml b/Telerik.Sitefinity.Frontend.Forms/Mvc/Views/TextField/DesignerView.Simple.cshtml index b53ce7422..e0c33d396 100644 --- a/Telerik.Sitefinity.Frontend.Forms/Mvc/Views/TextField/DesignerView.Simple.cshtml +++ b/Telerik.Sitefinity.Frontend.Forms/Mvc/Views/TextField/DesignerView.Simple.cshtml @@ -36,7 +36,7 @@
-

@Html.Resource("ExampleExplanation")

diff --git a/Telerik.Sitefinity.Frontend.Forms/Mvc/Views/web.config b/Telerik.Sitefinity.Frontend.Forms/Mvc/Views/web.config new file mode 100644 index 000000000..07a36e665 --- /dev/null +++ b/Telerik.Sitefinity.Frontend.Forms/Mvc/Views/web.config @@ -0,0 +1,426 @@ + + + + + +
+
+ +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Forms/Telerik.Sitefinity.Frontend.Forms.csproj b/Telerik.Sitefinity.Frontend.Forms/Telerik.Sitefinity.Frontend.Forms.csproj index b3bf07899..fe94031d0 100644 --- a/Telerik.Sitefinity.Frontend.Forms/Telerik.Sitefinity.Frontend.Forms.csproj +++ b/Telerik.Sitefinity.Frontend.Forms/Telerik.Sitefinity.Frontend.Forms.csproj @@ -79,7 +79,7 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll @@ -121,17 +121,17 @@ ..\packages\Telerik.DataAccess.Core.2020.0.428.1\lib\net40\Telerik.OpenAccess.Runtime.dll - - ..\packages\Telerik.Web.UI.2020.3.915.45\lib\net45\Telerik.Web.Design.dll + + ..\packages\Telerik.Web.UI.2021.1.119.45\lib\net45\Telerik.Web.Design.dll - - ..\packages\Telerik.Web.UI.2020.3.915.45\lib\net45\Telerik.Web.Spreadsheet.dll + + ..\packages\Telerik.Web.UI.2021.1.119.45\lib\net45\Telerik.Web.Spreadsheet.dll - - ..\packages\Telerik.Web.UI.2020.3.915.45\lib\net45\Telerik.Web.UI.dll + + ..\packages\Telerik.Web.UI.2021.1.119.45\lib\net45\Telerik.Web.UI.dll - - ..\packages\Telerik.Web.UI.2020.3.915.45\lib\net45\Telerik.Web.UI.Skins.dll + + ..\packages\Telerik.Web.UI.2021.1.119.45\lib\net45\Telerik.Web.UI.Skins.dll @@ -366,31 +366,31 @@ - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Services.Events.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Services.Events.dll True - ..\packages\Telerik.Sitefinity.Content.13.2.7500\lib\net48\Telerik.Sitefinity.ContentModules.dll + ..\packages\Telerik.Sitefinity.Content.13.3.7600\lib\net48\Telerik.Sitefinity.ContentModules.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Utilities.dll True - ..\packages\Telerik.Sitefinity.Feather.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Frontend.dll + ..\packages\Telerik.Sitefinity.Feather.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Frontend.dll True - ..\packages\Telerik.Sitefinity.Mvc.13.2.7500\lib\net48\Telerik.Sitefinity.Mvc.dll + ..\packages\Telerik.Sitefinity.Mvc.13.3.7600\lib\net48\Telerik.Sitefinity.Mvc.dll True diff --git a/Telerik.Sitefinity.Frontend.Forms/packages.config b/Telerik.Sitefinity.Frontend.Forms/packages.config index 8484c91d4..e0490e337 100644 --- a/Telerik.Sitefinity.Frontend.Forms/packages.config +++ b/Telerik.Sitefinity.Frontend.Forms/packages.config @@ -12,11 +12,11 @@ - + - - - - - + + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Identity/Mvc/Helpers/RegistrationHelper.cs b/Telerik.Sitefinity.Frontend.Identity/Mvc/Helpers/RegistrationHelper.cs new file mode 100644 index 000000000..dbeaab843 --- /dev/null +++ b/Telerik.Sitefinity.Frontend.Identity/Mvc/Helpers/RegistrationHelper.cs @@ -0,0 +1,84 @@ +using System.Collections.Generic; +using System.Linq; +using Telerik.Sitefinity.Localization; +using Telerik.Sitefinity.ModuleEditor.Web.Services.Model; +using Telerik.Sitefinity.Security.Model; +using Telerik.Sitefinity.Web.UI.Fields.Config; +using Telerik.Sitefinity.Web.UI.Validation.Contracts; + +namespace Telerik.Sitefinity.Frontend.Identity.Mvc.Helpers +{ + public static class RegistrationHelper + { + + /// + /// Get Profile validation attributes + /// + /// + /// + public static Dictionary GetProfileValidationAttributes(string fieldName) + { + var validation = RegistrationHelper.GetFieldValidatorDefinition(fieldName); + var validationAttributes = new Dictionary(); + var requiredErrorMessage = string.Empty; + var lengthErrorMessage = string.Empty; + + validationAttributes.Add("data-val", "true"); + + if (validation.Required.HasValue && validation.Required.Value) + { + if (validation.RequiredViolationMessage != null) + { + requiredErrorMessage = Res.Get(validation.RequiredViolationMessage).StartsWith(MissingResourcePrefix) ? validation.RequiredViolationMessage : Res.Get(validation.RequiredViolationMessage); + } + + validationAttributes.Add("data-val-required", requiredErrorMessage); + } + + if (validation.MaxLengthViolationMessage != null) + { + lengthErrorMessage = Res.Get(validation.MaxLengthViolationMessage).StartsWith(MissingResourcePrefix) ? validation.MaxLengthViolationMessage : Res.Get(validation.MaxLengthViolationMessage); + } + + validationAttributes.Add("data-val-length", lengthErrorMessage); + validationAttributes.Add("data-val-length-min", validation.MinLength); + + if (validation.MaxLength > 0) + validationAttributes.Add("data-val-length-max", validation.MaxLength); + + return validationAttributes; + } + + /// + /// Get validator definition for specific field + /// + /// Field name + /// + public static IValidatorDefinition GetFieldValidatorDefinition(string fieldName) + { + var views = CustomFieldsContext.GetViews(typeof(SitefinityProfile).FullName); + var view = views.FirstOrDefault(); + + foreach (var section in view.Sections.Values) + { + if (section != null) + { + // get configuration element + FieldDefinitionElement fieldDefinitionElement = WcfDefinitionBuilder.GetFieldDefinitionElement(fieldName, section); + var fieldControlDefinitionElement = fieldDefinitionElement as FieldControlDefinitionElement; + + if (fieldControlDefinitionElement != null) + { + // transfer complex properties like validation + if (fieldControlDefinitionElement.Validation != null) + return fieldControlDefinitionElement.Validation; + } + } + } + + return null; + } + + private const string MissingResourcePrefix = "#ResourceNotFound#"; + } +} diff --git a/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/ChangePassword/ChangePasswordModel.cs b/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/ChangePassword/ChangePasswordModel.cs index 62cf54ea3..6c83989fa 100644 --- a/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/ChangePassword/ChangePasswordModel.cs +++ b/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/ChangePassword/ChangePasswordModel.cs @@ -21,7 +21,6 @@ public string MembershipProvider { get { - this.membershipProvider = this.membershipProvider ?? UserManager.GetDefaultProviderName(); return this.membershipProvider; } set @@ -49,14 +48,20 @@ public string MembershipProvider /// public virtual void ChangePassword(Guid userId, string oldPassword, string newPassword) { - UserManager.ChangePasswordForUser(UserManager.GetManager(this.MembershipProvider), userId, oldPassword, newPassword, this.SendEmailOnChangePassword); + var providerName = this.MembershipProvider; + var currentIdentity = Sitefinity.Security.Claims.ClaimsManager.GetCurrentIdentity(); + if (currentIdentity != null && currentIdentity.UserId == userId) + providerName = currentIdentity.MembershipProvider; + + UserManager.ChangePasswordForUser(UserManager.GetManager(providerName), userId, oldPassword, newPassword, this.SendEmailOnChangePassword); } /// public virtual ChangePasswordViewModel GetViewModel() { - var userId = SecurityManager.GetCurrentUserId(); - var userManager = UserManager.GetManager(SecurityManager.GetUser(userId).ProviderName); + var currentIdentity = Sitefinity.Security.Claims.ClaimsManager.GetCurrentIdentity(); + var userId = currentIdentity.UserId; + var userManager = UserManager.GetManager(currentIdentity.MembershipProvider); var user = userManager.GetUser(userId); return new ChangePasswordViewModel() diff --git a/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/LoginForm/LoginFormModel.cs b/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/LoginForm/LoginFormModel.cs index 284c1b5bf..af0a44995 100644 --- a/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/LoginForm/LoginFormModel.cs +++ b/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/LoginForm/LoginFormModel.cs @@ -7,6 +7,7 @@ using Telerik.Sitefinity.Abstractions; using Telerik.Sitefinity.Data; using Telerik.Sitefinity.Frontend.Mvc.Helpers; +using Telerik.Sitefinity.Mvc.Proxy; using Telerik.Sitefinity.Security; using Telerik.Sitefinity.Security.Claims; using Telerik.Sitefinity.Security.Configuration; @@ -303,7 +304,30 @@ public virtual LoginFormViewModel Authenticate(LoginFormViewModel input, HttpCon if (Config.Get().AuthenticationMode == SecConfig.AuthenticationMode.Claims) { var owinContext = context.Request.GetOwinContext(); - var errorRedirectUrl = context.Request.UrlReferrer?.AbsoluteUri ?? context.Request.Url.ToString(); + + string errorRedirectUrl; + + if (context.Request.UrlReferrer?.AbsoluteUri != null) + { + errorRedirectUrl = context.Request.UrlReferrer.AbsoluteUri; + + var param = context.Request.Params[MvcControllerProxy.ControllerKey]; + + if (param != null) + { + var uriBuilder = new UriBuilder(errorRedirectUrl); + var query = HttpUtility.ParseQueryString(uriBuilder.Query); + query[LoginControllerKey] = param; + uriBuilder.Query = query.ToString(); + + errorRedirectUrl = uriBuilder.ToString(); + } + } + else + { + errorRedirectUrl = context.Request.Url.ToString(); + } + var challengeProperties = ChallengeProperties.ForLocalUser(input.UserName, input.Password, this.MembershipProvider, input.RememberMe, errorRedirectUrl); challengeProperties.RedirectUri = this.GetReturnURL(context); owinContext.Authentication.Challenge(challengeProperties, ClaimsManager.CurrentAuthenticationModule.STSAuthenticationType); @@ -392,8 +416,11 @@ private bool TryResolveUrlFromUrlReferrer(HttpContextBase context, out string re case "redirect_uri": redirectUri = queryParamKeyValuePair[1].UrlDecode(); break; - case "ReturnUrl": - returnUrl = queryParamKeyValuePair[1].UrlDecode(); + default: + if (queryParamKeyValuePair[0] == SecurityManager.AuthenticationReturnUrl) + { + returnUrl = queryParamKeyValuePair[1].UrlDecode(); + } break; } @@ -529,6 +556,7 @@ protected internal string GetReturnURL(HttpContextBase context) private string serviceUrl; private const string DefaultRealmConfig = "http://localhost"; + private const string LoginControllerKey = "sf_login_cntrl_id"; private string membershipProvider; private string serializedExternalProviders; diff --git a/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/Registration/RegistrationModel.cs b/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/Registration/RegistrationModel.cs index 49105405a..19a12b82e 100644 --- a/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/Registration/RegistrationModel.cs +++ b/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/Registration/RegistrationModel.cs @@ -48,7 +48,11 @@ public string MembershipProviderName { get { - this.membershipProviderName = this.membershipProviderName ?? UserManager.GetDefaultProviderName(); + if (string.IsNullOrEmpty(this.membershipProviderName)) + { + this.membershipProviderName = SystemManager.CurrentContext.CurrentSite.GetDefaultProvider(typeof(UserManager).FullName)?.ProviderName ?? UserManager.GetDefaultProviderName(); + } + return this.membershipProviderName; } set @@ -85,7 +89,7 @@ public string SerializedSelectedRoles } } } - + /// public string SerializedExternalProviders { @@ -98,10 +102,10 @@ public string SerializedExternalProviders if (this.serializedExternalProviders != value) { this.serializedExternalProviders = value; - } + } } } - + /// public SuccessfulRegistrationAction SuccessfulRegistrationAction { get; set; } @@ -194,9 +198,9 @@ public Guid? ConfirmationEmailTemplateId public virtual string SuccessfulRegistrationSenderEmail { get; set; } public virtual string ConfirmRegistrationSenderEmail { get; set; } - + public virtual string SuccessfulRegistrationSenderName { get; set; } - + public virtual string ConfirmRegistrationSenderName { get; set; } /// @@ -224,7 +228,7 @@ public Guid? ConfirmationEmailTemplateId /// public virtual void InitializeViewModel(RegistrationViewModel viewModel) { - if(viewModel != null) + if (viewModel != null) { viewModel.LoginPageUrl = this.GetLoginPageUrl(); viewModel.MembershipProviderName = this.MembershipProviderName; @@ -235,7 +239,7 @@ public virtual void InitializeViewModel(RegistrationViewModel viewModel) if (!string.IsNullOrEmpty(this.serializedExternalProviders)) { viewModel.ExternalProviders = JsonSerializer.DeserializeFromString>(this.serializedExternalProviders); - } + } } } @@ -316,12 +320,12 @@ public virtual bool ResendConfirmationEmail(string email) /// Current http context from controller public void AuthenticateExternal(string input, HttpContextBase context) { - Telerik.Sitefinity.Web.Url returnUri; + Telerik.Sitefinity.Web.Url returnUri; if (this.SuccessfulRegistrationAction == SuccessfulRegistrationAction.RedirectToPage) { returnUri = new Telerik.Sitefinity.Web.Url(this.GetPageUrl(this.SuccessfulRegistrationPageId)); - } + } else { returnUri = new Telerik.Sitefinity.Web.Url(context.Request.UrlReferrer.ToString()); @@ -336,7 +340,7 @@ public void AuthenticateExternal(string input, HttpContextBase context) { returnUri.Query.Add("ShowActivationMsg", "true"); } - + var owinContext = context.Request.GetOwinContext(); var selectedRoles = this.selectedRoles.Select(x => x.Name).ToJson(); @@ -428,7 +432,7 @@ protected virtual void AssignRolesToUser(User user) } } } - + /// /// Gets the manager. /// @@ -488,7 +492,7 @@ protected virtual bool TryCreateUser(UserManager manager, RegistrationViewModel { user = manager.CreateUser(userData.Email, userData.Password, userData.Email, null, null, this.ActivationMethod == ActivationMethod.Immediately, null, out status); } - + return status == MembershipCreateStatus.Success; } @@ -611,7 +615,7 @@ protected virtual string GetConfirmationPageUrl(User user) return string.Empty; } - return UserRegistrationEmailGenerator.GetConfirmationPageUrl(confirmationPageUrl, user.Id, this.MembershipProviderName, ReturnUrlName, this.DefaultReturnUrl); + return UserRegistrationEmailGenerator.GetConfirmationPageUrl(confirmationPageUrl, user.Id, this.MembershipProviderName, SecurityManager.AuthenticationReturnUrl, this.DefaultReturnUrl); } /// @@ -658,17 +662,16 @@ protected virtual Guid GetDefaultEmailTemplate(string emailType) private string membershipProviderName; private string successEmailSubject = Res.Get().SuccessEmailDefaultSubject; private string confirmationEmailSubject = Res.Get().ConfirmationEmailDefaultSubject; - private const string ReturnUrlName = "ReturnUrl"; private const string ProfileBindingsFile = "~/Frontend-Assembly/Telerik.Sitefinity.Frontend.Identity/Mvc/Views/Registration/ProfileBindings.json"; private const string DefaultSortExpression = "PublicationDate DESC"; - private string serializedSelectedRoles; + private string serializedSelectedRoles; private IList selectedRoles = new List(); private Dictionary roleManagersToSubmit = null; private Guid? successEmailTemplateId; private Guid? confirmationEmailTemplateId; private string serializedExternalProviders; - + #endregion private class Role @@ -678,6 +681,6 @@ private class Role public string Name { get; set; } public string ProviderName { get; set; } - } + } } } diff --git a/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/Registration/RegistrationViewModel.cs b/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/Registration/RegistrationViewModel.cs index 1b6d51d2c..326b4a99b 100644 --- a/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/Registration/RegistrationViewModel.cs +++ b/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/Registration/RegistrationViewModel.cs @@ -2,7 +2,9 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Web.Mvc; +using Telerik.Sitefinity.Frontend.Identity.Mvc.Helpers; using Telerik.Sitefinity.Frontend.Identity.Mvc.StringResources; +using Telerik.Sitefinity.Localization; namespace Telerik.Sitefinity.Frontend.Identity.Mvc.Models.Registration { @@ -10,7 +12,7 @@ namespace Telerik.Sitefinity.Frontend.Identity.Mvc.Models.Registration /// This class represents view model for the . /// [Bind(Include = "RequiresQuestionAndAnswer, Password, Question, Answer, ReTypePassword, Email, Profile, ExternalProviders")] - public class RegistrationViewModel + public class RegistrationViewModel : IValidatableObject { /// /// Initializes a new instance of the class. @@ -116,7 +118,7 @@ public RegistrationViewModel() /// /// The profile. /// - public IDictionary Profile { get; private set; } + public IDictionary Profile { get; set; } /// /// Gets or sets the external providers. @@ -125,5 +127,45 @@ public RegistrationViewModel() /// External providers. /// public IDictionary ExternalProviders { get; set; } + + public virtual IEnumerable Validate(ValidationContext validationContext) + { + foreach (var info in Profile) + { + var validation = RegistrationHelper.GetFieldValidatorDefinition(info.Key); + + if (validation != null) + { + if (validation.Required.HasValue && validation.Required.Value && string.IsNullOrEmpty(info.Value)) + { + var requiredErrorMessage = this.GetErrorMessageFromResource(validation.RequiredViolationMessage); + + yield return new ValidationResult($"{requiredErrorMessage}", new List { "Profile[" + info.Key + "]" }); + } + else if (info.Value.Length > 1) + { + if (info.Value.Length < (int)validation.MinLength || ((int)validation.MaxLength != 0 && info.Value.Length > (int)validation.MaxLength)) + { + var lengthErrorMessage = this.GetErrorMessageFromResource(validation.MaxLengthViolationMessage); + + yield return new ValidationResult($"{lengthErrorMessage}", new List { "Profile[" + info.Key + "]" }); + } + } + } + } + } + + private string GetErrorMessageFromResource(string violationMessage) + { + const string MissingResourcePrefix = "#ResourceNotFound#"; + string errorMessage = string.Empty; + + if (violationMessage != null) + { + errorMessage = Res.Get(violationMessage).StartsWith(MissingResourcePrefix) ? violationMessage : Res.Get(violationMessage); + } + + return errorMessage; + } } } diff --git a/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/UsersList/UsersListModel.cs b/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/UsersList/UsersListModel.cs index f310d1249..ff5bb48d8 100644 --- a/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/UsersList/UsersListModel.cs +++ b/Telerik.Sitefinity.Frontend.Identity/Mvc/Models/UsersList/UsersListModel.cs @@ -453,28 +453,31 @@ protected IQueryable UpdateExpression(int? skip, int? take, ref int? totalCount) [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Expr"), System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1045:DoNotPassTypesByReference", MessageId = "5#")] protected IQueryable SetExpression(string filterExpression, string sortExpr, int? itemsToSkip, int? itemsToTake, ref int? totalCount) { - IQueryable query = null; var profileType = TypeResolutionService.ResolveType(this.ProfileTypeFullName); var skip = itemsToSkip.HasValue ? itemsToSkip.Value : 0; var take = itemsToTake.HasValue ? itemsToTake.Value : 0; + IQueryable query = this.Manager.Provider.GetItems(profileType, null, null, 0, 0).AsQueryable(); + var userProviders = UserManager.GetManager().GetContextProviders().Select(p => p.Name).ToArray(); + query = query.Cast().Where(p => p.UserLinks.Any(l => userProviders.Contains(l.MembershipManagerInfo.ProviderName))); + try { - query = this.Manager.Provider.GetItems( - profileType, + query = DataProviderBase.SetExpressions( + query, filterExpression, sortExpr, skip, take, - ref totalCount).AsQueryable(); + ref totalCount); } catch (MemberAccessException) { this.SortExpression = DefaultSortExpression; - query = this.Manager.Provider.GetItems( - profileType, + query = DataProviderBase.SetExpressions( + query, filterExpression, null, skip, diff --git a/Telerik.Sitefinity.Frontend.Identity/Mvc/StringResources/RegistrationResources.cs b/Telerik.Sitefinity.Frontend.Identity/Mvc/StringResources/RegistrationResources.cs index cc2ffed36..db33509e9 100644 --- a/Telerik.Sitefinity.Frontend.Identity/Mvc/StringResources/RegistrationResources.cs +++ b/Telerik.Sitefinity.Frontend.Identity/Mvc/StringResources/RegistrationResources.cs @@ -486,6 +486,21 @@ public string Provider } } + /// + /// Gets phrase: User group + /// + [ResourceEntry("UserGroup", + Value = "User group", + Description = "phrase : User group", + LastModified = "2021/02/09")] + public string UserGroup + { + get + { + return this["UserGroup"]; + } + } + /// /// Gets phrase: where the user will be registered /// diff --git a/Telerik.Sitefinity.Frontend.Identity/Mvc/Views/LoginForm/LoginForm.LoginForm.cshtml b/Telerik.Sitefinity.Frontend.Identity/Mvc/Views/LoginForm/LoginForm.LoginForm.cshtml index b162d610d..94166ddcb 100644 --- a/Telerik.Sitefinity.Frontend.Identity/Mvc/Views/LoginForm/LoginForm.LoginForm.cshtml +++ b/Telerik.Sitefinity.Frontend.Identity/Mvc/Views/LoginForm/LoginForm.LoginForm.cshtml @@ -4,6 +4,7 @@ @using Telerik.Sitefinity.Frontend.Mvc.Helpers; @using Telerik.Sitefinity.Modules.Pages; @using Telerik.Sitefinity.Services; +@using Telerik.Sitefinity.Web; @*Add scripts and stylesheets*@ @Html.Script(ScriptRef.JQuery, "top", false) @@ -21,7 +22,7 @@ @Html.ValidationSummary(true)

@Html.Resource("LoginFormLogInLegendHeader")

- if (Request.Url.Query.Contains("err=true") || Model.LoginError) + if ((!string.IsNullOrEmpty(Request.QueryStringGet("err")) && ViewBag.ControllerId.Equals(Request.QueryStringGet("sf_login_cntrl_id"))) || Model.LoginError) {

@Html.Resource("IncorrectCredentialsMessage")

} diff --git a/Telerik.Sitefinity.Frontend.Identity/Mvc/Views/Registration/DesignerView.Simple.cshtml b/Telerik.Sitefinity.Frontend.Identity/Mvc/Views/Registration/DesignerView.Simple.cshtml index fc32bbd7f..1825930b8 100644 --- a/Telerik.Sitefinity.Frontend.Identity/Mvc/Views/Registration/DesignerView.Simple.cshtml +++ b/Telerik.Sitefinity.Frontend.Identity/Mvc/Views/Registration/DesignerView.Simple.cshtml @@ -7,20 +7,22 @@ -
- -

@Html.Resource("ProviderDescription")

-
-
- -
-
+ @{ var userProviders = UserManager.GetManager().GetContextProviders().ToList(); + if (userProviders.Count() > 1) + { +
+ +

@Html.Resource("ProviderDescription")

+
+
+
+
+
} }
@@ -50,28 +52,24 @@
- @{ - var providers = ClaimsManager.CurrentAuthenticationModule.ExternalAuthenticationProviders.Where(x => x.Enabled == true && !string.IsNullOrEmpty(x.Name)).ToList(); + @{ var providers = ClaimsManager.CurrentAuthenticationModule.ExternalAuthenticationProviders.Where(x => x.Enabled == true && !string.IsNullOrEmpty(x.Name)).ToList(); if (providers.Count() != 0) { -
- @Html.Resource("ExternalProvidersRegiterOptions") - @foreach (var provider in providers) - { -
- -
- } -
- } - } +
+ @Html.Resource("ExternalProvidersRegiterOptions") + @foreach (var provider in providers) + { +
+ +
} +
} }
@@ -87,8 +85,7 @@
@@ -136,8 +133,7 @@ @@ -152,8 +148,7 @@ diff --git a/Telerik.Sitefinity.Frontend.Identity/Mvc/Views/Registration/Registration.RegistrationForm.cshtml b/Telerik.Sitefinity.Frontend.Identity/Mvc/Views/Registration/Registration.RegistrationForm.cshtml index f4b359187..00a5e3c19 100644 --- a/Telerik.Sitefinity.Frontend.Identity/Mvc/Views/Registration/Registration.RegistrationForm.cshtml +++ b/Telerik.Sitefinity.Frontend.Identity/Mvc/Views/Registration/Registration.RegistrationForm.cshtml @@ -4,6 +4,7 @@ @using Telerik.Sitefinity.Modules.Pages; @using Telerik.Sitefinity.UI.MVC; @using Telerik.Sitefinity.Utilities; +@using Telerik.Sitefinity.Frontend.Identity.Mvc.Helpers; @using Telerik.Sitefinity.Services; @using Telerik.Sitefinity.Web; @@ -16,120 +17,122 @@ HtmlHelper.UnobtrusiveJavaScriptEnabled = true; } -
- @if ((Request.QueryStringGet("ShowActivationMsg") == "true") || - (ViewBag.ShowActivationMsg is bool && ViewBag.ShowActivationMsg)) - { -

- @Html.Resource("VisitYourEmail") -

+
+ @if ((Request.QueryStringGet("ShowActivationMsg") == "true") || + (ViewBag.ShowActivationMsg is bool && ViewBag.ShowActivationMsg)) + { +

+ @Html.Resource("VisitYourEmail") +

-

@string.Format(Html.Resource("ActivationLinkHasBeenSent"), Model.Email)

- @Html.Resource("SendAgain") +

@string.Format(Html.Resource("ActivationLinkHasBeenSent"), Model.Email)

+ @Html.Resource("SendAgain") -
- @string.Format(Html.Resource("ActivationLinkHasBeenSentAgain"), Model.Email) - @Html.Resource("SendAgain") -
+
+ @string.Format(Html.Resource("ActivationLinkHasBeenSentAgain"), Model.Email) +
- - @Html.Script(Url.WidgetContent("Mvc/Scripts/Registration/registration-form.js"), "bottom", throwException: false) - } - else if ((Request.QueryStringGet("ShowSuccessfulRegistrationMsg") == "true") || - (ViewBag.ShowSuccessfulRegistrationMsg is bool && ViewBag.ShowSuccessfulRegistrationMsg)) - { -

@Html.Resource("ThankYou")

-

@Html.Resource("DefaultSuccessfulRegistrationMessage")

+ + @Html.Script(Url.WidgetContent("Mvc/Scripts/Registration/registration-form.js"), "bottom", throwException: false) + } + else if ((Request.QueryStringGet("ShowSuccessfulRegistrationMsg") == "true") || + (ViewBag.ShowSuccessfulRegistrationMsg is bool && ViewBag.ShowSuccessfulRegistrationMsg)) + { +

@Html.Resource("ThankYou")

+

@Html.Resource("DefaultSuccessfulRegistrationMessage")

- } - else + } + else + { + using (Html.BeginFormSitefinity(true)) { - using (Html.BeginFormSitefinity(true)) - { - @Html.ValidationSummary(true); + @Html.ValidationSummary(true); -

@Html.Resource("Registration")

+

@Html.Resource("Registration")

- @ViewBag.Error + @ViewBag.Error - @Html.HiddenFor(m => m.RequiresQuestionAndAnswer) + @Html.HiddenFor(m => m.RequiresQuestionAndAnswer) +
+ + @Html.ValidationMessage("Profile[FirstName]") +
+
+ + @Html.ValidationMessage("Profile[LastName]") +
+ +
+ + @Html.ValidationMessageFor(m => m.Email) +
+
+ + @Html.ValidationMessageFor(m => m.Password) +
+
+ + @Html.ValidationMessageFor(m => m.ReTypePassword) +
+ if (Model.RequiresQuestionAndAnswer) + {
-
-
- -
-
- - @Html.ValidationMessageFor(m => m.Email) -
-
- - @Html.ValidationMessageFor(m => m.Password) + @Html.ValidationMessageFor(m => m.Question)
- @Html.ValidationMessageFor(m => m.ReTypePassword) + @Html.ValidationMessageFor(m => m.Answer)
- if (Model.RequiresQuestionAndAnswer) + } +
+ @if (SystemManager.IsDesignMode && !SystemManager.IsPreviewMode) { -
- - @Html.ValidationMessageFor(m => m.Question) -
-
- - @Html.ValidationMessageFor(m => m.Answer) -
+ } -
- @if (SystemManager.IsDesignMode && !SystemManager.IsPreviewMode) - { - - } - else - { - - } -
- - if (Model.ExternalProviders != null && Model.ExternalProviders.Count() > 0) + else { -

@Html.Resource("ConnectWith")

- - foreach (var provider in Model.ExternalProviders) - { -
- @Html.ActionLink(provider.Key, "LoginExternalProvider", new { model = provider.Key }, new { @class = provider.Value }) -
- } + } +
- + if (Model.ExternalProviders != null && Model.ExternalProviders.Count() > 0) + { +

@Html.Resource("ConnectWith")

+ + foreach (var provider in Model.ExternalProviders) + { +
+ @Html.ActionLink(provider.Key, "LoginExternalProvider", new { model = provider.Key }, new { @class = provider.Value }) +
+ } } + + } -
\ No newline at end of file + } +
\ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Identity/Telerik.Sitefinity.Frontend.Identity.csproj b/Telerik.Sitefinity.Frontend.Identity/Telerik.Sitefinity.Frontend.Identity.csproj index 5fe144388..2fe651083 100644 --- a/Telerik.Sitefinity.Frontend.Identity/Telerik.Sitefinity.Frontend.Identity.csproj +++ b/Telerik.Sitefinity.Frontend.Identity/Telerik.Sitefinity.Frontend.Identity.csproj @@ -91,7 +91,7 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll @@ -141,6 +141,7 @@ Properties\SharedAssemblyInfo.cs + @@ -270,31 +271,31 @@ - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Services.Events.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Services.Events.dll True - ..\packages\Telerik.Sitefinity.Content.13.2.7500\lib\net48\Telerik.Sitefinity.ContentModules.dll + ..\packages\Telerik.Sitefinity.Content.13.3.7600\lib\net48\Telerik.Sitefinity.ContentModules.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Utilities.dll True - ..\packages\Telerik.Sitefinity.Feather.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Frontend.dll + ..\packages\Telerik.Sitefinity.Feather.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Frontend.dll True - ..\packages\Telerik.Sitefinity.Mvc.13.2.7500\lib\net48\Telerik.Sitefinity.Mvc.dll + ..\packages\Telerik.Sitefinity.Mvc.13.3.7600\lib\net48\Telerik.Sitefinity.Mvc.dll True diff --git a/Telerik.Sitefinity.Frontend.Identity/packages.config b/Telerik.Sitefinity.Frontend.Identity/packages.config index 7d99a2765..5a711c1b3 100644 --- a/Telerik.Sitefinity.Frontend.Identity/packages.config +++ b/Telerik.Sitefinity.Frontend.Identity/packages.config @@ -14,10 +14,10 @@ - + - - - - + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.InlineClientAssets/Telerik.Sitefinity.Frontend.InlineClientAssets.csproj b/Telerik.Sitefinity.Frontend.InlineClientAssets/Telerik.Sitefinity.Frontend.InlineClientAssets.csproj index 2576b939f..b3cf51e81 100644 --- a/Telerik.Sitefinity.Frontend.InlineClientAssets/Telerik.Sitefinity.Frontend.InlineClientAssets.csproj +++ b/Telerik.Sitefinity.Frontend.InlineClientAssets/Telerik.Sitefinity.Frontend.InlineClientAssets.csproj @@ -149,27 +149,27 @@ - ..\packages\Telerik.Sitefinity.Content.13.2.7500\lib\net48\Telerik.Sitefinity.ContentModules.dll + ..\packages\Telerik.Sitefinity.Content.13.3.7600\lib\net48\Telerik.Sitefinity.ContentModules.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Utilities.dll True - ..\packages\Telerik.Sitefinity.Feather.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Frontend.dll + ..\packages\Telerik.Sitefinity.Feather.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Frontend.dll True - ..\packages\Telerik.Sitefinity.Mvc.13.2.7500\lib\net48\Telerik.Sitefinity.Mvc.dll + ..\packages\Telerik.Sitefinity.Mvc.13.3.7600\lib\net48\Telerik.Sitefinity.Mvc.dll True diff --git a/Telerik.Sitefinity.Frontend.InlineClientAssets/packages.config b/Telerik.Sitefinity.Frontend.InlineClientAssets/packages.config index b871ae29d..72e44d854 100644 --- a/Telerik.Sitefinity.Frontend.InlineClientAssets/packages.config +++ b/Telerik.Sitefinity.Frontend.InlineClientAssets/packages.config @@ -8,8 +8,8 @@ - - - - + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Lists/Telerik.Sitefinity.Frontend.Lists.csproj b/Telerik.Sitefinity.Frontend.Lists/Telerik.Sitefinity.Frontend.Lists.csproj index 5fd0aba6b..12be7758f 100644 --- a/Telerik.Sitefinity.Frontend.Lists/Telerik.Sitefinity.Frontend.Lists.csproj +++ b/Telerik.Sitefinity.Frontend.Lists/Telerik.Sitefinity.Frontend.Lists.csproj @@ -77,7 +77,7 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll @@ -157,31 +157,31 @@ - ..\packages\Telerik.Sitefinity.Content.13.2.7500\lib\net48\Telerik.Sitefinity.ContentModules.dll + ..\packages\Telerik.Sitefinity.Content.13.3.7600\lib\net48\Telerik.Sitefinity.ContentModules.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Personalization.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Personalization.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Utilities.dll True - ..\packages\Telerik.Sitefinity.Feather.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Frontend.dll + ..\packages\Telerik.Sitefinity.Feather.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Frontend.dll True - ..\packages\Telerik.Sitefinity.Mvc.13.2.7500\lib\net48\Telerik.Sitefinity.Mvc.dll + ..\packages\Telerik.Sitefinity.Mvc.13.3.7600\lib\net48\Telerik.Sitefinity.Mvc.dll True diff --git a/Telerik.Sitefinity.Frontend.Lists/packages.config b/Telerik.Sitefinity.Frontend.Lists/packages.config index 8590ef6b4..c0a00a1eb 100644 --- a/Telerik.Sitefinity.Frontend.Lists/packages.config +++ b/Telerik.Sitefinity.Frontend.Lists/packages.config @@ -11,10 +11,10 @@ - + - - - - + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Media/Mvc/Controllers/ImageGalleryController.cs b/Telerik.Sitefinity.Frontend.Media/Mvc/Controllers/ImageGalleryController.cs index d7b19b951..96fda68a4 100644 --- a/Telerik.Sitefinity.Frontend.Media/Mvc/Controllers/ImageGalleryController.cs +++ b/Telerik.Sitefinity.Frontend.Media/Mvc/Controllers/ImageGalleryController.cs @@ -248,11 +248,6 @@ public ActionResult ListByTaxon(ITaxon taxonFilter, int? page) /// public ActionResult Details(Image item) { - if (!this.MatchesParent(item)) - { - RouteHelper.SetUrlParametersResolved(false); - } - this.InitializeMetadataDetailsViewBag(item); var itemIndex = this.ParseToNullableInt32(this.GetQueryString("itemIndex")); @@ -451,29 +446,6 @@ private void SetRedirectUrlQueryString(ITaxon taxon) this.ViewBag.RedirectPageUrlTemplate = this.ViewBag.RedirectPageUrlTemplate + taxonQueryStringParams; } - private bool MatchesParent(Image image) - { - if (image == null || image.Parent == null) - { - return true; - } - - var selectedParentIds = JsonSerializer.DeserializeFromString>(this.Model.SerializedSelectedParentsIds); - - if (selectedParentIds != null && selectedParentIds.Count > 0) - { - if (((image.FolderId == null || image.FolderId == Guid.Empty) && selectedParentIds.Contains(image.ParentId.ToString())) - || (image.FolderId != null && image.FolderId != Guid.Empty && selectedParentIds.Contains(image.FolderId.ToString()))) - { - return true; - } - - return false; - } - - return true; - } - #endregion #region Private fields and constants diff --git a/Telerik.Sitefinity.Frontend.Media/Mvc/Models/Image/ImageModel.cs b/Telerik.Sitefinity.Frontend.Media/Mvc/Models/Image/ImageModel.cs index 363c1644d..48c6adf6f 100644 --- a/Telerik.Sitefinity.Frontend.Media/Mvc/Models/Image/ImageModel.cs +++ b/Telerik.Sitefinity.Frontend.Media/Mvc/Models/Image/ImageModel.cs @@ -175,7 +175,7 @@ private string GetLinkedUrl(SfImage image) var node = pageManager.GetPageNode(this.LinkedPageId); if (node != null) { - var relativeUrl = node.GetFullUrl(Telerik.Sitefinity.Services.SystemManager.CurrentContext.Culture, false); + var relativeUrl = node.GetFullUrl(Telerik.Sitefinity.Services.SystemManager.CurrentContext.Culture, false, true); linkedUrl = UrlPath.ResolveUrl(relativeUrl, false); } } @@ -183,7 +183,7 @@ private string GetLinkedUrl(SfImage image) { linkedUrl = image.ResolveMediaUrl(false); } - + return linkedUrl; } diff --git a/Telerik.Sitefinity.Frontend.Media/Mvc/Views/web.config b/Telerik.Sitefinity.Frontend.Media/Mvc/Views/web.config new file mode 100644 index 000000000..07a36e665 --- /dev/null +++ b/Telerik.Sitefinity.Frontend.Media/Mvc/Views/web.config @@ -0,0 +1,426 @@ + + + + + +
+
+ +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Media/Telerik.Sitefinity.Frontend.Media.csproj b/Telerik.Sitefinity.Frontend.Media/Telerik.Sitefinity.Frontend.Media.csproj index 44bafd59e..f019ec904 100644 --- a/Telerik.Sitefinity.Frontend.Media/Telerik.Sitefinity.Frontend.Media.csproj +++ b/Telerik.Sitefinity.Frontend.Media/Telerik.Sitefinity.Frontend.Media.csproj @@ -77,7 +77,7 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll @@ -240,31 +240,31 @@ - ..\packages\Telerik.Sitefinity.Content.13.2.7500\lib\net48\Telerik.Sitefinity.ContentModules.dll + ..\packages\Telerik.Sitefinity.Content.13.3.7600\lib\net48\Telerik.Sitefinity.ContentModules.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Personalization.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Personalization.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Utilities.dll True - ..\packages\Telerik.Sitefinity.Feather.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Frontend.dll + ..\packages\Telerik.Sitefinity.Feather.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Frontend.dll True - ..\packages\Telerik.Sitefinity.Mvc.13.2.7500\lib\net48\Telerik.Sitefinity.Mvc.dll + ..\packages\Telerik.Sitefinity.Mvc.13.3.7600\lib\net48\Telerik.Sitefinity.Mvc.dll True diff --git a/Telerik.Sitefinity.Frontend.Media/packages.config b/Telerik.Sitefinity.Frontend.Media/packages.config index 8590ef6b4..c0a00a1eb 100644 --- a/Telerik.Sitefinity.Frontend.Media/packages.config +++ b/Telerik.Sitefinity.Frontend.Media/packages.config @@ -11,10 +11,10 @@ - + - - - - + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Navigation/Mvc/Models/INavigationModel.cs b/Telerik.Sitefinity.Frontend.Navigation/Mvc/Models/INavigationModel.cs index 1e2e51a0e..2742a14cb 100644 --- a/Telerik.Sitefinity.Frontend.Navigation/Mvc/Models/INavigationModel.cs +++ b/Telerik.Sitefinity.Frontend.Navigation/Mvc/Models/INavigationModel.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Web; +using Telerik.Sitefinity.Web; namespace Telerik.Sitefinity.Frontend.Navigation.Mvc.Models { @@ -60,7 +61,7 @@ public interface INavigationModel /// The a serialized array of selected pages. /// [Browsable(false)] - SelectedPageModel[] SelectedPages { get; set; } + SelectedPageModelBase[] SelectedPages { get; set; } /// /// Gets or sets the identifier of the page that is selected if SelectionMode is SelectedPageChildren. diff --git a/Telerik.Sitefinity.Frontend.Navigation/Mvc/Models/NavigationModel.cs b/Telerik.Sitefinity.Frontend.Navigation/Mvc/Models/NavigationModel.cs index 1bc8ecc74..4f0de051d 100644 --- a/Telerik.Sitefinity.Frontend.Navigation/Mvc/Models/NavigationModel.cs +++ b/Telerik.Sitefinity.Frontend.Navigation/Mvc/Models/NavigationModel.cs @@ -20,14 +20,14 @@ namespace Telerik.Sitefinity.Frontend.Navigation.Mvc.Models /// /// This class represents model used for Navigation widget. /// - public class NavigationModel : IHasCacheDependency, INavigationModel + public class NavigationModel : NavigationModelBase, IHasCacheDependency, INavigationModel { #region Constructors and Destructors /// /// Initializes a new instance of the class. /// - public NavigationModel() + public NavigationModel() : base() { } @@ -51,11 +51,12 @@ public NavigationModel( bool openExternalPageInNewTab) { this.SelectionMode = selectionMode; + this.SelectionModeString = selectionMode.ToString(); this.LevelsToInclude = levelsToInclude; this.ShowParentPage = showParentPage; this.CssClass = cssClass; - this.selectedPageId = selectedPageId; - this.selectedPages = selectedPages; + this.SelectedPageId = selectedPageId; + this.SelectedPages = selectedPages; this.OpenExternalPageInNewTab = openExternalPageInNewTab; } @@ -63,143 +64,22 @@ public NavigationModel( #region Public Properties - /// - /// Gets or sets the CSS class that will be applied on the wrapper div of the NavigationWidget (if such is presented). - /// - /// - /// The CSS class. - /// - [Browsable(false)] - public string CssClass { get; set; } - - /// - /// Gets the current site map node. - /// - /// - /// The current site map node. - /// - [Browsable(false)] - public virtual SiteMapNode CurrentSiteMapNode - { - get - { - return this.SiteMap.CurrentNode; - } - } - - /// - /// Gets or sets a serialized array of the selected pages. - /// - /// - /// The a serialized array of selected pages. - /// - [Browsable(false)] - public SelectedPageModel[] SelectedPages - { - get - { - return this.selectedPages; - } - - set - { - this.selectedPages = value; - } - } - - /// - /// Gets or sets the levels to include. - /// - [Browsable(false)] - public virtual int? LevelsToInclude { get; set; } - - /// - /// Gets the list of site map nodes that will be displayed in the navigation widget. - /// - /// - /// The nodes. - /// - [Browsable(false)] - public IList Nodes - { - get - { - return this.nodes ?? (this.nodes = new List()); - } - } - /// /// Gets or sets the page links to display selection mode. /// /// The page display mode. [Browsable(false)] - public PageSelectionMode SelectionMode { get; set; } - - /// - /// Gets or sets a value indicating whether [show parent page]. - /// - /// - /// true if [show parent page]; otherwise, false. - /// - [Browsable(false)] - public bool ShowParentPage { get; set; } - - /// - /// Gets or sets a value indicating whether should open external page in new tab. - /// - /// - /// true if should open external page in new tab; otherwise, false. - /// - [Browsable(false)] - public bool OpenExternalPageInNewTab { get; set; } - - /// - /// Gets the site map. - /// - /// - /// The site map. - /// - [Browsable(false)] - public virtual SiteMapBase SiteMap - { - get - { - return (SiteMapBase)SitefinitySiteMap.GetCurrentProvider(); - } - } - - /// - /// Gets or sets the name of the site map provider. - /// - /// The name of the site map provider. - public string SiteMapProviderName - { - get - { - return this.siteMapProviderName; - } - - set - { - this.siteMapProviderName = value; - } - } - - /// - /// Gets or sets the identifier of the page that is selected if SelectionMode is SelectedPageChildren. - /// - /// The identifier of the page that is selected if SelectionMode is SelectedPageChildren. - [Browsable(false)] - public Guid SelectedPageId + public PageSelectionMode SelectionMode { get { - return this.selectedPageId; + return this.selectionMode; } set { - this.selectedPageId = value; + this.selectionMode = value; + this.SelectionModeString = value.ToString(); } } @@ -216,253 +96,12 @@ protected virtual ContentListViewModel CreateListViewModelInstance() return new ContentListViewModel(); } - /// - /// Gets a collection of cached and changed items that need to be invalidated for the specific views that display all types inheriting from - /// the abstract type . - /// - /// - public virtual IList GetCacheDependencyObjects() - { - var cacheDependencyNotifiedObjects = new List(); - - foreach (var nodeId in this.viewModelNodeIds) - { - cacheDependencyNotifiedObjects.Add(new CacheDependencyKey() { Type = CacheDependencyObjectForAllSitesType, Key = nodeId }); - - var multilingualKey = nodeId; - multilingualKey += Telerik.Sitefinity.Services.SystemManager.CurrentContext.Culture; - - cacheDependencyNotifiedObjects.Add(new CacheDependencyKey() { Type = CacheDependencyPageNodeStateChangeType, Key = multilingualKey }); - cacheDependencyNotifiedObjects.Add(new CacheDependencyKey() { Type = CacheDependencyPageNodeObjectType, Key = multilingualKey }); - } - - this.SubscribeCacheDependency(cacheDependencyNotifiedObjects); - - return cacheDependencyNotifiedObjects; - } - - /// - /// Initializes the settings for the navigation widget. - /// - public void InitializeNavigationWidgetSettings() - { - this.Nodes.Clear(); - this.viewModelNodeIds.Clear(); - SiteMapProvider siteMapProvider = this.GetProvider(); - - switch (this.SelectionMode) - { - case PageSelectionMode.TopLevelPages: - if (siteMapProvider.RootNode != null) - { - this.AddChildNodes(siteMapProvider.RootNode, false); - } - - break; - case PageSelectionMode.SelectedPageChildren: - if (!Guid.Equals(this.selectedPageId, Guid.Empty)) - { - var siteMapNodeFromKey = siteMapProvider.FindSiteMapNodeFromKey(this.selectedPageId.ToString("D")); - if (siteMapNodeFromKey != null) - { - this.AddChildNodes(siteMapNodeFromKey, this.ShowParentPage); - } - } - - break; - case PageSelectionMode.CurrentPageChildren: - - if (this.CurrentSiteMapNode != null) - { - this.AddChildNodes(this.CurrentSiteMapNode, this.ShowParentPage); - } - - break; - case PageSelectionMode.CurrentPageSiblings: - if (this.CurrentSiteMapNode != null) - { - SiteMapNode parentNodeTemp = this.CurrentSiteMapNode.ParentNode; - - if (parentNodeTemp != null) - { - this.AddChildNodes(parentNodeTemp, this.ShowParentPage); - } - } - - break; - case PageSelectionMode.SelectedPages: - if (this.selectedPages != null) - { - var target = this.OpenExternalPageInNewTab ? "_blank" : "_self"; - foreach (var page in this.selectedPages) - { - var isExternalSiteMapNode = page.NodeType == NodeType.Rewriting || page.NodeType == NodeType.InnerRedirect || page.NodeType == NodeType.OuterRedirect; - if (page.Id != default(Guid) && (!page.IsExternal || isExternalSiteMapNode)) - { - var siteMapNode = siteMapProvider.FindSiteMapNodeFromKey(page.Id.ToString("D")); - if (siteMapNode != null && this.CheckSiteMapNode(siteMapNode)) - { - this.viewModelNodeIds.Add(siteMapNode.Key); - if (siteMapNode is PageSiteNode) - this.pageSiteNodes.Add((PageSiteNode)siteMapNode); - - var siteMapHierarchy = this.CreateNodeViewModelRecursive(siteMapNode, this.LevelsToInclude); - this.Nodes.Add(siteMapHierarchy); - } - } - else - { - var node = this.InstantiateNodeViewModel(page.Url, target); - node.Title = page.TitlesPath; - this.Nodes.Add(node); - } - } - } - - break; - } - - this.pageSiteNodes.Select(pn => pn.RelatedDataHolder).SetRelatedDataSourceContext(); - } - - /// - /// Gets the sitemap provider. - /// - /// - /// The . - /// - internal virtual SiteMapProvider GetProvider() - { - if (this.provider == null) - { - try - { - this.provider = SiteMapBase.GetSiteMapProvider(this.SiteMapProviderName); - } - catch (Exception) - { - this.provider = null; - - /// TODO: handle exception - throw; - } - } - - return this.provider; - } - - /// - /// Adds the child nodes to the collection. - /// - /// - /// The start node. - /// - /// - /// if set to true adds parent node. - /// - protected void AddChildNodes(SiteMapNode startNode, bool addParentNode) - { - this.viewModelNodeIds.Add(startNode.Key); - if (startNode is PageSiteNode) - this.pageSiteNodes.Add((PageSiteNode)startNode); - - if (this.LevelsToInclude != 0 && startNode != null) - { - if (addParentNode && this.CheckSiteMapNode(startNode) && startNode.Key != this.RootNodeId.ToString().ToUpperInvariant()) - { - var nodeViewModel = this.CreateNodeViewModelRecursive(startNode, this.LevelsToInclude); - - if (nodeViewModel != null) - { - this.Nodes.Add(nodeViewModel); - } - } - else - { - var directChildren = startNode.ChildNodes; - - foreach (SiteMapNode childNode in directChildren) - { - var nodeViewModel = this.CreateNodeViewModelRecursive(childNode, this.LevelsToInclude); - - if (nodeViewModel != null) - { - this.Nodes.Add(nodeViewModel); - } - } - } - } - } - - /// - /// Checks the site map node. - /// - /// - /// The node. - /// - /// - /// The . - /// - protected virtual bool CheckSiteMapNode(SiteMapNode node) - { - return RouteHelper.CheckSiteMapNode(node); - } - - /// - /// Gets the link target. - /// - /// - /// The node. - /// - /// - /// The . - /// - protected virtual string GetLinkTarget(SiteMapNode node) - { - string target = NavigationUtilities.GetLinkTarget(node); - - if (target.IsNullOrEmpty()) - { - target = "_self"; - } - - return target; - } - - /// - /// Gets the root node identifier. - /// - /// - /// The . - /// - protected virtual Guid RootNodeId - { - get - { - return SiteInitializer.CurrentFrontendRootNodeId; - } - } - - /// - /// Resolves the URL. - /// - /// - /// The node. - /// - /// - /// The . - /// - protected virtual string ResolveUrl(SiteMapNode node) - { - return NavigationUtilities.ResolveUrl(node); - } - - /// + /// subs /// Instantiates a node view model. /// /// The node. /// An instance of a node view model. - protected virtual NodeViewModel InstantiateNodeViewModel(SiteMapNode node) + protected override NodeViewModel InstantiateNodeViewModel(SiteMapNode node) { bool isSelectedPage = this.CurrentSiteMapNode != null && this.CurrentSiteMapNode.Key == node.Key; string url = this.ResolveUrl(node); @@ -477,71 +116,11 @@ protected virtual NodeViewModel InstantiateNodeViewModel(SiteMapNode node) /// The target. /// An instance of a node view model. [SuppressMessage("Microsoft.Design", "CA1054:UriParametersShouldNotBeStrings", MessageId = "0#")] - protected virtual NodeViewModel InstantiateNodeViewModel(string url, string target) + protected override NodeViewModel InstantiateNodeViewModel(string url, string target) { return new NodeViewModel(null, url, target, false, false); } - private void SubscribeCacheDependency(List objects) - { - if (!SystemManager.CurrentHttpContext.Items.Contains(PageCacheDependencyKeys.PageNodes)) - SystemManager.CurrentHttpContext.Items.Add(PageCacheDependencyKeys.PageNodes, new List()); - - ((List)SystemManager.CurrentHttpContext.Items[PageCacheDependencyKeys.PageNodes]).AddRange(objects); - } - - /// - /// Creates the from the SiteMapNode and populates recursive their child nodes. - /// - /// - /// The original site map node. - /// - /// - /// The levels to include. - /// - /// - /// The . - /// - private NodeViewModel CreateNodeViewModelRecursive(SiteMapNode node, int? levelsToInclude) - { - if (levelsToInclude != 0 && this.CheckSiteMapNode(node)) - { - this.viewModelNodeIds.Add(node.Key); - if (node is PageSiteNode) - this.pageSiteNodes.Add((PageSiteNode)node); - - var nodeViewModel = this.InstantiateNodeViewModel(node); - levelsToInclude--; - - SiteMapNodeCollection directChildren = node.ChildNodes; - foreach (SiteMapNode childNode in directChildren) - { - NodeViewModel childViewModel = this.CreateNodeViewModelRecursive(childNode, levelsToInclude); - if (childViewModel != null) - { - nodeViewModel.ChildNodes.Add(childViewModel); - } - } - - return nodeViewModel; - } - - return null; - } - - /// - /// Determines whether the current node is descendant of the instance. - /// - /// - /// The node. - /// - /// - /// The . - /// - private bool HasSelectedChild(SiteMapNode node) - { - return this.CurrentSiteMapNode != null && this.CurrentSiteMapNode.IsDescendantOf(node); - } #endregion #region Private Fields @@ -549,23 +128,7 @@ private bool HasSelectedChild(SiteMapNode node) private static readonly Type CacheDependencyPageNodeObjectType = Type.GetType("Telerik.Sitefinity.Pages.Model.CacheDependencyPageNodeObject, Telerik.Sitefinity.Model"); private static readonly Type CacheDependencyObjectForAllSitesType = Type.GetType("Telerik.Sitefinity.Pages.Model.CacheDependencyObjectForAllSites, Telerik.Sitefinity.Model"); private static readonly Type CacheDependencyPageNodeStateChangeType = Type.GetType("Telerik.Sitefinity.Pages.Model.CacheDependencyPageNodeStateChange, Telerik.Sitefinity.Model"); - - private HashSet viewModelNodeIds = new HashSet(); - private HashSet pageSiteNodes = new HashSet(); - - private IList nodes; - - /// - /// The provider - /// - private SiteMapProvider provider; - - // TODO: check why field is never used - // private SiteMapBase siteMap; - private string siteMapProviderName = SiteMapBase.DefaultSiteMapProviderName; - - private Guid selectedPageId; - private SelectedPageModel[] selectedPages; + private PageSelectionMode selectionMode; #endregion } diff --git a/Telerik.Sitefinity.Frontend.Navigation/Mvc/Models/NodeViewModel.cs b/Telerik.Sitefinity.Frontend.Navigation/Mvc/Models/NodeViewModel.cs index 33faddb4f..e188f5efe 100644 --- a/Telerik.Sitefinity.Frontend.Navigation/Mvc/Models/NodeViewModel.cs +++ b/Telerik.Sitefinity.Frontend.Navigation/Mvc/Models/NodeViewModel.cs @@ -7,16 +7,15 @@ namespace Telerik.Sitefinity.Frontend.Navigation.Mvc.Models /// /// This class represents the model of the Nodes that will be rendered inside the Navigation templates. /// - public class NodeViewModel + public class NodeViewModel : FrontendPageNodeBase { #region Constructor /// /// Initializes a new instance of the class. /// - public NodeViewModel() + public NodeViewModel() : base() { - this.ChildNodes = new List(); } /// @@ -38,19 +37,8 @@ public NodeViewModel() /// if set to true currently opened page is descendent of this node. /// public NodeViewModel(SiteMapNode node, string url, string target, bool isCurrentlyOpened, bool hasChildOpen) + : base(node, url, target, isCurrentlyOpened, hasChildOpen) { - this.OriginalSiteMapNode = node; - if (node != null) - { - this.Title = node.Title; - } - - this.Url = url; - this.LinkTarget = target; - this.ChildNodes = new List(); - this.IsCurrentlyOpened = isCurrentlyOpened; - this.HasChildOpen = hasChildOpen; - if (node is PageSiteNode) { this.CustomFields = new PageCustomFieldsAccessor((PageSiteNode)node); @@ -61,62 +49,6 @@ public NodeViewModel(SiteMapNode node, string url, string target, bool isCurrent #region Properties - /// - /// Gets or sets the node title. - /// - /// - /// The title. - /// - public string Title { get; set; } - - /// - /// Gets or sets the node URL. - /// - /// - /// The URL. - /// - public string Url { get; set; } - - /// - /// Gets or sets the link target. - /// - /// - /// The link target. - /// - public string LinkTarget { get; set; } - - /// - /// Gets or sets a value indicating whether this node represents currently opened page - /// - /// - /// true if page node is currently opened; otherwise, false. - /// - public bool IsCurrentlyOpened { get; set; } - - /// - /// Gets or sets a value indicating whether the currently opened page is a descendent of this node. - /// - /// - /// true if currently opened page is descendent of this node; otherwise, false. - /// - public bool HasChildOpen { get; set; } - - /// - /// Gets or sets the original site map node. - /// - /// - /// The original site map node. - /// - public SiteMapNode OriginalSiteMapNode { get; set; } - - /// - /// Gets or sets the child nodes. - /// - /// - /// The child nodes. - /// - public IList ChildNodes { get; set; } - /// /// Gets a property that accesses custom fields of the data item that is represented by this view model. /// diff --git a/Telerik.Sitefinity.Frontend.Navigation/Mvc/Models/SelectedPageModel.cs b/Telerik.Sitefinity.Frontend.Navigation/Mvc/Models/SelectedPageModel.cs index 2b38e9b5e..470036c0a 100644 --- a/Telerik.Sitefinity.Frontend.Navigation/Mvc/Models/SelectedPageModel.cs +++ b/Telerik.Sitefinity.Frontend.Navigation/Mvc/Models/SelectedPageModel.cs @@ -3,61 +3,14 @@ using System.Linq; using System.Text; using Telerik.Sitefinity.Pages.Model; +using Telerik.Sitefinity.Web; namespace Telerik.Sitefinity.Frontend.Navigation.Mvc.Models { /// /// This class represents DTO for created pages. /// - public class SelectedPageModel + public class SelectedPageModel : SelectedPageModelBase { - /// - /// Gets or sets the identifier of the selected page. - /// - /// - /// The identifier. - /// - public Guid Id { get; set; } - - /// - /// Gets or sets a value indicating whether this page is external. - /// - /// - /// True if the page is external and false otherwise. - /// - public bool IsExternal { get; set; } - - /// - /// Gets or sets the title. - /// - /// - /// The title. - /// - public string Title { get; set; } - - /// - /// Gets or sets the titles path. - /// - /// - /// The titles path. - /// - public string TitlesPath { get; set; } - - /// - /// Gets or sets the URL. - /// - /// - /// The URL. - /// - [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1056:UriPropertiesShouldNotBeStrings")] - public string Url { get; set; } - - /// - /// Gets or sets the type of the node. - /// - /// - /// The type of the node. - /// - public NodeType NodeType { get; set; } } } diff --git a/Telerik.Sitefinity.Frontend.Navigation/Telerik.Sitefinity.Frontend.Navigation.csproj b/Telerik.Sitefinity.Frontend.Navigation/Telerik.Sitefinity.Frontend.Navigation.csproj index 4bac67217..945238e74 100644 --- a/Telerik.Sitefinity.Frontend.Navigation/Telerik.Sitefinity.Frontend.Navigation.csproj +++ b/Telerik.Sitefinity.Frontend.Navigation/Telerik.Sitefinity.Frontend.Navigation.csproj @@ -79,7 +79,7 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll @@ -206,27 +206,27 @@ - ..\packages\Telerik.Sitefinity.Content.13.2.7500\lib\net48\Telerik.Sitefinity.ContentModules.dll + ..\packages\Telerik.Sitefinity.Content.13.3.7600\lib\net48\Telerik.Sitefinity.ContentModules.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Utilities.dll True - ..\packages\Telerik.Sitefinity.Feather.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Frontend.dll + ..\packages\Telerik.Sitefinity.Feather.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Frontend.dll True - ..\packages\Telerik.Sitefinity.Mvc.13.2.7500\lib\net48\Telerik.Sitefinity.Mvc.dll + ..\packages\Telerik.Sitefinity.Mvc.13.3.7600\lib\net48\Telerik.Sitefinity.Mvc.dll True diff --git a/Telerik.Sitefinity.Frontend.Navigation/packages.config b/Telerik.Sitefinity.Frontend.Navigation/packages.config index 8590ef6b4..c0a00a1eb 100644 --- a/Telerik.Sitefinity.Frontend.Navigation/packages.config +++ b/Telerik.Sitefinity.Frontend.Navigation/packages.config @@ -11,10 +11,10 @@ - + - - - - + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.News/MVC/Controllers/NewsController.cs b/Telerik.Sitefinity.Frontend.News/MVC/Controllers/NewsController.cs index d7338205b..1a4eb4a3f 100644 --- a/Telerik.Sitefinity.Frontend.News/MVC/Controllers/NewsController.cs +++ b/Telerik.Sitefinity.Frontend.News/MVC/Controllers/NewsController.cs @@ -18,6 +18,7 @@ using Telerik.Sitefinity.Personalization; using Telerik.Sitefinity.Services; using Telerik.Sitefinity.Taxonomies.Model; +using Telerik.Sitefinity.Web; namespace Telerik.Sitefinity.Frontend.News.Mvc.Controllers { diff --git a/Telerik.Sitefinity.Frontend.News/Telerik.Sitefinity.Frontend.News.csproj b/Telerik.Sitefinity.Frontend.News/Telerik.Sitefinity.Frontend.News.csproj index 5392010db..755e7db17 100644 --- a/Telerik.Sitefinity.Frontend.News/Telerik.Sitefinity.Frontend.News.csproj +++ b/Telerik.Sitefinity.Frontend.News/Telerik.Sitefinity.Frontend.News.csproj @@ -81,8 +81,8 @@ ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - ..\packages\System.ComponentModel.Annotations.4.4.1\lib\net461\System.ComponentModel.Annotations.dll + + ..\packages\System.ComponentModel.Annotations.5.0.0\lib\net461\System.ComponentModel.Annotations.dll @@ -96,7 +96,7 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll @@ -175,31 +175,31 @@ - ..\packages\Telerik.Sitefinity.Content.13.2.7500\lib\net48\Telerik.Sitefinity.ContentModules.dll + ..\packages\Telerik.Sitefinity.Content.13.3.7600\lib\net48\Telerik.Sitefinity.ContentModules.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Personalization.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Personalization.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Utilities.dll True - ..\packages\Telerik.Sitefinity.Feather.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Frontend.dll + ..\packages\Telerik.Sitefinity.Feather.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Frontend.dll True - ..\packages\Telerik.Sitefinity.Mvc.13.2.7500\lib\net48\Telerik.Sitefinity.Mvc.dll + ..\packages\Telerik.Sitefinity.Mvc.13.3.7600\lib\net48\Telerik.Sitefinity.Mvc.dll True diff --git a/Telerik.Sitefinity.Frontend.News/packages.config b/Telerik.Sitefinity.Frontend.News/packages.config index 2997df28f..9d579ee36 100644 --- a/Telerik.Sitefinity.Frontend.News/packages.config +++ b/Telerik.Sitefinity.Frontend.News/packages.config @@ -13,14 +13,14 @@ - + - + - - - - + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Publishing/Mvc/Views/web.config b/Telerik.Sitefinity.Frontend.Publishing/Mvc/Views/web.config new file mode 100644 index 000000000..07a36e665 --- /dev/null +++ b/Telerik.Sitefinity.Frontend.Publishing/Mvc/Views/web.config @@ -0,0 +1,426 @@ + + + + + +
+
+ +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Publishing/Telerik.Sitefinity.Frontend.Publishing.csproj b/Telerik.Sitefinity.Frontend.Publishing/Telerik.Sitefinity.Frontend.Publishing.csproj index 8f64b3ec7..749aa6d67 100644 --- a/Telerik.Sitefinity.Frontend.Publishing/Telerik.Sitefinity.Frontend.Publishing.csproj +++ b/Telerik.Sitefinity.Frontend.Publishing/Telerik.Sitefinity.Frontend.Publishing.csproj @@ -129,27 +129,27 @@ - ..\packages\Telerik.Sitefinity.Content.13.2.7500\lib\net48\Telerik.Sitefinity.ContentModules.dll + ..\packages\Telerik.Sitefinity.Content.13.3.7600\lib\net48\Telerik.Sitefinity.ContentModules.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Utilities.dll True - ..\packages\Telerik.Sitefinity.Feather.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Frontend.dll + ..\packages\Telerik.Sitefinity.Feather.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Frontend.dll True - ..\packages\Telerik.Sitefinity.Mvc.13.2.7500\lib\net48\Telerik.Sitefinity.Mvc.dll + ..\packages\Telerik.Sitefinity.Mvc.13.3.7600\lib\net48\Telerik.Sitefinity.Mvc.dll True diff --git a/Telerik.Sitefinity.Frontend.Publishing/packages.config b/Telerik.Sitefinity.Frontend.Publishing/packages.config index b871ae29d..72e44d854 100644 --- a/Telerik.Sitefinity.Frontend.Publishing/packages.config +++ b/Telerik.Sitefinity.Frontend.Publishing/packages.config @@ -8,8 +8,8 @@ - - - - + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Search/Mvc/Views/web.config b/Telerik.Sitefinity.Frontend.Search/Mvc/Views/web.config new file mode 100644 index 000000000..07a36e665 --- /dev/null +++ b/Telerik.Sitefinity.Frontend.Search/Mvc/Views/web.config @@ -0,0 +1,426 @@ + + + + + +
+
+ +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Search/Telerik.Sitefinity.Frontend.Search.csproj b/Telerik.Sitefinity.Frontend.Search/Telerik.Sitefinity.Frontend.Search.csproj index d21a3205f..e3650f997 100644 --- a/Telerik.Sitefinity.Frontend.Search/Telerik.Sitefinity.Frontend.Search.csproj +++ b/Telerik.Sitefinity.Frontend.Search/Telerik.Sitefinity.Frontend.Search.csproj @@ -158,35 +158,35 @@ - ..\packages\Telerik.Sitefinity.Content.13.2.7500\lib\net48\Telerik.Sitefinity.ContentModules.dll + ..\packages\Telerik.Sitefinity.Content.13.3.7600\lib\net48\Telerik.Sitefinity.ContentModules.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.ServicesImpl.13.2.7500\lib\net48\Telerik.Sitefinity.Search.Impl.dll + ..\packages\Telerik.Sitefinity.ServicesImpl.13.3.7600\lib\net48\Telerik.Sitefinity.Search.Impl.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Search.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Search.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Utilities.dll True - ..\packages\Telerik.Sitefinity.Feather.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Frontend.dll + ..\packages\Telerik.Sitefinity.Feather.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Frontend.dll True - ..\packages\Telerik.Sitefinity.Mvc.13.2.7500\lib\net48\Telerik.Sitefinity.Mvc.dll + ..\packages\Telerik.Sitefinity.Mvc.13.3.7600\lib\net48\Telerik.Sitefinity.Mvc.dll True diff --git a/Telerik.Sitefinity.Frontend.Search/packages.config b/Telerik.Sitefinity.Frontend.Search/packages.config index 8573eb056..0c8bb23f7 100644 --- a/Telerik.Sitefinity.Frontend.Search/packages.config +++ b/Telerik.Sitefinity.Frontend.Search/packages.config @@ -8,9 +8,9 @@ - - - - - + + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Taxonomies/Mvc/Views/web.config b/Telerik.Sitefinity.Frontend.Taxonomies/Mvc/Views/web.config new file mode 100644 index 000000000..07a36e665 --- /dev/null +++ b/Telerik.Sitefinity.Frontend.Taxonomies/Mvc/Views/web.config @@ -0,0 +1,426 @@ + + + + + +
+
+ +
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Telerik.Sitefinity.Frontend.Taxonomies/Telerik.Sitefinity.Frontend.Taxonomies.csproj b/Telerik.Sitefinity.Frontend.Taxonomies/Telerik.Sitefinity.Frontend.Taxonomies.csproj index f9aedd9ce..6af9205ea 100644 --- a/Telerik.Sitefinity.Frontend.Taxonomies/Telerik.Sitefinity.Frontend.Taxonomies.csproj +++ b/Telerik.Sitefinity.Frontend.Taxonomies/Telerik.Sitefinity.Frontend.Taxonomies.csproj @@ -77,7 +77,7 @@ ..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll + ..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll @@ -167,27 +167,27 @@ - ..\packages\Telerik.Sitefinity.Content.13.2.7500\lib\net48\Telerik.Sitefinity.ContentModules.dll + ..\packages\Telerik.Sitefinity.Content.13.3.7600\lib\net48\Telerik.Sitefinity.ContentModules.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Model.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Model.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.dll True - ..\packages\Telerik.Sitefinity.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Utilities.dll + ..\packages\Telerik.Sitefinity.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Utilities.dll True - ..\packages\Telerik.Sitefinity.Feather.Core.13.2.7500\lib\net48\Telerik.Sitefinity.Frontend.dll + ..\packages\Telerik.Sitefinity.Feather.Core.13.3.7600\lib\net48\Telerik.Sitefinity.Frontend.dll True - ..\packages\Telerik.Sitefinity.Mvc.13.2.7500\lib\net48\Telerik.Sitefinity.Mvc.dll + ..\packages\Telerik.Sitefinity.Mvc.13.3.7600\lib\net48\Telerik.Sitefinity.Mvc.dll True diff --git a/Telerik.Sitefinity.Frontend.Taxonomies/packages.config b/Telerik.Sitefinity.Frontend.Taxonomies/packages.config index 8590ef6b4..c0a00a1eb 100644 --- a/Telerik.Sitefinity.Frontend.Taxonomies/packages.config +++ b/Telerik.Sitefinity.Frontend.Taxonomies/packages.config @@ -11,10 +11,10 @@ - + - - - - + + + + \ No newline at end of file