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

Fixed view path conventions for menu items

Browse Source
This commit is contained in:
Shannon
2013-10-02 20:20:02 +10:00
parent 8f53bea3d7
commit 6560865f61
3 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -324,6 +324,9 @@ angular.module('umbraco.services')
if (!args.action) {
throw "The args parameter must have an 'action' property as the clicked menu action object";
}
if (!args.node) {
throw "The args parameter must have a 'node' as the active tree node";
}
//ensure the current dialog is cleared before creating another!
if (this.ui.currentDialog) {
@@ -348,11 +351,7 @@ angular.module('umbraco.services')
var templateUrl;
var iframe;
//TODO: fix hardcoded hack for content/media... once these trees are converted over to
// new c# trees we won't need to do this any longer.
var isCreateForContent = args.action.alias === "create" && (this.ui.currentSection === "content" || this.ui.currentSection === "media");
if (args.action.metaData["actionUrl"] && !isCreateForContent) {
if (args.action.metaData["actionUrl"]) {
templateUrl = args.action.metaData["actionUrl"];
iframe = true;
}
@@ -361,7 +360,12 @@ angular.module('umbraco.services')
iframe = false;
}
else {
templateUrl = "views/" + this.ui.currentSection + "/" + args.action.alias + ".html";
//by convention we will look into the /views/{treetype}/{action}.html
// for example: /views/content/create.html
templateUrl = "views/" + treeService.getTreeAlias(args.node) + "/" + args.action.alias + ".html";
iframe = false;
}