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

Fixes: U4-3655 Clicking on recycle bin in media section redirects you back to the content tree

Browse Source
This commit is contained in:
Shannon
2013-11-25 14:45:14 +11:00
parent 99e0a1f11b
commit 59599efab6
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Web.UI.Client/src/routes.js
View File

@@ -68,8 +68,8 @@ app.config(function ($routeProvider) {
},
resolve: checkAuth(true)
})
.when('/:section/:method', {
templateUrl: function(rp) {
.when('/:section/:tree/:method', {
templateUrl: function (rp) {
if (!rp.method)
return "views/common/dashboard.html";
@@ -79,7 +79,7 @@ app.config(function ($routeProvider) {
// angular dashboards working. Perhaps a normal section dashboard would list out the registered
// dashboards (as tabs if we wanted) and each tab could actually be a route link to one of these views?
return 'views/' + rp.section + '/' + rp.method + '.html';
return 'views/' + rp.tree + '/' + rp.method + '.html';
},
resolve: checkAuth(true)
})

6
src/Umbraco.Web/Trees/ContentTreeControllerBase.cs
View File

@@ -111,7 +111,11 @@ namespace Umbraco.Web.Trees
ui.GetText("general", "recycleBin"),
"icon-trash",
RecycleBinSmells,
queryStrings.GetValue<string>("application") + TreeAlias.EnsureStartsWith('/') + "/recyclebin"));
//TODO: This would be nice to enable so we can have a nice recyclebin view, see the NOTE: in the routes.js angular file
// for the time being we'll just load the dashboard of the section.
//queryStrings.GetValue<string>("application") + TreeAlias.EnsureStartsWith('/') + "/recyclebin"));
queryStrings.GetValue<string>("application")));
}
return nodes;