Release v.13.1.7400.0

Sitefinity · Sep 1, 2020 · 9952d61 · 9952d61
1 parent c8e228d
commit 9952d61
Show file tree

Hide file tree

Showing 102 changed files with 6,765 additions and 5,092 deletions.
diff --git a/AssemblyInfoShare/SharedAssemblyInfo.cs b/AssemblyInfoShare/SharedAssemblyInfo.cs
diff --git a/Telerik.Sitefinity.Frontend.Data/Telerik.Sitefinity.Frontend.Data.csproj b/Telerik.Sitefinity.Frontend.Data/Telerik.Sitefinity.Frontend.Data.csproj
@@ -18,7 +18,7 @@
     <SccAuxPath>SAK</SccAuxPath>
     <SccProvider>SAK</SccProvider>
     <TargetFrameworkProfile />
-    <EnhancerAssembly>$(SolutionDir)\packages\Telerik.DataAccess.Fluent.2018.0.1127.1\tools\enhancer\enhancer.exe</EnhancerAssembly>
+    <EnhancerAssembly>$(SolutionDir)\packages\Telerik.DataAccess.Fluent.2020.0.428.1\tools\enhancer\enhancer.exe</EnhancerAssembly>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -52,17 +52,17 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="Telerik.OpenAccess, Version=2018.0.1127.1, Culture=neutral, PublicKeyToken=7ce17eeaf1d59342, processorArchitecture=MSIL">
-      <HintPath>..\packages\Telerik.DataAccess.Core.2018.0.1127.1\lib\net40\Telerik.OpenAccess.dll</HintPath>
+    <Reference Include="Telerik.OpenAccess, Version=2020.0.428.1, Culture=neutral, PublicKeyToken=7ce17eeaf1d59342, processorArchitecture=MSIL">
+      <HintPath>..\packages\Telerik.DataAccess.Core.2020.0.428.1\lib\net40\Telerik.OpenAccess.dll</HintPath>
     </Reference>
-    <Reference Include="Telerik.OpenAccess.35.Extensions, Version=2018.0.1127.1, Culture=neutral, PublicKeyToken=7ce17eeaf1d59342, processorArchitecture=MSIL">
-      <HintPath>..\packages\Telerik.DataAccess.Core.2018.0.1127.1\lib\net40\Telerik.OpenAccess.35.Extensions.dll</HintPath>
+    <Reference Include="Telerik.OpenAccess.35.Extensions, Version=2020.0.428.1, Culture=neutral, PublicKeyToken=7ce17eeaf1d59342, processorArchitecture=MSIL">
+      <HintPath>..\packages\Telerik.DataAccess.Core.2020.0.428.1\lib\net40\Telerik.OpenAccess.35.Extensions.dll</HintPath>
     </Reference>
-    <Reference Include="Telerik.OpenAccess.40.Extensions, Version=2018.0.1127.1, Culture=neutral, PublicKeyToken=7ce17eeaf1d59342, processorArchitecture=MSIL">
-      <HintPath>..\packages\Telerik.DataAccess.Core.2018.0.1127.1\lib\net40\Telerik.OpenAccess.40.Extensions.dll</HintPath>
+    <Reference Include="Telerik.OpenAccess.40.Extensions, Version=2020.0.428.1, Culture=neutral, PublicKeyToken=7ce17eeaf1d59342, processorArchitecture=MSIL">
+      <HintPath>..\packages\Telerik.DataAccess.Core.2020.0.428.1\lib\net40\Telerik.OpenAccess.40.Extensions.dll</HintPath>
     </Reference>
