Ensures the root node is not shown in the copy/media dialogs for content/media when start ndoes are assigned, fixes entity searching since there was js errors (maybe from a bad merge)

This commit is contained in:
Shannon
2017-09-08 15:16:13 +10:00
parent 81ba2069af
commit 7ae95e31a1
6 changed files with 16 additions and 9 deletions

View File

@@ -44,7 +44,7 @@ angular.module('umbraco.services')
return entityResource.search(args.term, "Member", args.searchFrom).then(function (data) {
_.each(data, function (item) {
configureMemberResult(item);
searchResultFormatter.configureMemberResult(item);
});
return data;
});
@@ -69,7 +69,7 @@ angular.module('umbraco.services')
return entityResource.search(args.term, "Document", args.searchFrom, args.canceler).then(function (data) {
_.each(data, function (item) {
configureContentResult(item);
searchResultFormatter.configureContentResult(item);
});
return data;
});
@@ -94,7 +94,7 @@ angular.module('umbraco.services')
return entityResource.search(args.term, "Media", args.searchFrom).then(function (data) {
_.each(data, function (item) {
configureMediaResult(item);
searchResultFormatter.configureMediaResult(item);
});
return data;
});

View File

@@ -22,7 +22,7 @@ angular.module("umbraco").controller("Umbraco.Editors.Content.CopyController",
hideHeader: false
}
userService.getCurrentUser().then(function (userData) {
$scope.treeModel.hideHeader = userData.startContentIds.length > 0 && userData.startContentIds.indexOf(-1) == -1;
$scope.treeModel.hideHeader = userData.startContentIds.length > 0 && userData.startContentIds.indexOf(-1) == -1;
});
var node = dialogOptions.currentNode;

View File

@@ -48,7 +48,7 @@
<div ng-hide="searchInfo.showSearch">
<umb-tree
section="content"
hideheader="treeModel.hideHeader"
hideheader="{{treeModel.hideHeader}}"
hideoptions="true"
isdialog="true"
eventhandler="dialogTreeEventHandler"

View File

@@ -47,9 +47,9 @@
</umb-tree-search-results>
<div ng-hide="searchInfo.showSearch">
<umb-tree
<umb-tree
section="content"
hideheader="treeModel.hideHeader"
hideheader="{{treeModel.hideHeader}}"
hideoptions="true"
isdialog="true"
eventhandler="dialogTreeEventHandler"

View File

@@ -1,11 +1,18 @@
//used for the media picker dialog
angular.module("umbraco").controller("Umbraco.Editors.Media.MoveController",
function ($scope, eventsService, mediaResource, appState, treeService, navigationService) {
function ($scope, userService, eventsService, mediaResource, appState, treeService, navigationService) {
var dialogOptions = $scope.dialogOptions;
$scope.dialogTreeEventHandler = $({});
var node = dialogOptions.currentNode;
$scope.treeModel = {
hideHeader: false
}
userService.getCurrentUser().then(function (userData) {
$scope.treeModel.hideHeader = userData.startMediaIds.length > 0 && userData.startMediaIds.indexOf(-1) == -1;
});
function nodeSelectHandler(ev, args) {
if(args && args.event) {

View File

@@ -27,7 +27,7 @@
<div ng-hide="miniListView">
<umb-tree
section="media"
hideheader="false"
hideheader="{{treeModel.hideHeader}}"
hideoptions="true"
isdialog="true"
eventhandler="dialogTreeEventHandler"