yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change DeepLink class so it can return internal or external links and add GetAnchor method (renaming Get to GetUrl)

Browse Source
This commit is contained in:
agrath@gmail.com
2012-06-11 16:44:31 -01:00
parent b9624fbe7e
commit cded3fa060
1 changed files with 26 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
umbraco/cms/helpers/DeepLink.cs
View File

@@ -23,7 +23,23 @@ namespace umbraco.cms.helpers
string sPath = string.Join(",", treePath.ToArray());
return sPath;
}
public static string Get(DeepLinkType type, string idOrFilePath)
public static string GetAnchor(DeepLinkType type, string idOrFilePath, bool useJavascript)
{
string url = GetUrl(type, idOrFilePath, useJavascript);
if (!string.IsNullOrEmpty(url))
{
if (!useJavascript)
{
return string.Format("<a href=\"{1}\" target=\"_blank\">Edit&nbsp;&gt;</a>", url);
}
else
{
return string.Format("<a href=\"{0}\">Edit&nbsp;&gt;</a>", url);
}
}
return null;
}
public static string GetUrl(DeepLinkType type, string idOrFilePath, bool useJavascript)
{
string basePath = "/umbraco/umbraco.aspx";
@@ -98,7 +114,15 @@ namespace umbraco.cms.helpers
if (currentUser.Applications.Any(app => app.alias == section))
{
string rightAction = string.Format("{0}?{1}={2}", editorUrl, idKey, idOrFilePath);
return string.Format("{0}?app={1}&rightAction={2}#{1}", basePath, section, HttpContext.Current.Server.UrlEncode(rightAction));
if (!useJavascript)
{
string rightActionEncoded = HttpContext.Current.Server.UrlEncode(rightAction);
return string.Format("{0}?app={1}&rightAction={2}#{1}", basePath, section, rightActionEncoded);
}
else
{
return string.Format("javascript:UmbClientMgr.contentFrameAndSection('{0}','{1}');", section, rightAction);
}
}
}
}