Skip to content

Only show label if the shareWith value is relevant #12334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 1 commit into from
Nov 7, 2018
+24 −17
Merged

Only show label if the shareWith value is relevant #12334

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Only show label if the shareWith value is relevant 
For local users / groups the display name is enough to show, we just need details for email/remote shares

Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr
juliusknorr committed Nov 7, 2018
commit 8ed945a519bf91c0a6918b3fd678ac94ebf102b3
41 changes: 24 additions & 17 deletions core/js/sharedialogview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,44 +478,51 @@
autocompleteRenderItem: function(ul, item) {
var icon = 'icon-user';
var text = item.label;
var description = '';
var type = '';
var getTranslatedType = function(type) {
switch (type) {
case 'HOME':
return t('core', 'Home');
case 'WORK':
return t('core', 'Work');
case 'OTHER':
return t('core', 'Other');
default:
return '' + type;
}
};
if (typeof item.type !== 'undefined' && item.type !== null) {
type = getTranslatedType(item.type) + ' ';
}

if (typeof item.name !== 'undefined') {
text = item.name;
}
if (item.value.shareType === OC.Share.SHARE_TYPE_GROUP) {
icon = 'icon-contacts-dark';
} else if (item.value.shareType === OC.Share.SHARE_TYPE_REMOTE) {
icon = 'icon-shared';
description += item.value.shareWith;
} else if (item.value.shareType === OC.Share.SHARE_TYPE_REMOTE_GROUP) {
text = t('core', '{sharee} (remote group)', { sharee: text }, undefined, { escape: false });
icon = 'icon-shared';
description += item.value.shareWith;
} else if (item.value.shareType === OC.Share.SHARE_TYPE_EMAIL) {
icon = 'icon-mail';
description += item.value.shareWith;
} else if (item.value.shareType === OC.Share.SHARE_TYPE_CIRCLE) {
text = t('core', '{sharee} ({type}, {owner})', {sharee: text, type: item.value.circleInfo, owner: item.value.circleOwner}, undefined, {escape: false});
icon = 'icon-circle';
} else if (item.value.shareType === OC.Share.SHARE_TYPE_ROOM) {
icon = 'icon-talk';
}
var description = '';
var getTranslatedType = function(type) {
switch (type) {
case 'HOME':
return t('core', 'Home');
case 'WORK':
return t('core', 'Home');
case 'OTHER':
return t('core', 'Other');
default:
return type;
}
};
if (typeof item.type !== 'undefined' && item.type !== null) {
description = getTranslatedType(item.type);
}

var insert = $("<div class='share-autocomplete-item'/>");
if (item.merged) {
insert.addClass('merged');
text = item.value.shareWith;
description = type;
} else {
var avatar = $("<div class='avatardiv'></div>").appendTo(insert);
if (item.value.shareType === OC.Share.SHARE_TYPE_USER || item.value.shareType === OC.Share.SHARE_TYPE_CIRCLE) {
Expand All @@ -526,7 +533,7 @@
}
avatar.imageplaceholder(item.uuid, text, 32);
}
description = item.value.shareWith;
description = type + description;
}
if (description !== '') {
insert.addClass('with-description');
Expand Down