diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index c823e89c3acf..b3c95a2ef1dc 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -790,7 +790,8 @@ size: parseInt($el.attr('data-size'), 10), etag: $el.attr('data-etag'), permissions: parseInt($el.attr('data-permissions'), 10), - eospath: $el.attr('data-eospath') + eospath: $el.attr('data-eospath'), + eosmgmurl: $el.attr('data-eosmgmurl') }; var icon = $el.attr('data-icon'); if (icon) { @@ -925,6 +926,7 @@ path = fileData.path, dataIcon = null, eospath = fileData.eospath, + eosmgmurl = fileData.eosmgmurl, linkUrl; options = options || {}; @@ -951,7 +953,8 @@ "data-mtime": mtime, "data-etag": fileData.etag, "data-permissions": fileData.permissions || this.getDirectoryPermissions(), - "data-eospath": eospath + "data-eospath": eospath, + "data-eosmgmurl":eosmgmurl }); if (dataIcon) { diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php index 80e6fc48fa4a..e54033f854ce 100644 --- a/apps/files/lib/helper.php +++ b/apps/files/lib/helper.php @@ -187,6 +187,7 @@ public static function formatFileInfo(FileInfo $i) { } $entry['eospath'] = $i['eospath']; + $entry['eosmgmurl'] = $i['eosmgmurl']; return $entry; } diff --git a/core/js/ShareDialogEospath.js b/core/js/ShareDialogEospath.js index fd3b1dd5420f..50f263d09bbe 100644 --- a/core/js/ShareDialogEospath.js +++ b/core/js/ShareDialogEospath.js @@ -8,7 +8,8 @@ } var TEMPLATE = - '

EOS Path:

'; + '

EOS Path:

' + + '

XROOTD Path:

'; var ShareDialogEospath = OC.Backbone.View.extend({ /** @type {string} **/ @@ -48,6 +49,7 @@ } var eospathT = this.model.get('eospath'); + var xrootdPath = this.model.get('eosmgmurl') + ":/" + this.model.get('eospath'); if(typeof eospathT == 'undefined') { @@ -68,7 +70,8 @@ var reshareTemplate = this.template(); this.$el.html(reshareTemplate({ - eospathText: eospathT + eospathText: eospathT, + xrootdpathText: xrootdPath })); //this.$el.find('textarea').select(); diff --git a/lib/private/files/objectstore/eosparser.php b/lib/private/files/objectstore/eosparser.php index 48939c8f017f..02458d508887 100644 --- a/lib/private/files/objectstore/eosparser.php +++ b/lib/private/files/objectstore/eosparser.php @@ -75,6 +75,7 @@ public static function parseFileInfoMonitorMode($line_to_parse) { $data["eosuid"] = $info["uid"]; $data["eosmode"] = $info["mode"]; $data["eostype"] = isset($info["container"]) ? 'folder' : 'file'; + $data["eosmgmurl"] = EosUtil::getEosMgmUrl(); /* if(isset($info['xattrn']) && isset($info['xattrv']) && $info['xattrn'] === 'user.acl'){ $data["eosacl"] = $info['xattrv'];