Merge branch 'pr/n10_vnbaaij'

lars-erik · lars-erik · commit 1cbb3c735237 · 2015-03-13T14:18:26.000+01:00
diff --git a/Umbraco.RelationEditor.Web/App_Plugins/RelationEditor/relationeditor.js b/Umbraco.RelationEditor.Web/App_Plugins/RelationEditor/relationeditor.js
@@ -247,8 +247,8 @@
     }
 
     function RelationsResources($q, $http, umbDataFormatter, umbRequestHelper) {
-        var root = Umbraco.Sys.ServerVariables.umbracoSettings.umbracoPath + "/relationseditor/relations/",
-            enableRoot = Umbraco.Sys.ServerVariables.umbracoSettings.umbracoPath + "/relationseditor/settings/";
+        var root = Umbraco.Sys.ServerVariables.umbracoSettings.umbracoPath + "/backoffice/relationseditor/relations/",
+            enableRoot = Umbraco.Sys.ServerVariables.umbracoSettings.umbracoPath + "/backoffice/relationseditor/settings/";
         return {
             getById: function(section, treeType, id) {
                 return umbRequestHelper.resourcePromise(
diff --git a/Umbraco.RelationEditor/Controllers/RelationsController.cs b/Umbraco.RelationEditor/Controllers/RelationsController.cs
@@ -15,7 +15,7 @@ namespace Umbraco.RelationEditor.Controllers
 {
     [UmbracoApplicationAuthorize("content")]
     [PluginController("RelationsEditor")]
-    public class RelationsController : UmbracoApiController
+    public class RelationsController : UmbracoAuthorizedApiController
     {
         private readonly RelationEditorConfiguration configuration = RelationEditor.Configuration.Instance;
         private readonly IRelationService relationService;
diff --git a/Umbraco.RelationEditor/Controllers/SettingsController.cs b/Umbraco.RelationEditor/Controllers/SettingsController.cs
@@ -11,7 +11,7 @@ namespace Umbraco.RelationEditor.Controllers
 {
     [UmbracoApplicationAuthorize("content")]
     [PluginController("RelationsEditor")]
-    public class SettingsController : UmbracoApiController
+    public class SettingsController : UmbracoAuthorizedApiController
     {
         private IContentTypeService ContentTypeService
         {

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ namespace Umbraco.RelationEditor.Controllers`
`15`	`15`	`{`
`16`	`16`	`[UmbracoApplicationAuthorize("content")]`
`17`	`17`	`[PluginController("RelationsEditor")]`
`18`		`- public class RelationsController : UmbracoApiController`
	`18`	`+ public class RelationsController : UmbracoAuthorizedApiController`
`19`	`19`	`{`
`20`	`20`	`private readonly RelationEditorConfiguration configuration = RelationEditor.Configuration.Instance;`
`21`	`21`	`private readonly IRelationService relationService;`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ namespace Umbraco.RelationEditor.Controllers`
`11`	`11`	`{`
`12`	`12`	`[UmbracoApplicationAuthorize("content")]`
`13`	`13`	`[PluginController("RelationsEditor")]`
`14`		`- public class SettingsController : UmbracoApiController`
	`14`	`+ public class SettingsController : UmbracoAuthorizedApiController`
`15`	`15`	`{`
`16`	`16`	`private IContentTypeService ContentTypeService`
`17`	`17`	`{`