Skip to content

Minor issues #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jsuurd wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Minor issues #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21f92ce
Added check if components metadata is null to prevent NullReferenceEx…
Mar 24, 2015
8fbc04a
Only strip the URL if it has the default extension to support externa…
Mar 24, 2015
38cc8d3
Also strip the forward slash when resolved link is default page for c…
Jul 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion content-management/Sdl.Web.Templating/Templates/ResolveRichText.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ private string ResolveXhtml(string input)
{
Component comp = (Component)Engine.GetObject(uri);
// resolve youtube video
if (comp != null)
if (comp != null && comp.Metadata != null)
{
ItemFields fields = new ItemFields(comp.Metadata, comp.MetadataSchema);
ProcessFields(fields, link);
Expand Down
5 changes: 4 additions & 1 deletion web-application/Sdl.Web.Common/Models/Navigation/SitemapItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ namespace Sdl.Web.Common.Models
{
public class SitemapItem : EntityBase
{
//TODO: Make this configurable since its dependend on framework implementation
private const string DefaultExtension = ".html";

private string _url;

public SitemapItem()
Expand All @@ -29,7 +32,7 @@ public string Url

private static string ProcessUrl(string value)
{
return Path.HasExtension(value) ? value.Substring(0, value.Length - Path.GetExtension(value).Length) : value;
return Path.HasExtension(value) && DefaultExtension.Equals(Path.GetExtension(value)) ? value.Substring(0, value.Length - Path.GetExtension(value).Length) : value;
}

public string Type { get; set; }
Expand Down
6 changes: 4 additions & 2 deletions web-application/Sdl.Web.DD4T/Mapping/DD4TContentResolver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,11 @@ public virtual string ResolveLink(object linkData, object resolveInstruction = n
if (url!=null && url.EndsWith(DefaultExtension))
{
url = url.Substring(0, url.Length - DefaultExtension.Length);
if (url.EndsWith("/" + DefaultExtensionLessPageName))
// Also strip the forward slash
var defaultPageNamePart = "/" + DefaultExtensionLessPageName;
if (url.EndsWith(defaultPageNamePart))
{
url = url.Substring(0, url.Length - DefaultExtensionLessPageName.Length);
url = url.Substring(0, url.Length - defaultPageNamePart.Length);
}
}
}
Expand Down