opensource/cloudbeaver
3
0
Fork 0
mirror of https://github.com/dbeaver/cloudbeaver.git synced 2026-09-24 16:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

CB-5737 global project path fix (#2955)

Browse Source 
Co-authored-by: Evgenia Bezborodova <139753579+EvgeniaBzzz@users.noreply.github.com>
This commit is contained in:
Ainur
2024-10-01 16:52:43 +00:00
committed by GitHub
co-authored by Evgenia Bezborodova
parent f5ac3cfe2a
commit e1887714ab
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/WebGlobalProject.java
+5 -5
View File
@@ -34,15 +34,15 @@ public class WebGlobalProject extends BaseProjectImpl {
private static final Log log = Log.getLog(WebGlobalProject.class);
private final String projectId;
private final String projectName;
public WebGlobalProject(
@NotNull DBPWorkspace workspace,
@Nullable SMSessionContext sessionContext,
@NotNull String projectId
@NotNull String projectName
) {
super(workspace, sessionContext);
this.projectId = projectId;
this.projectName = projectName;
}
@Override
@@ -53,13 +53,13 @@ public class WebGlobalProject extends BaseProjectImpl {
@NotNull
@Override
public String getName() {
return projectId;
return projectName;
}
@NotNull
@Override
public Path getAbsolutePath() {
return getWorkspace().getAbsolutePath().resolve(projectId);
return getWorkspace().getAbsolutePath().resolve(projectName);
}
@Override
server/bundles/io.cloudbeaver.model/src/io/cloudbeaver/server/WebGlobalWorkspace.java
+3 -1
View File
@@ -27,6 +27,7 @@ import org.jkiss.dbeaver.model.app.DBPPlatform;
import org.jkiss.dbeaver.model.app.DBPProject;
import org.jkiss.dbeaver.model.impl.app.BaseProjectImpl;
import org.jkiss.dbeaver.model.impl.app.BaseWorkspaceImpl;
import org.jkiss.utils.CommonUtils;
import java.io.IOException;
import java.net.URI;
@@ -82,7 +83,8 @@ public class WebGlobalWorkspace extends BaseWorkspaceImpl {
globalProject = new WebGlobalProject(
this,
getAuthContext(),
WebAppUtils.getGlobalProjectId());
CommonUtils.notEmpty(WebAppUtils.getWebApplication().getDefaultProjectName())
);
activeProject = globalProject;
}