Merge remote-tracking branch 'origin/bugfix/temp8-media-could-not-be-moved-to-root' into bugfix/temp8-media-could-not-be-moved-to-root

This commit is contained in:
Bjarke Berg
2019-01-18 08:32:21 +01:00
2 changed files with 2 additions and 2 deletions

View File

@@ -15,7 +15,7 @@
<localize key="actions_wasMovedTo">was moved to</localize>
<strong>{{target.name}}</strong>
</div>
<button class="btn btn-primary" ng-click="nav.hideDialog()">Ok</button>
<button class="btn btn-primary" ng-click="close()">Ok</button>
</div>
<p class="abstract" ng-hide="success">

View File

@@ -27,7 +27,7 @@
<div ng-hide="success">
<div ng-hide="miniListView">
<umb-tree-search-box
<umb-tree-search-box
hide-search-callback="hideSearch"
search-callback="onSearchResults"
search-from-id="{{searchInfo.searchFromId}}"