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

Fixes up some naming conventions and removes need to instantiate another umbraco helper

Browse Source
This commit is contained in:
Shannon
2013-10-04 09:00:02 +10:00
parent 95f120e98f
commit b462082ed9
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Web.UI.Client/src/common/resources/publishedcontent.resource.js
View File

@@ -7,6 +7,8 @@
**/
function publishedContentResource($q, $http, umbRequestHelper) {
//TODO: Why do we have this ? If we want a URL why isn't it just on the content controller ?
//the factory object returned
return {

7
src/Umbraco.Web/Editors/PublishedContentController.cs
View File

@@ -7,13 +7,16 @@ using Umbraco.Web.Mvc;
namespace Umbraco.Web.Editors
{
//TODO: Why do we have this ? If we want a URL why isn't it just on the content controller ?
[PluginController("UmbracoApi")]
public class PublishedContentController : UmbracoAuthorizedJsonController
{
UmbracoHelper helper = new UmbracoHelper(UmbracoContext.Current);
public string GetNiceUrl(int id)
{
return helper.NiceUrl(id);
return Umbraco.NiceUrl(id);
}
}
}

2
src/Umbraco.Web/Models/ContentEditing/RichTextEditorCommand.cs
View File

@@ -23,7 +23,7 @@ namespace Umbraco.Web.Models.ContentEditing
public string UserInterface { get; set; }
[DataMember(Name = "frontEndCommand")]
public string FrontendCommand { get; set; }
public string FrontEndCommand { get; set; }
[DataMember(Name = "value")]
public string Value { get; set; }

2
src/Umbraco.Web/PropertyEditors/RichTextPreValueController.cs
View File

@@ -69,7 +69,7 @@ namespace Umbraco.Web.PropertyEditors
Command = n.SelectSingleNode("./tinyMceCommand").FirstChild.Value,
Alias = n.SelectSingleNode("./umbracoAlias").FirstChild.Value.ToLower(),
UserInterface = n.SelectSingleNode("./tinyMceCommand").Attributes.GetNamedItem("userInterface").Value,
FrontendCommand = n.SelectSingleNode("./tinyMceCommand").Attributes.GetNamedItem("frontendCommand").Value,
FrontEndCommand = n.SelectSingleNode("./tinyMceCommand").Attributes.GetNamedItem("frontendCommand").Value,
Value = n.SelectSingleNode("./tinyMceCommand").Attributes.GetNamedItem("value").Value,
Priority = int.Parse(n.SelectSingleNode("./priority").FirstChild.Value)
}