-    <Reference Include="Telerik.OpenAccess.Runtime, Version=2018.0.1127.1, Culture=neutral, PublicKeyToken=7ce17eeaf1d59342, processorArchitecture=MSIL">
-      <HintPath>..\packages\Telerik.DataAccess.Core.2018.0.1127.1\lib\net40\Telerik.OpenAccess.Runtime.dll</HintPath>
+    <Reference Include="Telerik.OpenAccess.Runtime, Version=2020.0.428.1, Culture=neutral, PublicKeyToken=7ce17eeaf1d59342, processorArchitecture=MSIL">
+      <HintPath>..\packages\Telerik.DataAccess.Core.2020.0.428.1\lib\net40\Telerik.OpenAccess.Runtime.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -86,15 +86,15 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Telerik.Sitefinity.Model">
-      <HintPath>..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Model.dll</HintPath>
+      <HintPath>..\packages\Telerik.Sitefinity.Core.13.1.7400\lib\net472\Telerik.Sitefinity.Model.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Telerik.Sitefinity">
-      <HintPath>..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.dll</HintPath>
+      <HintPath>..\packages\Telerik.Sitefinity.Core.13.1.7400\lib\net472\Telerik.Sitefinity.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Telerik.Sitefinity.Utilities">
-      <HintPath>..\packages\Telerik.Sitefinity.Core.13.0.7300\lib\net472\Telerik.Sitefinity.Utilities.dll</HintPath>
+      <HintPath>..\packages\Telerik.Sitefinity.Core.13.1.7400\lib\net472\Telerik.Sitefinity.Utilities.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>

diff --git a/Telerik.Sitefinity.Frontend.Data/packages.config b/Telerik.Sitefinity.Frontend.Data/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Telerik.DataAccess.Core" version="2018.0.1127.1" targetFramework="net471" />
-  <package id="Telerik.DataAccess.Fluent" version="2018.0.1127.1" targetFramework="net471" developmentDependency="true" />
-  <package id="Telerik.Sitefinity.Core" version="13.0.7300" targetFramework="net45" />
+  <package id="Telerik.DataAccess.Core" version="2020.0.428.1" targetFramework="net471" />
+  <package id="Telerik.DataAccess.Fluent" version="2020.0.428.1" targetFramework="net471" developmentDependency="true" />
+  <package id="Telerik.Sitefinity.Core" version="13.1.7400" targetFramework="net45" />
 </packages>
diff --git a/Telerik.Sitefinity.Frontend/Designers/Scripts/page-editor-services.js b/Telerik.Sitefinity.Frontend/Designers/Scripts/page-editor-services.js
@@ -72,7 +72,7 @@
          */
         var getUrl = function () {
             if (!httpGetUrl) {
-                httpGetUrl = widgetContext.webServiceUrl + widgetContext.widgetId + '/?pageId=' + widgetContext.pageId;
+                httpGetUrl = widgetContext.webServiceUrl + widgetContext.widgetId + '/?pageId=' + widgetContext.pageId + "&mediaType=" + widgetContext.mediaType;
             }
             return httpGetUrl;
         };

diff --git a/Telerik.Sitefinity.Frontend/Designers/Scripts/page-editor.js b/Telerik.Sitefinity.Frontend/Designers/Scripts/page-editor.js
@@ -153,6 +153,10 @@ var sitefinity = sitefinity || {};
                 if (this.widgetContext.ModuleName) {
                     url += '&moduleName=' + this.widgetContext.ModuleName;
                 }
