From 45c325e0bfe9967ae63b11fca856f507febdde69 Mon Sep 17 00:00:00 2001 From: Louis DeJardin Date: Thu, 22 Jul 2010 17:06:20 -0700 Subject: [PATCH] Small fix because "" satisfies the ?? operator --HG-- branch : dev --- src/Orchard/Mvc/Html/ContentItemExtensions.cs | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/Orchard/Mvc/Html/ContentItemExtensions.cs b/src/Orchard/Mvc/Html/ContentItemExtensions.cs index 834af87fa..f567c9f71 100644 --- a/src/Orchard/Mvc/Html/ContentItemExtensions.cs +++ b/src/Orchard/Mvc/Html/ContentItemExtensions.cs @@ -20,7 +20,7 @@ namespace Orchard.Mvc.Html { return null; return html.ActionLink( - linkText ?? metadata.DisplayText ?? "view", + NonNullOrEmpty(linkText, metadata.DisplayText, "view"), Convert.ToString(metadata.DisplayRouteValues["action"]), metadata.DisplayRouteValues); } @@ -30,7 +30,7 @@ namespace Orchard.Mvc.Html { } public static MvcHtmlString ItemEditLinkWithReturnUrl(this HtmlHelper html, string linkText, IContent content) { - return html.ItemEditLink(linkText, content, new {ReturnUrl = html.ViewContext.HttpContext.Request.RawUrl}); + return html.ItemEditLink(linkText, content, new { ReturnUrl = html.ViewContext.HttpContext.Request.RawUrl }); } public static MvcHtmlString ItemEditLink(this HtmlHelper html, string linkText, IContent content) { @@ -43,11 +43,19 @@ namespace Orchard.Mvc.Html { return null; return html.ActionLink( - linkText ?? metadata.DisplayText ?? "edit", + NonNullOrEmpty(linkText, metadata.DisplayText, "edit"), Convert.ToString(metadata.EditorRouteValues["action"]), metadata.EditorRouteValues.Merge(additionalRouteValues)); } + private static string NonNullOrEmpty(params string[] values) { + foreach (var value in values) { + if (!string.IsNullOrEmpty(value)) + return value; + } + return null; + } + public static MvcHtmlString ItemEditLink(this HtmlHelper html, IContent content) { return ItemEditLink(html, null, content); }