From 7e383ea96145e7db3dcea4bbcf2c577110c004f5 Mon Sep 17 00:00:00 2001 From: Mads Rasmussen Date: Mon, 23 Apr 2018 11:13:01 +0200 Subject: [PATCH] fix issue with infinite mode and create route param in media editor --- .../src/views/media/media.edit.controller.js | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js index 23d4d58c7f..d9fd28dde8 100644 --- a/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/media/media.edit.controller.js @@ -9,12 +9,23 @@ function mediaEditController($scope, $routeParams, appState, mediaResource, entityResource, navigationService, notificationsService, angularHelper, serverValidationManager, contentEditingHelper, fileManager, treeService, formHelper, umbModelMapper, editorState, umbRequestHelper, $http) { var nodeId = null; + var create = false; + // when opening the editor through infinite editing get the + // node id from the model instead of the route param if($scope.model && $scope.model.node && $scope.model.node.id) { nodeId = $scope.model.node.id; } else { nodeId = $routeParams.id; } + + // when opening the editor through infinite editing get the + // create option from the model instead of the route param + if($scope.model && $scope.model.infiniteMode) { + create = $scope.model.create; + } else { + create = $routeParams.create; + } //setup scope vars $scope.currentSection = appState.getSectionState("currentSection"); @@ -52,7 +63,7 @@ function mediaEditController($scope, $routeParams, appState, mediaResource, enti } } - if ($routeParams.create) { + if (create) { $scope.page.loading = true; @@ -176,7 +187,7 @@ function mediaEditController($scope, $routeParams, appState, mediaResource, enti $scope.busy = true; $scope.page.saveButtonState = "busy"; - mediaResource.save($scope.content, $routeParams.create, fileManager.getFiles()) + mediaResource.save($scope.content, create, fileManager.getFiles()) .then(function(data) { formHelper.resetForm({ scope: $scope, notifications: data.notifications });