Added owner display name in action

diff --git a/apps/files_sharing/js/sharedfilelist.js b/apps/files_sharing/js/sharedfilelist.js
index b941722d0cf788b64844cb5562c2d0bc55d6f221..cf5e65528e2803d8e606022defa9bc5ac24238a5 100644 (file)
--- a/apps/files_sharing/js/sharedfilelist.js
+++ b/apps/files_sharing/js/sharedfilelist.js
@@ -47,6 +47,9 @@
                        $tr.find('td.date').before($sharedWith);
                        $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);
+                       }
                        return $tr;
                },
 

diff --git a/apps/files_sharing/tests/js/appSpec.js b/apps/files_sharing/tests/js/appSpec.js
index 09c48a6305c2b88ba94f94dbe7f4a1bcde08aa22..ad95ee5394251157121f25fc6a3bceaea8f3a503 100644 (file)
--- a/apps/files_sharing/tests/js/appSpec.js
+++ b/apps/files_sharing/tests/js/appSpec.js
@@ -121,7 +121,10 @@ describe('OCA.Sharing.App tests', function() {
                                name: 'testdir',
                                type: 'dir',
                                path: '/somewhere/inside/subdir',
-                               counterParts: ['user2']
+                               counterParts: ['user2'],
+                               shares: [{
+                                       ownerDisplayName: 'user2'
+                               }]
                        }]);
 
                        fileListIn.findFileEl('testdir').find('td a.name').click();

diff --git a/apps/files_sharing/tests/js/sharedfilelistSpec.js b/apps/files_sharing/tests/js/sharedfilelistSpec.js
index ddcd746afe077c604ec874ba576c052af53035a4..5cfcec95d0c1d4dc3e79a5777d75d42ffae05901 100644 (file)
--- a/apps/files_sharing/tests/js/sharedfilelistSpec.js
+++ b/apps/files_sharing/tests/js/sharedfilelistSpec.js
@@ -121,6 +121,7 @@ describe('OCA.Sharing.FileList tests', function() {
                        expect($tr.attr('data-permissions')).toEqual('31'); // read and delete
                        expect($tr.attr('data-mime')).toEqual('text/plain');
                        expect($tr.attr('data-mtime')).toEqual('11111000');
+                       expect($tr.attr('data-share-owner')).toEqual('User Two');
                        expect($tr.attr('data-share-id')).toEqual('7');
                        expect($tr.find('a.name').attr('href')).toEqual(
                                OC.webroot +
@@ -164,6 +165,7 @@ describe('OCA.Sharing.FileList tests', function() {
                        expect($tr.attr('data-permissions')).toEqual('31'); // read and delete
                        expect($tr.attr('data-mime')).toEqual('httpd/unix-directory');
                        expect($tr.attr('data-mtime')).toEqual('11111000');
+                       expect($tr.attr('data-share-owner')).toEqual('User Two');
                        expect($tr.attr('data-share-id')).toEqual('7');
                        expect($tr.find('a.name').attr('href')).toEqual(
                                OC.webroot +
@@ -240,6 +242,7 @@ describe('OCA.Sharing.FileList tests', function() {
                        expect($tr.attr('data-permissions')).toEqual('31'); // read and delete
                        expect($tr.attr('data-mime')).toEqual('text/plain');
                        expect($tr.attr('data-mtime')).toEqual('11111000');
+                       expect($tr.attr('data-share-owner')).not.toBeDefined();
                        expect($tr.attr('data-share-id')).toEqual('7');
                        expect($tr.find('a.name').attr('href')).toEqual(
                                OC.webroot +
@@ -282,6 +285,7 @@ describe('OCA.Sharing.FileList tests', function() {
                        expect($tr.attr('data-permissions')).toEqual('31'); // read and delete
                        expect($tr.attr('data-mime')).toEqual('httpd/unix-directory');
                        expect($tr.attr('data-mtime')).toEqual('11111000');
+                       expect($tr.attr('data-share-owner')).not.toBeDefined();
                        expect($tr.attr('data-share-id')).toEqual('7');
                        expect($tr.find('a.name').attr('href')).toEqual(
                                OC.webroot +
@@ -334,6 +338,7 @@ describe('OCA.Sharing.FileList tests', function() {
                        expect($tr.attr('data-permissions')).toEqual('31'); // read and delete
                        expect($tr.attr('data-mime')).toEqual('text/plain');
                        expect($tr.attr('data-mtime')).toEqual('11111000');
+                       expect($tr.attr('data-share-owner')).not.toBeDefined();
                        expect($tr.attr('data-share-id')).toEqual('7');
                        expect($tr.find('a.name').attr('href')).toEqual(
                                        OC.webroot +
@@ -403,6 +408,7 @@ describe('OCA.Sharing.FileList tests', function() {
                        expect($tr.attr('data-mime')).toEqual('text/plain');
                        // always use the most recent stime
                        expect($tr.attr('data-mtime')).toEqual('22222000');
+                       expect($tr.attr('data-share-owner')).not.toBeDefined();
                        expect($tr.attr('data-share-id')).toEqual('7,8,9');
                        expect($tr.find('a.name').attr('href')).toEqual(
                                OC.webroot +