From d857680d47dfbf1963e0e2c85596525c86b7ca39 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Wed, 20 Apr 2016 12:38:42 +0000
Subject: [PATCH] SSDM-3390 : SFTP/FTPS enabled by default on the ELN, FTP no
longer available.
SVN: 36240
---
.../eln-lims/1/as/webapps/eln-lims/html/js/config/Profile.js | 2 +-
.../eln-lims/1/dss/reporting-plugins/newbrowserapi/script.py | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/Profile.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/Profile.js
index bfda1457e7d..fdb8e1443d9 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/Profile.js
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/config/Profile.js
@@ -57,7 +57,7 @@ $.extend(DefaultProfile.prototype, {
return ($.inArray(spaceCode, this.inventorySpaces) !== -1);
}
- this.directLinkEnabled = false;
+ this.directLinkEnabled = true;
this.directLinkURL = null; //To be set during initialization using info retrieved from the DSS configuration by the reporting plugin
this.hideCodes = true;
diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/newbrowserapi/script.py b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/newbrowserapi/script.py
index 9450a286618..dcfe12b2910 100644
--- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/newbrowserapi/script.py
+++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/dss/reporting-plugins/newbrowserapi/script.py
@@ -93,8 +93,6 @@ def getDirectLinkURL():
protocol = "sftp";
elif (ftpServerEnable == "true") and ((ftpPort is not None) or (ftpPortLegacy is not None)) and (ftpServerUseSsl == "true" or useSsl == "true"):
protocol = "ftps";
- elif (ftpServerEnable == "true") and ((ftpPort is not None) or (ftpPortLegacy is not None)):
- protocol = "ftp";
if protocol is not None:
if sftpPort is not None:
--
GitLab