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

Merge pull request #1049 from umbraco/temp-U4-7700

Browse Source 
Fixes: U4-7700 7.4 beta Backoffice Routing problem for Custom Sections or Installed Packages with a custom section
This commit is contained in:
Shannon Deminick
2016-01-25 11:19:46 +01:00
parent bbb187f2c8 2e4941053c
commit 742ee57835
3 changed files with 56 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
View File

@@ -108,7 +108,7 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
* @param {String} source The URL to load into the iframe
*/
loadLegacyIFrame: function (source) {
$location.path("/" + appState.getSectionState("currentSection").toLowerCase() + "/framed/" + encodeURIComponent(source));
$location.path("/" + appState.getSectionState("currentSection") + "/framed/" + encodeURIComponent(source));
},
/**
@@ -132,7 +132,7 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
appState.setSectionState("currentSection", sectionAlias);
this.showTree(sectionAlias);
$location.path(sectionAlias.toLowerCase());
$location.path(sectionAlias);
},
/**
@@ -214,7 +214,7 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
//this reacts to tree items themselves being clicked
//the tree directive should not contain any handling, simply just bubble events
mainTreeEventHandler.bind("treeNodeSelect", function(ev, args) {
mainTreeEventHandler.bind("treeNodeSelect", function (ev, args) {
var n = args.node;
ev.stopPropagation();
ev.preventDefault();
@@ -250,10 +250,10 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
appState.setMenuState("currentNode", args.node);
//not legacy, lets just set the route value and clear the query string if there is one.
$location.path(n.routePath.toLowerCase()).search("");
$location.path(n.routePath).search("");
}
else if (args.element.section) {
$location.path(args.element.section.toLowerCase()).search("");
$location.path(args.element.section).search("");
}
service.hideNavigation();
@@ -446,7 +446,7 @@ function navigationService($rootScope, $routeParams, $log, $location, $q, $timeo
if (action.metaData && action.metaData["actionRoute"] && angular.isString(action.metaData["actionRoute"])) {
//first check if the menu item simply navigates to a route
var parts = action.metaData["actionRoute"].split("?");
$location.path(parts[0].toLowerCase()).search(parts.length > 1 ? parts[1] : "");
$location.path(parts[0]).search(parts.length > 1 ? parts[1] : "");
this.hideNavigation();
return;
}

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

@@ -130,7 +130,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.tree + '/' + rp.method + '.html').toLowerCase();
return ('views/' + rp.tree + '/' + rp.method + '.html');
},
resolve: canRoute(true)
})
@@ -156,10 +156,10 @@ app.config(function ($routeProvider) {
if (packageTreeFolder) {
$scope.templateUrl = (Umbraco.Sys.ServerVariables.umbracoSettings.appPluginsPath +
"/" + packageTreeFolder +
"/backoffice/" + $routeParams.tree + "/" + $routeParams.method + ".html").toLowerCase();
"/backoffice/" + $routeParams.tree + "/" + $routeParams.method + ".html");
}
else {
$scope.templateUrl = ('views/' + $routeParams.tree + '/' + $routeParams.method + '.html').toLowerCase();
$scope.templateUrl = ('views/' + $routeParams.tree + '/' + $routeParams.method + '.html');
}
},