From 829d4241682587f047341232b60b23e9c60f8ba4 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 23 Nov 2010 13:53:55 +0000
Subject: [PATCH] LMS-1888 Check data sets access rights for a set instead for
a list of data set codes. Check instance admin rights for saving image
transformer factory.
SVN: 18883
---
.../dss/screening/server/DssServiceRpcScreening.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreening.java b/screening/source/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreening.java
index b2f6dc823d4..dba71bab6dc 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreening.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/dss/screening/server/DssServiceRpcScreening.java
@@ -176,7 +176,7 @@ public class DssServiceRpcScreening extends AbstractDssServiceRpc<IDssServiceRpc
List<? extends IImageDatasetIdentifier> imageDatasets)
{
checkDatasetsAuthorizationForIDatasetIdentifier(sessionToken, imageDatasets);
- ArrayList<String> datasetCodes = new ArrayList<String>();
+ Set<String> datasetCodes = new HashSet<String>();
for (IImageDatasetIdentifier dataset : imageDatasets)
{
datasetCodes.add(dataset.getDatasetCode());
@@ -341,8 +341,7 @@ public class DssServiceRpcScreening extends AbstractDssServiceRpc<IDssServiceRpc
public InputStream loadImages(String sessionToken, List<PlateImageReference> imageReferences,
boolean convertToPng)
{
- Size thumbnailSizeOrNull = null;
- return loadImages(sessionToken, imageReferences, thumbnailSizeOrNull, convertToPng);
+ return loadImages(sessionToken, imageReferences, null, convertToPng);
}
public InputStream loadImages(String sessionToken, List<PlateImageReference> imageReferences,
@@ -407,6 +406,7 @@ public class DssServiceRpcScreening extends AbstractDssServiceRpc<IDssServiceRpc
List<IDatasetIdentifier> dataSetIdentifiers, String channel,
IImageTransformerFactory transformerFactory)
{
+ getOpenBISService().checkInstanceAdminAuthorization(sessionToken);
Set<String> experimentPermIDs = getExperimentPermIDs(sessionToken, dataSetIdentifiers);
for (String experimentPermID : experimentPermIDs)
{
@@ -647,7 +647,7 @@ public class DssServiceRpcScreening extends AbstractDssServiceRpc<IDssServiceRpc
public void checkDatasetsAuthorizationForIDatasetIdentifier(String sessionToken,
List<? extends IDatasetIdentifier> identifiers)
{
- List<String> dataSetCodes = new ArrayList<String>();
+ Set<String> dataSetCodes = new HashSet<String>();
for (IDatasetIdentifier identifier : identifiers)
{
dataSetCodes.add(identifier.getDatasetCode());
--
GitLab