From a4049bbf31d5f7349ae67a39ae571fdf95c5ccdb Mon Sep 17 00:00:00 2001 From: Ainur <59531286+yagudin10@users.noreply.github.com> Date: Thu, 26 May 2022 11:04:04 +0300 Subject: [PATCH] CB-2049 remove editor name for local session handler (#854) --- .../src/io/cloudbeaver/WebServiceUtils.java | 6 ++++-- .../cloudbeaver/service/auth/local/LocalSessionHandler.java | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/WebServiceUtils.java b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/WebServiceUtils.java index 54e4a542e8..821146bfe3 100644 --- a/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/WebServiceUtils.java +++ b/server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/WebServiceUtils.java @@ -351,11 +351,13 @@ public class WebServiceUtils extends WebCommonUtils { return apiPrefix; } - public static void fireActionParametersOpenEditor(WebSession webSession, DBPDataSourceContainer dataSource) { + public static void fireActionParametersOpenEditor(WebSession webSession, DBPDataSourceContainer dataSource, boolean addEditorName) { Map actionParameters = new HashMap<>(); actionParameters.put("action", "open-sql-editor"); actionParameters.put("connection-id", dataSource.getId()); - actionParameters.put("editor-name", dataSource.getName() + "-sql"); + if (addEditorName) { + actionParameters.put("editor-name", dataSource.getName() + "-sql"); + } WebActionParameters.saveToSession(webSession, actionParameters); } diff --git a/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/local/LocalSessionHandler.java b/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/local/LocalSessionHandler.java index 09d674fd30..bcfc001e5c 100644 --- a/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/local/LocalSessionHandler.java +++ b/server/bundles/io.cloudbeaver.service.auth/src/io/cloudbeaver/service/auth/local/LocalSessionHandler.java @@ -72,6 +72,6 @@ public class LocalSessionHandler extends AbstractActionSessionHandler { if (connectionInfo == null) { throw new DBException("Connection info is null"); } - WebServiceUtils.fireActionParametersOpenEditor(webSession, connectionInfo.getDataSourceContainer()); + WebServiceUtils.fireActionParametersOpenEditor(webSession, connectionInfo.getDataSourceContainer(), false); } }