Add a section for groups in share overview

apps/files/css/files.scss

@@ -102,6 +102,7 @@
 }
 .nav-icon-sharingin,
 .nav-icon-sharingout,
+.nav-icon-sharinggroups,
 .nav-icon-shareoverview {
 	@include icon-color('share', 'files', $color-black);
 }
@@ -251,6 +252,7 @@ table th#headerName {
 table th#headerSize, table td.filesize {
 	text-align: right;
 }
+table th#headerGroup,
 table th#headerDate, table td.date,
 table th.column-last, table td.column-last {
 	-moz-box-sizing: border-box;
@@ -941,8 +943,9 @@ table.dragshadow td.size {
 				}
 			}
 
-			/* No space for filesize and date in grid view */
+			/* No space for filesize ,groups and date in grid view */
 			&.filesize,
+			&.groups,
 			&.date {
 				display: none;
 			}

apps/files_sharing/appinfo/app.php

@@ -73,6 +73,15 @@ function() {
 		'name' => $l->t('Shared with you'),
 	]);
 
+	array_push($sharingSublistArray, [
+                'id' => 'sharinggroups',
+                'appname' => 'files_sharing',
+                'script' => 'list.php',
+                'order' => 20,
+                'name' => $l->t('Shared with groups'),
+        ]);
+
+
 	if (\OCP\Util::isSharingDisabledForUser() === false) {
 		// Check if sharing by link is enabled
 		if ($config->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes') {

apps/files_sharing/js/app.js

@@ -22,6 +22,7 @@ OCA.Sharing.App = {
 	_inFileList: null,
 	_outFileList: null,
 	_overviewFileList: null,
+	_groupsFileList: null,
 
 	initSharingIn: function($el) {
 		if (this._inFileList) {
@@ -76,6 +77,43 @@ OCA.Sharing.App = {
 		return this._outFileList;
 	},
 
+	initSharingGroups: function($el) {
+		if (this._groupsFileList) {
+			return this._groupsFileList;
+		}
+		this._groupsFileList = new OCA.Sharing.FileList(
+			$el,
+			{
+				id: 'shares.groups',
+				sharedWithUser: true,
+				sharedWithGroups: true,
+				fileActions: this._createFileActions(),
+				config: OCA.Files.App.getFilesConfig(),
+				// The file list is created when a "show" event is handled, so
+				// it should be marked as "shown" like it would have been done
+				// if handling the event with the file list already created.
+				shown: true
+			}
+		);
+
+		this._extendFileList(this._groupsFileList);
+		this._groupsFileList.appName = t('files_sharing', 'Shared with groups');
+		this._groupsFileList.$el.find('#emptycontent').html('<div class="icon-shared"></div>' +
+			'<h2>' + t('files_sharing', 'Nothing shared with your groups yet') + '</h2>' +
+			'<p>' + t('files_sharing', 'Files and folders others share with your groups will show up here') + '</p>');
+
+		//add col for group name
+		this._groupsFileList.$table.find("thead tr").append('<th id=headerGroup class="column-groups">' +
+								    '<a class="columntitle" data-sort="groups">'+
+								    '<span>' + t('files_sharing','Group') + '</span>' +
+								    '<span class="sort-indicator icon-triangle-s"></span>'+
+								    '</a>' +	
+								    '</td>') ;  ;
+
+		return this._groupsFileList;
+	},
+
+
 	initSharingLinks: function($el) {
 		if (this._linkFileList) {
 			return this._linkFileList;
@@ -184,6 +222,12 @@ OCA.Sharing.App = {
 		}
 	},
 
+	removeSharingGroups: function() {
+		if (this._groupsFileList) {
+			this._groupsFileList.$fileList.empty();
+		}
+	},
+
 	/**
 	 * Destroy the app
 	 */
@@ -303,4 +347,10 @@ $(document).ready(function() {
 	$('#app-content-shareoverview').on('hide', function() {
 		OCA.Sharing.App.removeSharingOverview();
 	});
+	$('#app-content-sharinggroups').on('show', function(e) {
+		OCA.Sharing.App.initSharingGroups($(e.target));
+	});
+	$('#app-content-sharinggroups').on('hide', function() {
+		OCA.Sharing.App.removeSharingGroups();
+	});
 });

apps/files_sharing/js/sharedfilelist.js

@@ -41,6 +41,7 @@
 		_clientSideSort: true,
 		_allowSelection: false,
 		_isOverview: false,
+		_sharedWithGroups: false,
 
 		/**
 		 * @private
@@ -64,6 +65,9 @@
 			if (options && options.isOverview) {
 				this._isOverview = true;
 			}
+			if (options && options.sharedWithGroups) {
+				this._sharedWithGroups = true;
+			}
 		},
 
 		_renderRow: function() {
@@ -86,11 +90,25 @@
 				var permission = parseInt($tr.attr('data-permissions')) | OC.PERMISSION_DELETE;
 				$tr.attr('data-permissions', permission);
 			}
+
 			if (this._showDeleted) {
 				var permission = fileData.permissions;
 				$tr.attr('data-share-permissions', permission);
 			}
+			if (this._sharedWithGroups) {
+				var group = fileData.group ;
+				$tr.attr('data-share-groups',group);
 
+				// add group name
+				td = $('<td></td>').attr({"class": "groups"});
+				td.append($('<span></span>').attr({
+						"class": "modified",
+						"title": group
+					}).text(group)
+						.tooltip({placement: 'top'})
+				);
+				$tr.append(td);
+			}
 			// add row with expiration date for link only shares - influenced by _createRow of filelist
 			if (this._linksOnly) {
 				var expirationTimestamp = 0;
@@ -326,6 +344,12 @@
 					return share.share_type === OC.Share.SHARE_TYPE_LINK;
 				});
 			}
+			if (this._sharedWithGroups) {
+				files = _.filter(data, function(share) {
+					return share.share_type === OC.Share.SHARE_TYPE_GROUP;
+				});
+			}
+
 
 			// OCS API uses non-camelcased names
 			files = _.chain(files)
@@ -361,6 +385,11 @@
 						if (file.path) {
 							file.extraData = share.file_target;
 						}
+
+						if (share.share_type == OC.Share.SHARE_TYPE_GROUP) {
+							file.group = share.share_with_displayname;
+							file.groupId = share.share_with;
+						}
 					}
 					else {
 						if (share.share_type !== OC.Share.SHARE_TYPE_LINK) {

apps/files_sharing/l10n/fr.js

@@ -4,9 +4,11 @@ OC.L10N.register(
     "Shared with others" : "Partagés avec d'autres",
     "Shared with you" : "Partagés avec vous",
     "Shared by link" : "Partagés par lien",
+    "Shared with groups" : "Partagés avec des groupes",
     "Deleted shares" : "Partages supprimés",
     "Shares" : "Partages",
     "Nothing shared with you yet" : "Aucun fichier n'est partagé avec vous pour l'instant",
+    "Nothing shared with your groups yet" : "Aucun fichier n'est partagé avec vos groupes pour l'instant",
     "Files and folders others share with you will show up here" : "Les fichiers et dossiers partagés avec vous apparaîtront ici",
     "Nothing shared yet" : "Rien n'est partagé pour l'instant",
     "Files and folders you share will show up here" : "Les fichiers et dossiers que vous partagez apparaîtront ici",

apps/files_sharing/l10n/fr.json

@@ -2,9 +2,11 @@
     "Shared with others" : "Partagés avec d'autres",
     "Shared with you" : "Partagés avec vous",
     "Shared by link" : "Partagés par lien",
+    "Shared with groups" : "Partagés avec des groupes",
     "Deleted shares" : "Partages supprimés",
     "Shares" : "Partages",
     "Nothing shared with you yet" : "Aucun fichier n'est partagé avec vous pour l'instant",
+    "Nothing shared with your groups yet" : "Aucun fichier n'est partagé avec vos groupes pour l'instant",
     "Files and folders others share with you will show up here" : "Les fichiers et dossiers partagés avec vous apparaîtront ici",
     "Nothing shared yet" : "Rien n'est partagé pour l'instant",
     "Files and folders you share will show up here" : "Les fichiers et dossiers que vous partagez apparaîtront ici",
@@ -135,4 +137,4 @@
     "The password is wrong. Try again." : "Le mot de passe est incorrect. Veuillez réessayer.",
     "Password" : "Mot de passe"
 },"pluralForm" :"nplurals=2; plural=(n > 1);"
-}
+}