yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1415 from bjarnef/dev-v7-U4-8809

Browse Source 
Show only empty recycle bin text, when filter doesn't has a value
This commit is contained in:
Simon Busborg
2016-08-05 11:14:44 +02:00
committed by GitHub
parent 68b3ea349e a136235c72
commit 9131b73cbb
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/grid/grid.html
View File

@@ -18,7 +18,7 @@
</umb-empty-state>
<umb-empty-state
ng-if="!items && vm.isRecycleBin"
ng-if="!items && options.filter.length == 0 && vm.isRecycleBin"
position="center">
<localize key="general_recycleBinEmpty"></localize>
</umb-empty-state>
@@ -68,7 +68,7 @@
</umb-tooltip>
<umb-empty-state
ng-if="vm.itemsWithoutFolders.length === 0 && vm.isRecycleBin"
ng-if="vm.itemsWithoutFolders.length === 0 && options.filter.length == 0 && vm.isRecycleBin"
position="center">
<localize key="general_recycleBinEmpty"></localize>
</umb-empty-state>

2
src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/layouts/list/list.html
View File

@@ -58,7 +58,7 @@
</umb-empty-state>
<umb-empty-state
ng-if="!items && vm.isRecycleBin"
ng-if="!items && options.filter.length == 0 && vm.isRecycleBin"
position="center">
<localize key="general_recycleBinEmpty"></localize>
</umb-empty-state>