diff --git a/src/Umbraco.Web.UI.Client/src/common/resources/dictionary.resource.js b/src/Umbraco.Web.UI.Client/src/common/resources/dictionary.resource.js index 416c575724..3bb01fbe92 100644 --- a/src/Umbraco.Web.UI.Client/src/common/resources/dictionary.resource.js +++ b/src/Umbraco.Web.UI.Client/src/common/resources/dictionary.resource.js @@ -145,42 +145,13 @@ function dictionaryResource($q, $http, $location, umbRequestHelper, umbDataForma "getList")), "Failed to get list"); } - - /** - * @ngdoc method - * @name umbraco.resources.dictionaryResource#getSection - * @methodOf umbraco.resources.dictionaryResource - * - * @description - * Gets the current section that the dictionary tree is in (only settings and translation are allowed currently) - * - * ##usage - *
-         * var section = dictionaryResource.getSection();
-         * 
- * - * @returns string. - * - **/ - function getSection() { - var section = $location.$$path; - if (section.startsWith("/")) { - section = section.substring(1, section.length); - } - var firstSlash = section.indexOf("/"); - if (firstSlash !== -1) { - section = section.substring(0, firstSlash); - } - return section; - } - + var resource = { deleteById: deleteById, create: create, getById: getById, save: save, - getList : getList, - getSection: getSection + getList : getList }; return resource; diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.create.controller.js b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.create.controller.js index cd92053aea..f47244bb10 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.create.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.create.controller.js @@ -6,7 +6,7 @@ * @description * The controller for creating dictionary items */ -function DictionaryCreateController($scope, $location, dictionaryResource, navigationService, notificationsService, formHelper) { +function DictionaryCreateController($scope, $location, dictionaryResource, navigationService, notificationsService, formHelper, appState) { var vm = this; vm.itemKey = ""; @@ -26,8 +26,8 @@ function DictionaryCreateController($scope, $location, dictionaryResource, navig formHelper.resetForm({ scope: $scope }); // navigate to edit view - var section = dictionaryResource.getSection(); - $location.path("/" + section + "/dictionary/edit/" + data); + var currentSection = appState.getSectionState("currentSection"); + $location.path("/" + currentSection + "/dictionary/edit/" + data); }, function (err) { diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.delete.controller.js b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.delete.controller.js index 56aa80d5f0..43d6bac401 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.delete.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.delete.controller.js @@ -6,7 +6,7 @@ * @description * The controller for deleting dictionary items */ -function DictionaryDeleteController($scope, $location, dictionaryResource, treeService, navigationService) { +function DictionaryDeleteController($scope, $location, dictionaryResource, treeService, navigationService, appState) { var vm = this; function cancel() { @@ -31,13 +31,13 @@ function DictionaryDeleteController($scope, $location, dictionaryResource, treeS navigationService.hideMenu(); - var section = dictionaryResource.getSection(); + var currentSection = appState.getSectionState("currentSection"); if (parentId !== "-1") { // set the view of the parent item - $location.path("/" + section + "/dictionary/edit/" + parentId); + $location.path("/" + currentSection + "/dictionary/edit/" + parentId); } else { // we have no parent, so redirect to section - $location.path("/" + section + "/"); + $location.path("/" + currentSection + "/"); } }); diff --git a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.list.controller.js b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.list.controller.js index 8fa91459aa..35739b3db7 100644 --- a/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.list.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/dictionary/dictionary.list.controller.js @@ -6,7 +6,7 @@ * @description * The controller for listting dictionary items */ -function DictionaryListController($scope, $location, dictionaryResource, localizationService) { +function DictionaryListController($scope, $location, dictionaryResource, localizationService, appState) { var vm = this; vm.title = "Dictionary overview"; vm.loading = false; @@ -26,8 +26,8 @@ function DictionaryListController($scope, $location, dictionaryResource, localiz } function clickItem(id) { - var section = dictionaryResource.getSection(); - $location.path("/" + section + "/dictionary/edit/" + id); + var currentSection = appState.getSectionState("currentSection"); + $location.path("/" + currentSection + "/dictionary/edit/" + id); } vm.clickItem = clickItem;