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

Removed "Share with" column

This commit is contained in:
Vincent Petry 2014-05-28 16:53:42 +02:00
parent 66afd1aa39
commit 5e4e773446
3 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

3
apps/files_sharing/templates/list.php
View File

@ -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> <a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a>
</div> </div>
</th> </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"> <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> <a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t( 'Share time' )); ?></span><span class="sort-indicator"></span></a>
</th> </th>

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

@ -128,8 +128,6 @@ describe('OCA.Sharing.FileList tests', function() {
'/index.php/apps/files/ajax/download.php' + '/index.php/apps/files/ajax/download.php' +
'?dir=%2Flocal%20path&files=local%20name.txt' '?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'); expect($tr.find('.nametext').text().trim()).toEqual('local name.txt');
}); });
it('render folder shares', function() { it('render folder shares', function() {
@ -172,8 +170,6 @@ describe('OCA.Sharing.FileList tests', function() {
'/index.php/apps/files' + '/index.php/apps/files' +
'?dir=/local%20path/local%20name' '?dir=/local%20path/local%20name'
); );
expect($tr.find('td.sharedWith').text()).toEqual('User Two');
expect($tr.find('.nametext').text().trim()).toEqual('local name'); 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' + '/index.php/apps/files/ajax/download.php' +
'?dir=%2Flocal%20path&files=local%20name.txt' '?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'); expect($tr.find('.nametext').text().trim()).toEqual('local name.txt');
}); });
it('render folder shares', function() { it('render folder shares', function() {
@ -292,8 +286,6 @@ describe('OCA.Sharing.FileList tests', function() {
'/index.php/apps/files' + '/index.php/apps/files' +
'?dir=/local%20path/local%20name' '?dir=/local%20path/local%20name'
); );
expect($tr.find('td.sharedWith').text()).toEqual('User Two');
expect($tr.find('.nametext').text().trim()).toEqual('local name'); expect($tr.find('.nametext').text().trim()).toEqual('local name');
}); });
it('render link shares', function() { it('render link shares', function() {
@ -344,7 +336,6 @@ describe('OCA.Sharing.FileList tests', function() {
OC.webroot + OC.webroot +
'/index.php/apps/files/ajax/download.php' + '/index.php/apps/files/ajax/download.php' +
'?dir=%2Flocal%20path&files=local%20name.txt'); '?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'); 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' + '/index.php/apps/files/ajax/download.php' +
'?dir=%2Flocal%20path&files=local%20name.txt' '?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'); expect($tr.find('.nametext').text().trim()).toEqual('local name.txt');
}); });
}); });