Merge pull request #2850 from nextcloud/downstream-26603

Fixed size issues on main detail view and disappearing of share recipients (#26603)

1 files changed, 20 insertions, 8 deletions

diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 01c2ccfb863..fcae7bc9a58 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -9,6 +9,12 @@
  */
 
 (function() {
+
+	_.extend(OC.Files.Client, {
+		PROPERTY_SHARE_TYPES:	'{' + OC.Files.Client.NS_OWNCLOUD + '}share-types',
+		PROPERTY_OWNER_DISPLAY_NAME:	'{' + OC.Files.Client.NS_OWNCLOUD + '}owner-display-name'
+	});
+
 	if (!OCA.Sharing) {
 		OCA.Sharing = {};
 	}
@@ -65,32 +71,38 @@
 					fileInfo.shareTypes = shareTypes;
 				}
 
+				if( $el.attr('data-expiration')){
+					var expirationTimestamp = parseInt($el.attr('data-expiration'));
+					fileInfo.shares = [];
+					fileInfo.shares.push({expiration: expirationTimestamp});
+				}
+
+				fileInfo.recipientsDisplayName = $el.attr('data-share-recipients') || undefined;
+
 				return fileInfo;
 			};
 
-			var NS_OC = 'http://owncloud.org/ns';
-
 			var oldGetWebdavProperties = fileList._getWebdavProperties;
 			fileList._getWebdavProperties = function() {
 				var props = oldGetWebdavProperties.apply(this, arguments);
-				props.push('{' + NS_OC + '}owner-display-name');
-				props.push('{' + NS_OC + '}share-types');
+				props.push(OC.Files.Client.PROPERTY_OWNER_DISPLAY_NAME);
+				props.push(OC.Files.Client.PROPERTY_SHARE_TYPES);
 				return props;
 			};
 
 			fileList.filesClient.addFileInfoParser(function(response) {
 				var data = {};
 				var props = response.propStat[0].properties;
-				var permissionsProp = props['{' + NS_OC + '}permissions'];
+				var permissionsProp = props[OC.Files.Client.PROPERTY_PERMISSIONS];
 
 				if (permissionsProp && permissionsProp.indexOf('S') >= 0) {
-					data.shareOwner = props['{' + NS_OC + '}owner-display-name'];
+					data.shareOwner = props[OC.Files.Client.PROPERTY_OWNER_DISPLAY_NAME];
 				}
 
-				var shareTypesProp = props['{' + NS_OC + '}share-types'];
+				var shareTypesProp = props[OC.Files.Client.PROPERTY_SHARE_TYPES];
 				if (shareTypesProp) {
 					data.shareTypes = _.chain(shareTypesProp).filter(function(xmlvalue) {
-						return (xmlvalue.namespaceURI === NS_OC && xmlvalue.nodeName.split(':')[1] === 'share-type');
+						return (xmlvalue.namespaceURI === OC.Files.Client.NS_OWNCLOUD && xmlvalue.nodeName.split(':')[1] === 'share-type');
 					}).map(function(xmlvalue) {
 						return parseInt(xmlvalue.textContent || xmlvalue.text, 10);
 					}).value();