diff options
Diffstat (limited to 'core/js/share.js')
| -rw-r--r-- | core/js/share.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/core/js/share.js b/core/js/share.js index 1c59524939c..aab41cf76da 100644 --- a/core/js/share.js +++ b/core/js/share.js @@ -374,7 +374,7 @@ OC.Share={ if (data.shares) { $.each(data.shares, function(index, share) { if (share.share_type == OC.Share.SHARE_TYPE_LINK) { - if ( !('file_target' in share) ) { + if (itemSource === share.file_source || itemSource === share.item_source) { OC.Share.showLink(share.token, share.share_with, itemSource); } } else { @@ -620,6 +620,7 @@ OC.Share={ var file = $('#dir').val() + '/' + filename; } file = '/'+OC.currentUser+'/files'+file; + // TODO: use oc webroot ? var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&'+type+'='+encodeURIComponent(file); } else { //TODO add path param when showing a link to file in a subfolder of a public link share @@ -630,6 +631,7 @@ OC.Share={ service=linkSharetype; } + // TODO: use oc webroot ? var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service='+service+'&t='+token; } |