diff --git a/.gitignore b/.gitignore index c4ea41bd9d..c1da001870 100644 --- a/.gitignore +++ b/.gitignore @@ -78,3 +78,4 @@ src/Umbraco.Web.UI/umbraco/assets/* src/Umbraco.Web.UI.Client/build/* src/Umbraco.Web.UI.Client/build/* src/Umbraco.Web.UI.Client/build/belle/ +src/Umbraco.Web.UI/UserControls/ diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js index 862b55d8a2..24cdc63116 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/content.resource.js @@ -56,7 +56,6 @@ function contentResource($q, $http, umbDataFormatter, umbRequestHelper) { }, getByIds: function (ids) { - var deferred = $q.defer(); //go and get the data diff --git a/src/Umbraco.Web/Editors/ContentController.cs b/src/Umbraco.Web/Editors/ContentController.cs index 1beb8c20de..77e502d101 100644 --- a/src/Umbraco.Web/Editors/ContentController.cs +++ b/src/Umbraco.Web/Editors/ContentController.cs @@ -117,6 +117,9 @@ namespace Umbraco.Web.Editors //Now, we just need to save the data + contentItem.PersistedContent.Name = contentItem.Name; + //TODO: We'll need to save the new template, publishat, etc... values here + //Save the property values foreach (var p in contentItem.ContentDto.Properties) {