+                if (this.widgetContext.MediaType) {
+                    url += '&mediaType=' + this.widgetContext.MediaType;
+                }
+
                 $.get(url)
                     .done($.proxy(this.renderDialog, this))
                     .fail(function (data) {

diff --git a/Telerik.Sitefinity.Frontend/FilesMonitoring/GridFileManager.cs b/Telerik.Sitefinity.Frontend/FilesMonitoring/GridFileManager.cs
@@ -100,10 +100,23 @@ public void FileRenamed(string newFileName, string oldFileName, string newFilePa
             var fileMonitorDataManager = FileMonitorDataManager.GetManager();
             var fileData = fileMonitorDataManager.GetFilesData().Where(file => file.FilePath.Equals(oldFilePath, StringComparison.OrdinalIgnoreCase)).FirstOrDefault();
 
-            if (this.AddToToolboxAndFileData(fileMonitorDataManager, newFileName, newFilePath, packageName, fileData, oldFileName))
+            if (fileData != null)
             {
-                this.WidgetRegistrator.UpdateControlData(newFileName, oldFileName);
-                fileMonitorDataManager.SaveChanges();
+                fileData.FilePath = newFilePath;
+                if (this.AddToToolboxAndFileData(fileMonitorDataManager, newFileName, newFilePath, packageName, fileData, oldFileName))
+                {
+                    this.WidgetRegistrator.UpdateControlData(newFileName, oldFileName);
+                    fileMonitorDataManager.SaveChanges();
+                }
+                else
+                {
+                    fileMonitorDataManager.Delete(fileData);
+                    fileMonitorDataManager.SaveChanges();
+                }
+            }
+            else
+            {
+                this.FileAdded(newFileName, newFilePath, null, packageName);
             }
         }
 
@@ -147,7 +160,7 @@ private bool IsFileInValidFolder(string filePath, string packageName = "")
                 expectedGridFolderStructure = expectedGridFolderStructure.Insert(0, packageName + Path.DirectorySeparatorChar);
 
             var resourcePackagesPath = FrontendManager.VirtualPathBuilder.MapPath(string.Concat("~/", PackageManager.PackagesFolder));
-            if (directory.FullName.EndsWith(expectedGridFolderStructure, StringComparison.OrdinalIgnoreCase) && 
+            if (directory.FullName.EndsWith(expectedGridFolderStructure, StringComparison.OrdinalIgnoreCase) &&
                     (
                         directory.FullName.StartsWith(HostingEnvironment.ApplicationPhysicalPath, StringComparison.OrdinalIgnoreCase) ||
                         directory.FullName.StartsWith(resourcePackagesPath, StringComparison.OrdinalIgnoreCase)

diff --git a/Telerik.Sitefinity.Frontend/FilesMonitoring/LayoutFileManager.cs b/Telerik.Sitefinity.Frontend/FilesMonitoring/LayoutFileManager.cs
@@ -184,9 +184,11 @@ internal static void UpdateDefaultTemplateImages(LibrariesManager librariesManag
             var templateThumbsImageLibrary = librariesManager.GetAlbums().FirstOrDefault(lib => lib.Id == LibrariesModule.DefaultTemplateThumbnailsLibraryId);
             if (templateThumbsImageLibrary != null)
             {
+                var images = templateThumbsImageLibrary.Images().ToList();
                 foreach (var imageToUpgrade in imagesToUpgrade)
                 {
-                    var image = templateThumbsImageLibrary.Images().FirstOrDefault(i => i.Title.Equals("MVC_" + imageToUpgrade, StringComparison.OrdinalIgnoreCase) && i.Status == GenericContent.Model.ContentLifecycleStatus.Master);
+                    var image = images.FirstOrDefault(i => i.Title == "MVC_" + imageToUpgrade && i.Status == GenericContent.Model.ContentLifecycleStatus.Master);
+
                     if (image != null)
                     {
                         var iconResource = string.Format(CultureInfo.InvariantCulture, LayoutFileManager.PageTemplateIconPathFormat, imageToUpgrade);
@@ -461,7 +463,7 @@ private void CreateTemplate(string packageName, string fileNameWithoutExtension,
                         template.Title = title;
                         template.Framework = Pages.Model.PageTemplateFramework.Mvc;
                         template.Theme = ThemeController.NoThemeName;
-                        var languageData = pageManager.CreatePublishedInvarianLanguageData();
+                        var languageData = pageManager.CreatePublishedLanguageData();
                         template.LanguageData.Add(languageData);
 
                         this.AttachImageToTemplate(template, pageManager, image ?? "default");
@@ -537,7 +539,7 @@ private Image GetTemplateImage(PageTemplate template, string imageName)
                     if (templateThumbsImageLibrary != null)
                     {
                         // Try get image from library
-                        image = templateThumbsImageLibrary.Images().FirstOrDefault(i => i.Title.Equals("MVC_" + imageName, StringComparison.OrdinalIgnoreCase) && i.Status == GenericContent.Model.ContentLifecycleStatus.Master);
+                        image = templateThumbsImageLibrary.Images().FirstOrDefault(i => i.Title == "MVC_" + imageName && i.Status == GenericContent.Model.ContentLifecycleStatus.Master);
                         if (image == null)
                         {
                             // Check if image is in the resources and upload it

diff --git a/Telerik.Sitefinity.Frontend/Mvc/Controllers/CompositePrecompiledMvcEngineWrapper.cs b/Telerik.Sitefinity.Frontend/Mvc/Controllers/CompositePrecompiledMvcEngineWrapper.cs
@@ -87,7 +87,7 @@ internal static string ComputeHash(Stream stream)
             }
         }
 
-        internal IEnumerable<string> GetViews(ControllerContext controllerContext, IEnumerable<string> viewLocations)
+        internal IEnumerable<string> GetViews(IEnumerable<string> viewLocations)
         {
             var views = new List<string>();
             if (Config.Get<FeatherConfig>().DisablePrecompilation)

diff --git a/Telerik.Sitefinity.Frontend/Mvc/Controllers/ContentPagerController.cs b/Telerik.Sitefinity.Frontend/Mvc/Controllers/ContentPagerController.cs
@@ -117,7 +117,7 @@ private void TryStorePaginationUrls(PagerViewModel model)
                 nextUrl = null;
 
             string previousUrl;
-            if (model.CurrentPage > 1)
+            if (model.CurrentPage > 1 && model.CurrentPage <= model.TotalPagesCount)
                 if (highlightedIndex > 1)
                     previousUrl = ContentPagerController.PageNodeUrl(model.PagerNodes[highlightedIndex - 2], model.RedirectUrlTemplate);
                 else

diff --git a/Telerik.Sitefinity.Frontend/Mvc/Controllers/DesignerController.cs b/Telerik.Sitefinity.Frontend/Mvc/Controllers/DesignerController.cs
@@ -8,6 +8,8 @@
 using Telerik.Sitefinity.Frontend.Mvc.Infrastructure.Controllers.Attributes;
 using Telerik.Sitefinity.Frontend.Mvc.Models;
 using Telerik.Sitefinity.Frontend.Mvc.StringResources;
+using Telerik.Sitefinity.Modules;
+using Telerik.Sitefinity.Modules.Forms;
 using Telerik.Sitefinity.Modules.Pages;
 using Telerik.Sitefinity.Pages.Model;
 using Telerik.Sitefinity.Services;
@@ -33,12 +35,14 @@ public virtual ActionResult Master(string widgetName, string moduleName = null)
         {
             this.GetHttpContext().Items[SystemManager.IsBackendRequestKey] = true;
 
-            var controlId = this.Request != null ? this.Request["controlId"] ?? Guid.Empty.ToString() : Guid.Empty.ToString();
+            var controlId = this.Request != null ? this.Request["controlId"] ?? Guid.Empty.ToString() : Guid.Empty.ToString();
+            var mediaType = this.Request != null ? this.Request["mediaType"] ?? DesignMediaType.Page.ToString() : DesignMediaType.Page.ToString();
 
             this.ViewBag.ControlName = widgetName;
             this.ViewBag.ControlId = controlId;
+            this.ViewBag.MediaType = mediaType;
 
-            var model = this.GetModel(widgetName, Guid.Parse(controlId), moduleName);
+            var model = this.GetModel(widgetName, Guid.Parse(controlId), moduleName, (DesignMediaType)Enum.Parse(typeof(DesignMediaType), mediaType));
             return this.View(DesignerController.DefaultView, model);
         }
 
@@ -55,15 +59,17 @@ public new virtual ActionResult View(string widgetName, string viewType)
         {
             this.GetHttpContext().Items[SystemManager.IsBackendRequestKey] = true;
 
-            var viewName = DesignerController.DesignerViewTemplate.Arrange(viewType);
+            var viewName = DesignerController.DesignerViewTemplate.Arrange(viewType);
+            var mediaType = this.Request != null ? this.Request["mediaType"] ?? DesignMediaType.Page.ToString() : DesignMediaType.Page.ToString();
+            var designMediaType = (DesignMediaType)Enum.Parse(typeof(DesignMediaType), mediaType);
 
-            var model = this.GetViewModel();
+            var model = this.GetViewModel(designMediaType);
 
             // Passing the DesignerModel to the view model 	 	
             var controlIdParam = this.GetControlIdParam(); 	 	
             if (controlIdParam.HasValue) 	 	
             { 	 	
-                ViewBag.DesignerModel = this.GetModel(widgetName, controlIdParam.Value); 	 	
+                ViewBag.DesignerModel = this.GetModel(widgetName, controlIdParam.Value, designMediaType: designMediaType); 	 	
             } 
 
             return this.PartialView(viewName, model);
@@ -98,7 +104,7 @@ protected virtual HttpContextBase GetHttpContext()
         /// <summary>
         /// Gets the model of the designer.
         /// </summary>
-        private IDesignerModel GetModel(string widgetName, Guid controlId, string moduleName = null)
+        private IDesignerModel GetModel(string widgetName, Guid controlId, string moduleName = null, DesignMediaType designMediaType = DesignMediaType.Page)
         {
             var viewFilesMappgings = new Dictionary<string, string>();
 
@@ -109,21 +115,22 @@ private IDesignerModel GetModel(string widgetName, Guid controlId, string module
                 { "widgetName", widgetName },
                 { "controlId", controlId },
                 { "preselectedView", this.Request != null ? this.Request["view"] : null },
-                { "viewFilesMappings", viewFilesMappgings }
+                { "viewFilesMappings", viewFilesMappgings },
+                { "mediaType", designMediaType }
             };
 
             return ControllerModelFactory.GetModel<IDesignerModel>(typeof(DesignerController), constructorParameters);
         }
 
-        private Control GetViewModel()
+        private Control GetViewModel(DesignMediaType designMediaType)
         {
             var controlIdParam = this.GetControlIdParam();
 
             if (!controlIdParam.HasValue)
                 return null;
 
             var controlId = controlIdParam.Value;
-            var manager = PageManager.GetManager();
+            var manager = this.GetControlManager(designMediaType);
             var viewModel = manager.LoadControl(manager.GetControl<ObjectData>(controlId));
 
             var widgetProxy = viewModel as MvcWidgetProxy;
@@ -138,6 +145,18 @@ private Control GetViewModel()
             return viewModel;
         }
 
+        private IControlManager GetControlManager(DesignMediaType designMediaType)
+        {
+            if (designMediaType == DesignMediaType.Form)
+            {
+                return FormsManager.GetManager();
+            } 
+            else 
+            {
+                return PageManager.GetManager();
+            }
+        }
+
         private const string DefaultView = "Designer";
         private const string DesignerViewTemplate = "DesignerView.{0}";
     }

diff --git a/Telerik.Sitefinity.Frontend/Mvc/Helpers/HyperLinkHelpers.cs b/Telerik.Sitefinity.Frontend/Mvc/Helpers/HyperLinkHelpers.cs
@@ -106,7 +106,7 @@ public static string GetDetailPageUrl(ItemViewModel item, Guid detailsPageId, bo
                 url = DataResolver.Resolve(item.DataItem, "URL", null, detailsPageId.ToString());
             }
 
-            url = url.Replace("//", "/");
+            url = RemoveDoubleSlash(url);
 
             return UrlPath.ResolveUrl(url, true);
         }
@@ -134,8 +134,7 @@ public static string GetDetailPageUrl(ItemViewModel item, Guid detailsPageId, bo
             }
 
             url = url + "?itemIndex=" + itemIndex;
-
-            url = url.Replace("//", "/");
+            url = RemoveDoubleSlash(url);
 
             return UrlPath.ResolveUrl(url, true);
         }
@@ -199,5 +198,24 @@ public static string BuildTaxonQueryStringParams(ITaxon taxon, string urlKeyPref
             var taxonQueryStringParams = evaluator.BuildUrl(taxon.Taxonomy.Name, taxonRelativeUrl, taxon.Taxonomy.Name, taxonBuildOptions, UrlEvaluationMode.QueryString, urlKeyPrefix);
             return taxonQueryStringParams;
         }
+
+        private static string RemoveDoubleSlash(string url)
+        {
+            // If the url is absolute we should not replace first // with /. Ex: http://domain...
+            Uri result = null;
+            if (Uri.TryCreate(url, UriKind.Absolute, out result))
+            {
+                UriBuilder builder = new UriBuilder(url);
+                builder.Path = builder.Path.Replace("//", "/");
+
+                url = builder.Uri.ToString();
+            }
+            else
+            {
+                url = url.Replace("//", "/");
+            }
+
+            return url;
+        }
     }
 }
diff --git a/Telerik.Sitefinity.Frontend/Mvc/Helpers/ResourceHelper.cs b/Telerik.Sitefinity.Frontend/Mvc/Helpers/ResourceHelper.cs
@@ -376,7 +376,7 @@ public static MvcHtmlString JsBeautifierScriptReference(this HtmlHelper helper)
         /// <returns></returns>
         public static MvcHtmlString RenderLangAttribute(this HtmlHelper helper)
         {
-            return RenderLangAttribute(helper, CultureInfo.CurrentUICulture.Name);
+            return RenderLangAttribute(helper, Telerik.Sitefinity.Services.SystemManager.CurrentContext.Culture.Name);
         }
 
         /// <summary>

diff --git a/Telerik.Sitefinity.Frontend/Mvc/Infrastructure/Controllers/ControllerExtensions.cs b/Telerik.Sitefinity.Frontend/Mvc/Infrastructure/Controllers/ControllerExtensions.cs
@@ -563,7 +563,7 @@ private static IEnumerable<string> GetViews(Controller controller, IEnumerable<s
                 var compositeViewEngine = viewEngine as CompositePrecompiledMvcEngineWrapper;
                 if (compositeViewEngine != null)
                 {
-                    var files = compositeViewEngine.GetViews(controller.ControllerContext, viewLocations);
+                    var files = compositeViewEngine.GetViews(viewLocations);
                     baseFiles.AddRange(files);
                 }
             }

diff --git a/Telerik.Sitefinity.Frontend/Mvc/Infrastructure/Layouts/MvcMasterPage.cs b/Telerik.Sitefinity.Frontend/Mvc/Infrastructure/Layouts/MvcMasterPage.cs
@@ -168,6 +168,13 @@ private void HandleOpenTag(Stack<Control> container, HtmlChunk chunk, StringBuil
 
                 container.Peek().Controls.Add(sectionRenderer);
             }
+            else if (chunk.TagName.Equals("meta", StringComparison.OrdinalIgnoreCase))
+            {
+                this.AddIfNotEmpty(currentLiteralText.ToString(), container.Peek());
+                currentLiteralText.Clear();
+
+                this.AddIfNotEmpty(chunk.Html, container.Peek());
+            }
             else if (chunk.TagName == "%@")
             {
                 //// Ignore
@@ -218,6 +225,10 @@ private void HandleCloseTag(Stack<Control> container, HtmlChunk chunk, StringBui
             {
                 //// Ignore
             }
+            else if (chunk.TagName.Equals("meta", StringComparison.OrdinalIgnoreCase))
+            {
+                //// Ignore
+            }
             else
             {
                 currentLiteralText.Append(chunk.Html);