mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8675 from owncloud/sharing-improvements 

Sharing improvements
This commit is contained in:
Björn Schießle 2014-05-23 06:41:34 -04:00
parent 0b0e038b8b 3b279c9056
commit 71e1d919de
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/files_sharing/js/share.js
View File

@ -31,8 +31,8 @@ $(document).ready(function() {
// we create a share notification action to inform the user about files
// shared with him otherwise we just update the existing share action.
var allShared;
var $fileList = $(this);
if (oc_appconfig.core.sharingDisabledForUser) {
var $fileList = $(this);
allShared = $fileList.find('[data-share-owner]');
var shareNotification = '<a class="action action-share-notification permanent"' +
' data-action="Share-Notification" href="#" original-title="">' +
@ -40,8 +40,13 @@ $(document).ready(function() {
$(allShared).find('.fileactions').append(function() {
var owner = $(this).closest('tr').attr('data-share-owner');
var shareBy = t('files_sharing', 'Shared by {owner}', {owner: owner});
return shareNotification + '<span> ' + shareBy + '</span></span>';
var $result = $(shareNotification + '<span> ' + shareBy + '</span></span>');
$result.on('click', function() {
return false;
});
return $result;
});
} else {
allShared = $fileList.find('[data-share-owner] [data-Action="Share"]');
allShared.addClass('permanent');

12
apps/files_sharing/lib/sharedstorage.php
View File

@ -517,14 +517,14 @@ class Shared extends \OC\Files\Storage\Common {
$parent = dirname($parent);
}
$newMountPoint = \OC\Files\Filesystem::normalizePath($parent . '/' . $mountPoint);
$newMountPoint = \OCA\Files_Sharing\Helper::generateUniqueTarget(
\OC\Files\Filesystem::normalizePath($parent . '/' . $mountPoint),
array(),
new \OC\Files\View('/' . \OCP\User::getUser() . '/files')
);
if($newMountPoint !== $share['file_target']) {
$newMountPoint = \OCA\Files_Sharing\Helper::generateUniqueTarget(
$newMountPoint,
array(),
new \OC\Files\View('/' . \OCP\User::getUser() . '/files')
);
self::updateFileTarget($newMountPoint, $share);
$share['file_target'] = $newMountPoint;