From: Morris Jobke <morris.jobke@gmail.com>
Date: Wed, 6 Nov 2013 21:59:27 +0000 (-0800)
Subject: Merge pull request #5399 from frisco82/fixDownloadOverQuota
X-Git-Tag: v6.0.0beta3~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a0ee6aef29650e0fb697f00612a02890020bc90b;p=nextcloud-server.git

Merge pull request #5399 from frisco82/fixDownloadOverQuota

Do not count the size of shared folder on total
---

a0ee6aef29650e0fb697f00612a02890020bc90b
diff --cc apps/files/js/filelist.js
index 006bd1f4966,8abb28e9395..f11cba6230b
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@@ -598,21 -575,20 +586,21 @@@ var FileList=
  			var info = t('files', '{dirs} and {files}', infoVars);
  
  			// don't show the filesize column, if filesize is NaN (e.g. in trashbin)
- 			if (isNaN(totalSize)) {
+ 			if (isNaN(summary.totalSize)) {
  				var fileSize = '';
  			} else {
- 				var fileSize = '<td class="filesize">'+humanFileSize(totalSize)+'</td>';
+ 				var fileSize = '<td class="filesize">'+humanFileSize(summary.totalSize)+'</td>';
  			}
  
 -			$('#fileList').append('<tr class="summary"><td><span class="info">'+info+'</span></td>'+fileSize+'<td></td></tr>');
 +			var $summary = $('<tr class="summary"><td><span class="info">'+info+'</span></td>'+fileSize+'<td></td></tr>');
 +			$('#fileList').append($summary);
  
 -			var $dirInfo = $('.summary .dirinfo');
 -			var $fileInfo = $('.summary .fileinfo');
 -			var $connector = $('.summary .connector');
 +			var $dirInfo = $summary.find('.dirinfo');
 +			var $fileInfo = $summary.find('.fileinfo');
 +			var $connector = $summary.find('.connector');
  
  			// Show only what's necessary, e.g.: no files: don't show "0 files"
 -			if ($dirInfo.html().charAt(0) === "0") {
 +			if (totalDirs === 0) {
  				$dirInfo.hide();
  				$connector.hide();
  			}