diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/macro.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/macro.resource.js index 06b5f9496c..43ba045230 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/macro.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/macro.resource.js @@ -2,13 +2,13 @@ * @ngdoc service * @name umbraco.resources.macroResource * @description Deals with data for macros - * + * **/ function macroResource($q, $http, umbRequestHelper) { //the factory object returned return { - + /** * @ngdoc method * @name umbraco.resources.macroResource#getMacroParameters @@ -20,7 +20,7 @@ function macroResource($q, $http, umbRequestHelper) { * @param {int} macroId The macro id to get parameters for * */ - getMacroParameters: function (macroId) { + getMacroParameters: function (macroId) { return umbRequestHelper.resourcePromise( $http.get( umbRequestHelper.getApiUrl( @@ -29,7 +29,7 @@ function macroResource($q, $http, umbRequestHelper) { [{ macroId: macroId }])), 'Failed to retrieve macro parameters for macro with id ' + macroId); }, - + /** * @ngdoc method * @name umbraco.resources.macroResource#getMacroResult @@ -55,6 +55,27 @@ function macroResource($q, $http, umbRequestHelper) { macroParams: macroParamDictionary }), 'Failed to retrieve macro result for macro with alias ' + macroAlias); + }, + + /** + * + * @param {} filename + * @returns {} + */ + createPartialViewMacroWithFile: function(parent, filename) { + + return umbRequestHelper.resourcePromise( + $http.post( + umbRequestHelper.getApiUrl( + "macroApiBaseUrl", + "CreatePartialViewMacroWithFile"), { + parent: parent, + filename: filename + } + ), + 'Failed to create macro "' + filename + '"' + ); + } }; } diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js index 6132ba3f89..839e282f2c 100644 --- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.controller.js @@ -1,47 +1,42 @@ (function () { "use strict"; - function PartialViewMacrosCreateController($scope, codefileResource, $location, navigationService, formHelper, localizationService, appState) { + function PartialViewMacrosCreateController($scope, codefileResource, macroResource, $location, navigationService, formHelper, localizationService, appState) { var vm = this; var node = $scope.dialogOptions.currentNode; var localizeCreateFolder = localizationService.localize("defaultdialog_createFolder"); vm.snippets = []; - vm.showSnippets = false; - vm.creatingFolder = false; + vm.snippet = "Empty"; + vm.createMacro = false; vm.createFolderError = ""; vm.folderName = ""; + vm.fileName = ""; + + vm.creatingFolder = false; + vm.creatingFile = false; - vm.createPartialViewMacro = createPartialViewMacro; vm.showCreateFolder = showCreateFolder; + vm.showCreateFile = showCreateFile; vm.createFolder = createFolder; - vm.showCreateFromSnippet = showCreateFromSnippet; + vm.createFile = createFile; function onInit() { codefileResource.getSnippets('partialViewMacros') - .then(function(snippets) { + .then(function (snippets) { vm.snippets = snippets; }); } - function createPartialViewMacro(selectedSnippet) { - - var snippet = null; - - if(selectedSnippet && selectedSnippet.fileName) { - snippet = selectedSnippet.fileName; - } - - $location.path("/developer/partialviewmacros/edit/" + node.id).search("create", "true").search("snippet", snippet); - navigationService.hideMenu(); - - } - function showCreateFolder() { vm.creatingFolder = true; } + function showCreateFile() { + vm.creatingFile = true; + } + function createFolder(form) { if (formHelper.submitForm({scope: $scope, formCtrl: form, statusMessage: localizeCreateFolder})) { @@ -75,11 +70,32 @@ }); } } - - function showCreateFromSnippet() { - vm.showSnippets = true; + + function createFile(form) { + if (formHelper.submitForm({ scope: $scope, formCtrl: form, statusMessage: 'create file' })) { + + if (vm.createMacro) { + var path = decodeURIComponent(node.id); + macroResource.createPartialViewMacroWithFile(path, vm.fileName).then(function(created) { + $location.path("/developer/partialviewmacros/edit/" + node.id).search("create", "true").search("name", vm.fileName).search("snippet", vm.snippet); + navigationService.hideMenu(); + }, function(err) { + vm.createFileError = err; + + //show any notifications + if (angular.isArray(err.data.notifications)) { + for (var i = 0; i < err.data.notifications.length; i++) { + notificationsService.showNotification(err.data.notifications[i]); + } + } + }); + } else { + $location.path("/developer/partialviewmacros/edit/" + node.id).search("create", "true").search("name", vm.fileName).search("snippet", vm.snippet); + navigationService.hideMenu(); + } + } } - + onInit(); } diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html index 0c5a74c4b0..e1223dab25 100644 --- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html +++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html @@ -2,46 +2,61 @@
-
- +
+
Create an item under {{currentNode.name}}
-
- -
+ - -
- -
+
+ +
+
+ +
+
{{vm.createFileError.errorMsg}}
+

{{vm.createFileError.data.message}}

+
+ + + + +
+ +
+ + + + + + + + + +
@@ -49,14 +64,14 @@
- +
{{vm.createFolderError.errorMsg}}

{{vm.createFolderError.data.message}}

- + diff --git a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.controller.js index 83ad251e17..6d19952a1d 100644 --- a/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/partialviewmacros/edit.controller.js @@ -26,7 +26,7 @@ /* Functions bound to view model */ function save() { - + vm.page.saveButtonState = "busy"; vm.partialViewMacro.content = vm.editor.getValue(); @@ -70,7 +70,7 @@ }, function (err) { vm.page.saveButtonState = "error"; - + localizationService.localize("speechBubbles_validationFailedHeader").then(function (headerValue) { localizationService.localize("speechBubbles_validationFailedMessage").then(function(msgValue) { notificationsService.error(headerValue, msgValue); @@ -104,7 +104,7 @@ var code = templateHelper.getInsertDictionarySnippet(model.insert.node.name); insert(code); break; - + case "umbracoField": insert(model.insert.umbracoField); break; @@ -169,7 +169,7 @@ vm.pageFieldOverlay.show = false; vm.pageFieldOverlay = null; // focus editor - vm.editor.focus(); + vm.editor.focus(); } }; } @@ -212,7 +212,7 @@ var code = templateHelper.getQuerySnippet(model.result.queryExpression); insert(code); - + vm.queryBuilderOverlay.show = false; vm.queryBuilderOverlay = null; }, @@ -222,7 +222,7 @@ vm.queryBuilderOverlay.show = false; vm.queryBuilderOverlay = null; // focus editor - vm.editor.focus(); + vm.editor.focus(); } }; } @@ -232,9 +232,9 @@ function init() { //we need to load this somewhere, for now its here. assetsService.loadCss("lib/ace-razor-mode/theme/razor_chrome.css"); - + if ($routeParams.create) { - + var snippet = "Empty"; if($routeParams.snippet) { @@ -242,6 +242,9 @@ } codefileResource.getScaffold("partialViewMacros", $routeParams.id, snippet).then(function (partialViewMacro) { + if ($routeParams.name) { + partialViewMacro.name = $routeParams.name; + } ready(partialViewMacro, false); }); @@ -276,7 +279,7 @@ }, onLoad: function(_editor) { vm.editor = _editor; - + // initial cursor placement // Keep cursor in name field if we are create a new template // else set the cursor at the bottom of the code editor @@ -316,7 +319,7 @@ } function setFormState(state) { - + // get the current form var currentForm = angularHelper.getCurrentForm($scope); @@ -328,7 +331,7 @@ } } - + init(); } diff --git a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml index c3aac3a243..34f5ecd282 100644 --- a/src/Umbraco.Web.UI/umbraco/config/lang/en.xml +++ b/src/Umbraco.Web.UI/umbraco/config/lang/en.xml @@ -201,6 +201,7 @@ New data type New javascript file New empty partial view + New partial view macro New partial view from snippet New empty partial view macro New partial view macro from snippet diff --git a/src/Umbraco.Web/Editors/MacroController.cs b/src/Umbraco.Web/Editors/MacroController.cs index b0b2cb4bf2..7b09287ea9 100644 --- a/src/Umbraco.Web/Editors/MacroController.cs +++ b/src/Umbraco.Web/Editors/MacroController.cs @@ -10,6 +10,7 @@ using Umbraco.Web.Models.ContentEditing; using Umbraco.Web.Mvc; using umbraco; using Umbraco.Core; +using Umbraco.Core.Models; namespace Umbraco.Web.Editors { @@ -29,7 +30,7 @@ namespace Umbraco.Web.Editors /// /// /// - /// Note that ALL logged in users have access to this method because editors will need to isnert macros into rte (content/media/members) and it's used for + /// Note that ALL logged in users have access to this method because editors will need to isnert macros into rte (content/media/members) and it's used for /// inserting into templates/views/etc... it doesn't expose any sensitive data. /// public IEnumerable GetMacroParameters(int macroId) @@ -50,9 +51,9 @@ namespace Umbraco.Web.Editors /// /// /// To send a dictionary as a GET parameter the query should be structured like: - /// + /// /// ?macroAlias=Test&pageId=3634¯oParams[0].key=myKey¯oParams[0].value=myVal¯oParams[1].key=anotherKey¯oParams[1].value=anotherVal - /// + /// /// /// [HttpGet] @@ -129,6 +130,26 @@ namespace Umbraco.Web.Editors "text/html"); return result; } - + + [HttpPost] + public HttpResponseMessage CreatePartialViewMacroWithFile(CreatePartialViewMacroWithFileModel model) + { + var macro = new Macro + { + + Alias = model.Filename, + Name = model.Filename, // will be "aliased" + ScriptPath = "~/Views/MacroPartials/" + model.Parent + "/" + model.Filename + ".cshtml" + }; + + Services.MacroService.Save(macro); // may throw + return new HttpResponseMessage(HttpStatusCode.OK); + } + + public class CreatePartialViewMacroWithFileModel + { + public string Parent { get; set; } + public string Filename { get; set; } + } } } \ No newline at end of file