Removed "Share with" column

diff --git a/apps/files_sharing/js/sharedfilelist.js b/apps/files_sharing/js/sharedfilelist.js
index cf5e65528e2803d8e606022defa9bc5ac24238a5..ef1034ecfdc874b97a0334a07d351f337bb6df8b 100644 (file)
--- a/apps/files_sharing/js/sharedfilelist.js
+++ b/apps/files_sharing/js/sharedfilelist.js
@@ -42,9 +42,7 @@
                        // TODO: hook earlier and render the whole row here
                        var $tr = OCA.Files.FileList.prototype._createRow.apply(this, arguments);
                        $tr.find('.filesize').remove();
-                       var $sharedWith = $('<td class="sharedWith"></td>')
-                               .text(fileData.counterParts.join(', '));
-                       $tr.find('td.date').before($sharedWith);
+                       $tr.find('td.date').before($tr.children('td:first'));
                        $tr.find('td.filename input:checkbox').remove();
                        $tr.attr('data-share-id', _.pluck(fileData.shares, 'id').join(','));
                        if (this._sharedWithUser) {

diff --git a/apps/files_sharing/templates/list.php b/apps/files_sharing/templates/list.php
index b07222cfe287798a9c327334027d09aab79ce433..a1d95ebc1f115d01efa9ae8820c3794afcb01ce9 100644 (file)
--- a/apps/files_sharing/templates/list.php
+++ b/apps/files_sharing/templates/list.php
@@ -16,9 +16,6 @@
                                        <a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
                                </div>
                        </th>
-                       <th id="headerSharedWith" class="hidden column-counterpart">
-                               <a id="sharedwith" class="columntitle" data-sort="shareWith"><span><?php p($l->t( 'Shared with' )); ?></span><span class="sort-indicator"></span></a>
-                       </th>
                        <th id="headerDate" class="hidden column-mtime">
                                <a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Share time' )); ?></span><span class="sort-indicator"></span></a>
                        </th>

diff --git a/apps/files_sharing/tests/js/sharedfilelistSpec.js b/apps/files_sharing/tests/js/sharedfilelistSpec.js
index 5cfcec95d0c1d4dc3e79a5777d75d42ffae05901..7aec8322a4467a4b3ec25880a5155a0e6ce61220 100644 (file)
--- a/apps/files_sharing/tests/js/sharedfilelistSpec.js
+++ b/apps/files_sharing/tests/js/sharedfilelistSpec.js
@@ -128,8 +128,6 @@ describe('OCA.Sharing.FileList tests', function() {
                                '/index.php/apps/files/ajax/download.php' +
                                '?dir=%2Flocal%20path&files=local%20name.txt'
                        );
-                       expect($tr.find('td.sharedWith').text()).toEqual('User Two');
-
                        expect($tr.find('.nametext').text().trim()).toEqual('local name.txt');
                });
                it('render folder shares', function() {
@@ -172,8 +170,6 @@ describe('OCA.Sharing.FileList tests', function() {
                                '/index.php/apps/files' +
                                '?dir=/local%20path/local%20name'
                        );
-                       expect($tr.find('td.sharedWith').text()).toEqual('User Two');
-
                        expect($tr.find('.nametext').text().trim()).toEqual('local name');
                });
        });
@@ -249,8 +245,6 @@ describe('OCA.Sharing.FileList tests', function() {
                                '/index.php/apps/files/ajax/download.php' +
                                '?dir=%2Flocal%20path&files=local%20name.txt'
                        );
-                       expect($tr.find('td.sharedWith').text()).toEqual('User Two');
-
                        expect($tr.find('.nametext').text().trim()).toEqual('local name.txt');
                });
                it('render folder shares', function() {
@@ -292,8 +286,6 @@ describe('OCA.Sharing.FileList tests', function() {
                                '/index.php/apps/files' +
                                '?dir=/local%20path/local%20name'
                        );
-                       expect($tr.find('td.sharedWith').text()).toEqual('User Two');
-
                        expect($tr.find('.nametext').text().trim()).toEqual('local name');
                });
                it('render link shares', function() {
@@ -344,7 +336,6 @@ describe('OCA.Sharing.FileList tests', function() {
                                        OC.webroot +
                                        '/index.php/apps/files/ajax/download.php' +
                                        '?dir=%2Flocal%20path&files=local%20name.txt');
-                       expect($tr.find('td.sharedWith').text()).toEqual('link');
 
                        expect($tr.find('.nametext').text().trim()).toEqual('local name.txt');
                });
@@ -415,8 +406,6 @@ describe('OCA.Sharing.FileList tests', function() {
                                '/index.php/apps/files/ajax/download.php' +
                                '?dir=%2Flocal%20path&files=local%20name.txt'
                        );
-                       expect($tr.find('td.sharedWith').text()).toEqual('link, User Three, User Two');
-
                        expect($tr.find('.nametext').text().trim()).toEqual('local name.txt');
                });
        });