From b4926416333ab5c830836230b6059dcf745685ce Mon Sep 17 00:00:00 2001
From: mvanhelmont <marcel@helmont.nl>
Date: Sun, 29 Apr 2018 08:48:49 +0200
Subject: [PATCH] U4-11275

This is a simple fix for U4-11275 so that packages also can set routePath to something like a overview page. Like the new user section when you don't want to display children. Is a copy of /:section/:tree/:method/:id
---
 src/Umbraco.Web.UI.Client/src/routes.js | 35 +++++++++++++++++++------
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/routes.js b/src/Umbraco.Web.UI.Client/src/routes.js
index 3fc4d3f78e..314b3b0c53 100644
--- a/src/Umbraco.Web.UI.Client/src/routes.js
+++ b/src/Umbraco.Web.UI.Client/src/routes.js
@@ -31,11 +31,11 @@ app.config(function ($routeProvider) {
                             userService.getCurrentUser({ broadcastEvent: broadcast }).then(function (user) {
                                 //is auth, check if we allow or reject
                                 if (isRequired) {
-
+
                                     //This checks the current section and will force a redirect to 'content' as the default
                                     if ($route.current.params.section.toLowerCase() === "default" || $route.current.params.section.toLowerCase() === "umbraco" || $route.current.params.section === "") {
                                         $route.current.params.section = "content";
-                                    }
+                                    }
 
                                     // U4-5430, Benjamin Howarth
                                     // We need to change the current route params if the user only has access to a single section
@@ -141,13 +141,32 @@ app.config(function ($routeProvider) {
             resolve: canRoute(true)
         })
         .when('/:section/:tree/:method', {
-            templateUrl: function (rp) {
+            //This allows us to dynamically change the template for this route since you cannot inject services into the templateUrl method.
+            template: "<div ng-include='templateUrl'></div>",
+            //This controller will execute for this route, then we replace the template dynamnically based on the current tree.
+            controller: function ($scope, $route, $routeParams, treeService) {
 
-                //if there is no method registered for this then show the dashboard
-                if (!rp.method)
-                    return "views/common/dashboard.html";
-                
-                return ('views/' + rp.tree + '/' + rp.method + '.html');
+                if (!$routeParams.tree || !$routeParams.method) {
+                    $scope.templateUrl = "views/common/dashboard.html";
+                }
+
+                // Here we need to figure out if this route is for a package tree and if so then we need
+                // to change it's convention view path to:
+                // /App_Plugins/{mypackage}/backoffice/{treetype}/{method}.html
+
+                // otherwise if it is a core tree we use the core paths:
+                // views/{treetype}/{method}.html
+
+                var packageTreeFolder = treeService.getTreePackageFolder($routeParams.tree);
+
+                if (packageTreeFolder) {
+                    $scope.templateUrl = (Umbraco.Sys.ServerVariables.umbracoSettings.appPluginsPath +
+                        "/" + packageTreeFolder +
+                        "/backoffice/" + $routeParams.tree + "/" + $routeParams.method + ".html");
+                }
+                else {
+                    $scope.templateUrl = ('views/' + $routeParams.tree + '/' + $routeParams.method + '.html');
+                }
             },
             resolve: canRoute(true)
         })