diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingService.java index 40a5cabdcc31556ab6d40660bdd2a7731143c99a..7a989296f44c48c7879b54ab01e8f83dfd979f27 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingService.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingService.java @@ -35,6 +35,7 @@ import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.NewVocabularyTerm; import ch.systemsx.cisd.openbis.generic.shared.authorization.annotation.RolesAllowed; import ch.systemsx.cisd.openbis.generic.shared.basic.TechId; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseModificationKind.ObjectKind; +import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DisplaySettings; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.RoleWithHierarchy; import ch.systemsx.cisd.openbis.generic.shared.dto.Session; import ch.systemsx.cisd.openbis.generic.shared.util.EntityHelper; @@ -103,6 +104,29 @@ public class GeneralInformationChangingService extends term.getLabel(), term.getDescription(), term.getPreviousTermOrdinal()); } + @Override + @Transactional(readOnly = true) + @RolesAllowed(RoleWithHierarchy.SPACE_OBSERVER) + @SuppressWarnings("deprecation") + public Map<String, String> getCustomDisplaySettings(String sessionToken, String webAppId) + { + final Session session = getSession(sessionToken); + return session.getPerson().getDisplaySettings().getCustomWebAppSettings(webAppId); + } + + @Override + @Transactional(readOnly = false) + @RolesAllowed(RoleWithHierarchy.SPACE_OBSERVER) + @SuppressWarnings("deprecation") + public void setCustomDisplaySettings(String sessionToken, String webAppId, + Map<String, String> customDisplaySettings) + { + final Session session = getSession(sessionToken); + final DisplaySettings displaySettings = session.getPerson().getDisplaySettings(); + displaySettings.setCustomWebAppSettings(webAppId, customDisplaySettings); + saveDisplaySettings(session.getSessionToken(), null, -1); + } + @Override public int getMajorVersion() { @@ -112,7 +136,7 @@ public class GeneralInformationChangingService extends @Override public int getMinorVersion() { - return 1; + return 2; } } diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceLogger.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceLogger.java index 946c53ac23452e5749eb39a842cf120546839c70..4d88002ad194824ad5e488fe887711ff8f1dcc43 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceLogger.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationChangingServiceLogger.java @@ -64,6 +64,20 @@ class GeneralInformationChangingServiceLogger extends AbstractServerLogger imple } + @Override + public Map<String, String> getCustomDisplaySettings(String sessionToken, String webAppId) + { + logAccess(sessionToken, "get-custom-display-settings", "WEB_APP_ID(%s)", webAppId); + return null; + } + + @Override + public void setCustomDisplaySettings(String sessionToken, String webAppId, + Map<String, String> customDisplaySettings) + { + logAccess(sessionToken, "set-custom-display-settings", "WEB_APP_ID(%s)", webAppId); + } + @Override public int getMajorVersion() { 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 20006e695088d2a937dd0df4076b4e7963a21597..c9851c8c751de142f11e8bf80900300f8f92d1d3 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 @@ -86,7 +86,6 @@ import ch.systemsx.cisd.openbis.generic.shared.authorization.validator.SimpleSpa import ch.systemsx.cisd.openbis.generic.shared.basic.TechId; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetRelatedEntities; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DetailedSearchCriteria; -import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DisplaySettings; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityType; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExperimentType; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData; @@ -218,7 +217,7 @@ public class GeneralInformationService extends AbstractServer<IGeneralInformatio @Override public int getMinorVersion() { - return 19; + return 18; } private Map<String, List<RoleAssignmentPE>> getRoleAssignmentsPerSpace() @@ -974,27 +973,4 @@ public class GeneralInformationService extends AbstractServer<IGeneralInformatio return Translator.translateMaterials(materials); } - @Override - @Transactional(readOnly = true) - @RolesAllowed(RoleWithHierarchy.SPACE_OBSERVER) - @SuppressWarnings("deprecation") - public Map<String, String> getCustomDisplaySettings(String sessionToken, String webAppId) - { - final Session session = getSession(sessionToken); - return session.getPerson().getDisplaySettings().getCustomWebAppSettings(webAppId); - } - - @Override - @Transactional(readOnly = false) - @RolesAllowed(RoleWithHierarchy.SPACE_OBSERVER) - @SuppressWarnings("deprecation") - public void setCustomDisplaySettings(String sessionToken, String webAppId, - Map<String, String> customDisplaySettings) - { - final Session session = getSession(sessionToken); - final DisplaySettings displaySettings = session.getPerson().getDisplaySettings(); - displaySettings.setCustomWebAppSettings(webAppId, customDisplaySettings); - saveDisplaySettings(session.getSessionToken(), null, -1); - } - } diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceLogger.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceLogger.java index bd65f943caf102dcfeb073717229f65a72a2629f..0752cad68e930ce101d55858bfb868248c80662e 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceLogger.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/api/v1/GeneralInformationServiceLogger.java @@ -353,18 +353,4 @@ class GeneralInformationServiceLogger extends AbstractServerLogger implements return null; } - @Override - public Map<String, String> getCustomDisplaySettings(String sessionToken, String webAppId) - { - logAccess(sessionToken, "get-custom-display-settings", "WEB_APP_ID(%s)", webAppId); - return null; - } - - @Override - public void setCustomDisplaySettings(String sessionToken, String webAppId, - Map<String, String> customDisplaySettings) - { - logAccess(sessionToken, "set-custom-display-settings", "WEB_APP_ID(%s)", webAppId); - } - }