From 8b0767b41f2d5292f55b327c82a66d661a5fb82e Mon Sep 17 00:00:00 2001 From: perploug Date: Tue, 5 Nov 2013 00:41:55 +0100 Subject: [PATCH 1/2] Removes hardcoded menu urls --- .../views/content/content.edit.controller.js | 21 ++++++------ .../datatype/datatype.edit.controller.js | 16 ++++++++- .../src/views/datatype/edit.html | 34 ++++++++++++++++--- .../src/views/media/edit.html | 34 ++++++++++++++++--- .../src/views/media/media.edit.controller.js | 16 ++++++++- .../src/views/member/edit.html | 32 +++++++++++++++-- .../views/member/member.edit.controller.js | 17 +++++++++- .../folderbrowser/folderbrowser.html | 2 +- 8 files changed, 144 insertions(+), 28 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js index 0024350e0b..68d29f2d5a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js @@ -216,18 +216,17 @@ function ContentEditController($scope, $routeParams, $q, $timeout, $window, cont }; $scope.options = function(content){ - if(!content.id){ - return; - } + if(!content.id){ + return; + } - if(!$scope.actions){ - var node = {menuUrl: "/umbraco/UmbracoTrees/ContentTree/GetMenu?id=" + content.id + "&application=content"}; - treeService.getMenu({ treeNode: node }) - .then(function(data) { - $scope.actions = data.menuItems; - }); - } - }; + if(!$scope.actions){ + treeService.getMenu({ treeNode: $scope.nav.ui.currentTreeNode }) + .then(function(data) { + $scope.actions = data.menuItems; + }); + } + }; /** this method is called for all action buttons and then we proxy based on the btn definition */ $scope.performAction = function(btn) { diff --git a/src/Umbraco.Web.UI.Client/src/views/datatype/datatype.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/datatype/datatype.edit.controller.js index 24e84f5954..2cb460d022 100644 --- a/src/Umbraco.Web.UI.Client/src/views/datatype/datatype.edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/datatype/datatype.edit.controller.js @@ -6,8 +6,9 @@ * @description * The controller for the content editor */ -function DataTypeEditController($scope, $routeParams, $location, dataTypeResource, notificationsService, navigationService, angularHelper, serverValidationManager, contentEditingHelper, formHelper) { +function DataTypeEditController($scope, $routeParams, $location, navigationService, treeService, dataTypeResource, notificationsService, navigationService, angularHelper, serverValidationManager, contentEditingHelper, formHelper) { + $scope.nav = navigationService; //method used to configure the pre-values when we retreive them from the server function createPreValueProps(preVals) { $scope.preValues = []; @@ -84,6 +85,19 @@ function DataTypeEditController($scope, $routeParams, $location, dataTypeResourc } }); + $scope.options = function(content){ + if(!content.id){ + return; + } + + if(!$scope.actions){ + treeService.getMenu({ treeNode: $scope.nav.ui.currentTreeNode }) + .then(function(data) { + $scope.actions = data.menuItems; + }); + } + }; + $scope.save = function() { if (formHelper.submitForm({ scope: $scope, statusMessage: "Saving..." })) { diff --git a/src/Umbraco.Web.UI.Client/src/views/datatype/edit.html b/src/Umbraco.Web.UI.Client/src/views/datatype/edit.html index 7e2484c0f4..01656cb5d3 100644 --- a/src/Umbraco.Web.UI.Client/src/views/datatype/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/datatype/edit.html @@ -16,12 +16,27 @@
- -
+
+ + + Options + - - -
+ + + + + + +
@@ -54,6 +69,15 @@ + +
+
+ +
+
+ diff --git a/src/Umbraco.Web.UI.Client/src/views/media/edit.html b/src/Umbraco.Web.UI.Client/src/views/media/edit.html index 7084381484..81cf09dcd1 100644 --- a/src/Umbraco.Web.UI.Client/src/views/media/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/media/edit.html @@ -18,11 +18,27 @@

{{formStatus}}

-
- -
+
+ + + Options + + + + + + + + +
@@ -37,6 +53,14 @@ + +
+
+ +
+
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 74a45e5c82..4637a0e898 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 @@ -6,8 +6,9 @@ * @description * The controller for the media editor */ -function mediaEditController($scope, $routeParams, mediaResource, notificationsService, angularHelper, serverValidationManager, contentEditingHelper, fileManager, formHelper) { +function mediaEditController($scope, $routeParams, mediaResource, navigationService, notificationsService, angularHelper, serverValidationManager, contentEditingHelper, fileManager, treeService, formHelper) { + $scope.nav = navigationService; if ($routeParams.create) { mediaResource.getScaffold($routeParams.id, $routeParams.doctype) @@ -32,6 +33,19 @@ function mediaEditController($scope, $routeParams, mediaResource, notificationsS }); } + $scope.options = function(content){ + if(!content.id){ + return; + } + + if(!$scope.actions){ + treeService.getMenu({ treeNode: $scope.nav.ui.currentTreeNode }) + .then(function(data) { + $scope.actions = data.menuItems; + }); + } + }; + $scope.save = function () { if (formHelper.submitForm({ scope: $scope, statusMessage: "Saving..." })) { diff --git a/src/Umbraco.Web.UI.Client/src/views/member/edit.html b/src/Umbraco.Web.UI.Client/src/views/member/edit.html index 856304e157..4ee55a689a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/member/edit.html +++ b/src/Umbraco.Web.UI.Client/src/views/member/edit.html @@ -18,9 +18,27 @@

{{formStatus}}

-
- -
+
+ + + Options + + + + + + + + +
@@ -34,6 +52,14 @@ + +
+
+ +
+
diff --git a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js index 816f72b121..bd8730ec7a 100644 --- a/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js +++ b/src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js @@ -6,8 +6,10 @@ * @description * The controller for the member editor */ -function MemberEditController($scope, $routeParams, $location, $q, $window, memberResource, entityResource, notificationsService, angularHelper, serverValidationManager, contentEditingHelper, fileManager, formHelper) { +function MemberEditController($scope, $routeParams, $location, $q, $window, memberResource, entityResource, navigationService, notificationsService, angularHelper, serverValidationManager, contentEditingHelper, fileManager, formHelper, treeService) { + $scope.nav = navigationService; + if ($routeParams.create) { //we are creating so get an empty member item memberResource.getScaffold($routeParams.doctype) @@ -45,6 +47,19 @@ function MemberEditController($scope, $routeParams, $location, $q, $window, memb } + $scope.options = function(content){ + if(!content.id){ + return; + } + + if(!$scope.actions){ + treeService.getMenu({ treeNode: $scope.nav.ui.currentTreeNode }) + .then(function(data) { + $scope.actions = data.menuItems; + }); + } + }; + $scope.save = function() { if (formHelper.submitForm({ scope: $scope, statusMessage: "Saving..." })) { diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.html b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.html index 992bb86f6c..90669a9bbc 100644 --- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.html +++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/folderbrowser/folderbrowser.html @@ -7,7 +7,7 @@ data-file-upload-progress="" ng-hide="creating" data-ng-class="{'fileupload-processing': processing() || loadingFiles}"> - From eb3bd9f89c9064bcd74e8d30ecba00f3f30e88ec Mon Sep 17 00:00:00 2001 From: perploug Date: Tue, 5 Nov 2013 01:11:37 +0100 Subject: [PATCH 2/2] Fixes broken test loader --- src/Umbraco.Web.UI.Client/test/config/karma.conf.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/test/config/karma.conf.js b/src/Umbraco.Web.UI.Client/test/config/karma.conf.js index c3f4777ccb..004d3128da 100644 --- a/src/Umbraco.Web.UI.Client/test/config/karma.conf.js +++ b/src/Umbraco.Web.UI.Client/test/config/karma.conf.js @@ -36,7 +36,7 @@ module.exports = function(karma) { 'src/common/services/*.js', 'src/common/security/*.js', 'src/common/resources/*.js', - 'src/common/mocks/resources/*.js', + 'src/common/mocks/**/*.js', 'src/views/**/*.controller.js', 'test/unit/**/*.spec.js', {pattern: 'lib/umbraco/namespacemanager.js', watched: true, served: true}