From 8b71b6bf700e8e6672ab34ee3eb8bbe2a0a55625 Mon Sep 17 00:00:00 2001 From: Per Ploug Krogslund Date: Wed, 14 Aug 2013 21:44:26 +0200 Subject: [PATCH] broken routes --- src/Umbraco.Web.UI.Client/src/routes.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/routes.js b/src/Umbraco.Web.UI.Client/src/routes.js index 7fbb9d0562..ad897cc3ea 100644 --- a/src/Umbraco.Web.UI.Client/src/routes.js +++ b/src/Umbraco.Web.UI.Client/src/routes.js @@ -5,7 +5,6 @@ app.config(function ($routeProvider) { templateUrl: function (rp) { if (!rp.url) throw "A framed resource must have a url route parameter"; - return 'views/common/legacy.html'; } }) @@ -54,12 +53,11 @@ app.config(function ($routeProvider) { if (!rp.method) return "views/common/dashboard.html"; - ////here we detect recycle bins, all recycle bins start with -2* (i.e. -20, -21) - //if (rp.id.startsWith("-2")) { - // return 'views/' + rp.section + '/recyclebin.html'; - //} - - return 'views/' + rp.section + '/' + rp.tree + '/' + rp.method + '.html'; + if(rp.tree === "default" || rp.tree === ""){ + return 'views/' + rp.section + '/' + rp.method + '.html'; + }else{ + return 'views/' + rp.section + '/' + rp.tree + '/' + rp.method + '.html'; + } } }) .otherwise({ redirectTo: '/content/document' });