From 863a324e7fd0ffd495eb86b6ec5b66e0f4819a0f Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Tue, 9 Feb 2016 14:20:06 +0000
Subject: [PATCH] fix a bug when user can't use upload app, becuase his name
contains a dash character
SVN: 35652
---
.../1/dss/reporting-plugins/newbrowserapi/script.py | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/plasmid/source/core-plugins/eln-lims/1/dss/reporting-plugins/newbrowserapi/script.py b/plasmid/source/core-plugins/eln-lims/1/dss/reporting-plugins/newbrowserapi/script.py
index 49ead648388..d0296e09b88 100644
--- a/plasmid/source/core-plugins/eln-lims/1/dss/reporting-plugins/newbrowserapi/script.py
+++ b/plasmid/source/core-plugins/eln-lims/1/dss/reporting-plugins/newbrowserapi/script.py
@@ -37,6 +37,7 @@ from ch.ethz.ssdm.eln import PlasmapperConnector
import time
import subprocess
import os.path
+import re
from java.io import StringWriter
from org.htmlcleaner import HtmlCleaner
@@ -96,6 +97,11 @@ def getSampleByIdentifierForUpdate(tr, identifier):
else:
raise UserFailureException(identifier + " Not found by search service.");
+def username(sessiontoken):
+ m = re.compile('(.*)-[^-]*').match(sessiontoken)
+ if m:
+ return m.group(1)
+
def process(tr, parameters, tableBuilder):
method = parameters.get("method");
@@ -103,7 +109,7 @@ def process(tr, parameters, tableBuilder):
result = None;
# Obtain the user using the dropbox
sessionToken = parameters.get("sessionToken"); #String
- sessionId = sessionToken.split("-")[0]; #String
+ sessionId = username(sessionToken); #String
if sessionId == userId:
tr.setUserId(userId);
else:
--
GitLab