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

Now using shareOwner for the share owner 

Makes it consistent with the regular file list fileData
This commit is contained in:
Vincent Petry 2014-06-02 18:52:31 +02:00
parent 0944565f60
commit 640fbc016d
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/files_sharing/js/sharedfilelist.js
View File

@ -46,7 +46,7 @@
$tr.find('td.filename input:checkbox').remove();
$tr.attr('data-share-id', _.pluck(fileData.shares, 'id').join(','));
if (this._sharedWithUser) {
$tr.attr('data-share-owner', fileData.shares[0].ownerDisplayName);
$tr.attr('data-share-owner', fileData.shareOwner);
}
return $tr;
},
@ -159,7 +159,7 @@
stime: share.stime * 1000,
};
if (self._sharedWithUser) {
file.share.ownerDisplayName = share.displayname_owner;
file.shareOwner = share.displayname_owner;
file.name = OC.basename(share.file_target);
file.path = OC.dirname(share.file_target);
file.permissions = share.permissions;

4
apps/files_sharing/tests/js/appSpec.js
View File

@ -122,9 +122,7 @@ describe('OCA.Sharing.App tests', function() {
type: 'dir',
path: '/somewhere/inside/subdir',
counterParts: ['user2'],
shares: [{
ownerDisplayName: 'user2'
}]
shareOwner: 'user2'
}]);
fileListIn.findFileEl('testdir').find('td a.name').click();

10
apps/files_sharing/tests/js/sharedfilelistSpec.js
View File

@ -9,7 +9,8 @@
*/
describe('OCA.Sharing.FileList tests', function() {
var testFiles, alertStub, notificationStub, fileList;
var testFiles, alertStub, notificationStub, fileList, fileActions;
var oldFileListPrototype;
beforeEach(function() {
alertStub = sinon.stub(OC.dialogs, 'alert');
@ -45,10 +46,17 @@ describe('OCA.Sharing.FileList tests', function() {
'<div id="emptycontent">Empty content message</div>' +
'</div>'
);
// back up prototype, as it will be extended by
// the sharing code
oldFileListPrototype = _.extend({}, OCA.Files.FileList.prototype);
fileActions = new OCA.Files.FileActions();
OCA.Sharing.Util.initialize(fileActions);
});
afterEach(function() {
OCA.Files.FileList.prototype = oldFileListPrototype;
testFiles = undefined;
fileList = undefined;
fileActions = undefined;
notificationStub.restore();
alertStub.restore();