[Pkg-owncloud-commits] [owncloud] 166/199: Removed "Share with" column

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 5e4e7734467a00bd40e3a04d72a5f49f012ced40
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Wed May 28 16:53:42 2014 +0200

    Removed "Share with" column
---
 apps/files_sharing/js/sharedfilelist.js           |  4 +---
 apps/files_sharing/templates/list.php             |  3 ---
 apps/files_sharing/tests/js/sharedfilelistSpec.js | 11 -----------
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/apps/files_sharing/js/sharedfilelist.js b/apps/files_sharing/js/sharedfilelist.js
index cf5e655..ef1034e 100644
--- 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 b07222c..a1d95eb 100644
--- 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 5cfcec9..7aec832 100644
--- 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');
 		});
 	});

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git