Cernbox prod 8.2.2 expose xrootd path in ui (#113)

* Expose the XROOTD path in the UI * Fix mistake
cernbox · Apr 10, 2017 · ca43451 · ca43451
1 parent 6817754
commit ca43451
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git 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
@@ -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
@@ -8,7 +8,8 @@
 	}
 
 	var TEMPLATE =
-		 '<p><b>EOS Path</b>:</p><textarea onclick="this.focus();this.select()">{{eospathText}}</textarea>';
+		 '<p><b>EOS Path</b>:</p><textarea onclick="this.focus();this.select()">{{eospathText}}</textarea>' +
+		 '<p><b>XROOTD Path</b>:</p><textarea onclick="this.focus();this.select()">{{xrootdpathText}}</textarea>';
 
 	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
@@ -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'];
-Original file line number
+Diff line change
@@ Expand Up / @@ -187,6 +187,7 @@ public static function formatFileInfo(FileInfo $i) { @@
     		}
     		$entry['eospath'] = $i['eospath'];
+    		$entry['eosmgmurl'] = $i['eosmgmurl'];
     		return $entry;
     	}
@@ Expand Down @@