wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #17156 from nextcloud/stable17-16976

Browse source 
[stable17] Always use the folder icon depending on the mount type if not a share mount
This commit is contained in:
Roeland Jago Douma 2019-10-22 19:11:02 +02:00 committed by GitHub
commit c0cdc68741
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/files/js/mainfileinfodetailview.js
View file

@ -186,6 +186,9 @@
this._previewManager.loadPreview(this.model, $iconDiv, $container); this._previewManager.loadPreview(this.model, $iconDiv, $container);
} else { } else {
var iconUrl = this.model.get('icon') || OC.MimeType.getIconUrl('dir'); var iconUrl = this.model.get('icon') || OC.MimeType.getIconUrl('dir');
if (typeof this.model.get('mountType') !== 'undefined') {
iconUrl = OC.MimeType.getIconUrl('dir-' + this.model.get('mountType'))
}
$iconDiv.css('background-image', 'url("' + iconUrl + '")'); $iconDiv.css('background-image', 'url("' + iconUrl + '")');
} }
this.$el.find('[title]').tooltip({placement: 'bottom'}); this.$el.find('[title]').tooltip({placement: 'bottom'});

BIN
core/js/dist/share_backend.js vendored
View file

Binary file not shown.

BIN
core/js/dist/share_backend.js.map vendored
View file

Binary file not shown.

9
core/js/share.js
View file

@ -269,22 +269,23 @@ OC.Share = _.extend(OC.Share || {}, {
var message, recipients, avatars; var message, recipients, avatars;
var ownerId = $tr.attr('data-share-owner-id'); var ownerId = $tr.attr('data-share-owner-id');
var owner = $tr.attr('data-share-owner'); var owner = $tr.attr('data-share-owner');
var mountType = $tr.attr('data-mounttype');
var shareFolderIcon; var shareFolderIcon;
var iconClass = 'icon-shared'; var iconClass = 'icon-shared';
action.removeClass('shared-style'); action.removeClass('shared-style');
// update folder icon // update folder icon
if (type === 'dir' && (hasShares || hasLink || ownerId)) { if (type === 'dir' && (hasShares || hasLink || ownerId)) {
if (hasLink) { if (typeof mountType !== 'undefined' && mountType !== 'shared-root' && mountType !== 'shared') {
shareFolderIcon = OC.MimeType.getIconUrl('dir-' + mountType);
} else if (hasLink) {
shareFolderIcon = OC.MimeType.getIconUrl('dir-public'); shareFolderIcon = OC.MimeType.getIconUrl('dir-public');
} } else {
else {
shareFolderIcon = OC.MimeType.getIconUrl('dir-shared'); shareFolderIcon = OC.MimeType.getIconUrl('dir-shared');
} }
$tr.find('.filename .thumbnail').css('background-image', 'url(' + shareFolderIcon + ')'); $tr.find('.filename .thumbnail').css('background-image', 'url(' + shareFolderIcon + ')');
$tr.attr('data-icon', shareFolderIcon); $tr.attr('data-icon', shareFolderIcon);
} else if (type === 'dir') { } else if (type === 'dir') {
var isEncrypted = $tr.attr('data-e2eencrypted'); var isEncrypted = $tr.attr('data-e2eencrypted');
var mountType = $tr.attr('data-mounttype');
// FIXME: duplicate of FileList._createRow logic for external folder, // FIXME: duplicate of FileList._createRow logic for external folder,
// need to refactor the icon logic into a single code path eventually // need to refactor the icon logic into a single code path eventually
if (isEncrypted === 'true') { if (isEncrypted === 'true') {