diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationService.java index 82390d121628741b005c7f9e9be253c5420b0006..08861cea1230c136c8c06dcf05b0bd271170137e 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationService.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationService.java @@ -136,7 +136,7 @@ import ch.systemsx.cisd.openbis.generic.shared.util.HibernateUtils; public class GeneralInformationService extends AbstractServer<IGeneralInformationService> implements IGeneralInformationService { - public static final int MINOR_VERSION = 22; + public static final int MINOR_VERSION = 23; @Resource(name = ch.systemsx.cisd.openbis.generic.shared.ResourceNames.COMMON_SERVER) private ICommonServer commonServer; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentPermIdPredicate.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentPermIdPredicate.java index 9fe72115949a3cc365cc93f65a3819312ce31d1c..a384ef9d4cecb1518fc97ad6aa4c7c5acb6659d6 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentPermIdPredicate.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ExperimentPermIdPredicate.java @@ -69,8 +69,8 @@ public class ExperimentPermIdPredicate extends AbstractDatabaseInstancePredicate ExperimentPE experiment = authorizationDataProvider.tryGetExperimentByPermId(id.getId()); if (experiment == null) { - return Status.createError(String.format("User '%s' does not have enough privileges.", - person.getUserId())); + return Status.createError(String.format("There is no experiment with perm id '%s'.", + id.getId())); } return experimentPEPredicate.evaluate(person, allowedRoles, experiment); } diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectPermIdPredicate.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectPermIdPredicate.java index d3b7fafd9f6c89f448774afc973604c09359022d..7ac98b5b63c8d1ab1e27469a3db2f60cfaecd554 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectPermIdPredicate.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/ProjectPermIdPredicate.java @@ -46,8 +46,8 @@ public class ProjectPermIdPredicate extends AbstractSpacePredicate<String> authorizationDataProvider.tryGetProjectByPermId(new PermId(permId)); if (project == null) { - return Status.createError(String.format("User '%s' does not have enough privileges.", - person.getUserId())); + return Status.createError(String.format("There is no project with perm id '%s'." + + permId)); } return evaluateSpace(person, allowedRoles, project.getSpace()); } diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SamplePermIdPredicate.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SamplePermIdPredicate.java index 0f6934f4175b66e59707548544ea3c69fadec630..e126c5ee206b7a34bf7daf9a30abcb972e7308da 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SamplePermIdPredicate.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/predicate/SamplePermIdPredicate.java @@ -69,8 +69,8 @@ public class SamplePermIdPredicate extends AbstractDatabaseInstancePredicate<Per SamplePE sample = authorizationDataProvider.tryGetSampleByPermId(id.getId()); if (sample == null) { - return Status.createError(String.format("User '%s' does not have enough privileges.", - person.getUserId())); + return Status.createError(String.format("There is no sample with perm id '%s'.", + id.getId())); } return samplePEPredicate.evaluate(person, allowedRoles, sample); } diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/IGeneralInformationService.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/IGeneralInformationService.java index 67c06293cf63d54e8313b91c1ec844170bfc8fba..cb80fa2589c55b6381cdc992b3d6d67297a4b3e0 100644 --- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/IGeneralInformationService.java +++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/IGeneralInformationService.java @@ -495,7 +495,7 @@ public interface IGeneralInformationService extends IRpcService * * @param allVersions If <code>true</code>, return all versions of the attachments, otherwise * return only the latest version. - * @since 1.22 + * @since 1.23 */ public List<Attachment> listAttachmentsForProject(String sessionToken, IProjectId projectId, boolean allVersions); @@ -505,7 +505,7 @@ public interface IGeneralInformationService extends IRpcService * * @param allVersions If <code>true</code>, return all versions of the attachments, otherwise * return only the latest version. - * @since 1.22 + * @since 1.23 */ public List<Attachment> listAttachmentsForExperiment(String sessionToken, IExperimentId experimentId, boolean allVersions); @@ -515,7 +515,7 @@ public interface IGeneralInformationService extends IRpcService * * @param allVersions If <code>true</code>, return all versions of the attachments, otherwise * return only the latest version. - * @since 1.22 + * @since 1.23 */ public List<Attachment> listAttachmentsForSample(String sessionToken, ISampleId sampleId, boolean allVersions); diff --git a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/project/ProjectIdentifierId.java b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/project/ProjectIdentifierId.java index 40d26b030155e2eadc3fce62b37eff0a8c5c6d0d..5822c81561e06f938505e1b681a5e7aed1eef245 100644 --- a/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/project/ProjectIdentifierId.java +++ b/openbis_api/source/java/ch/systemsx/cisd/openbis/generic/shared/api/v1/dto/id/project/ProjectIdentifierId.java @@ -21,7 +21,7 @@ import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.id.ObjectIdentifierId; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ServiceVersionHolder; /** - * Identifies a projec by identifier. + * Identifies a project by identifier. * * @author Franz-Josef Elmer */