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

Merge branch 'devel' of https://github.com/dbeaver/cloudbeaver into devel

Browse Source
This commit is contained in:
Wroud
2022-05-31 14:58:22 +03:00
parent a1543925f3 9bdcdefd08
commit 1d5d7387bb
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/server/servlets/CBStaticServlet.java
+4
View File
@@ -102,6 +102,10 @@ public class CBStaticServlet extends DefaultServlet {
WebSession webSession = CBPlatform.getInstance().getSessionManager().getWebSession(request, response, false);
if (webSession.getUser() == null) {
String signInLink = ((SMWAuthProviderFederated) authProviderInstance).getSignInLink(configId, Collections.emptyMap());
//ignore current routing if non-root page is open
if (!signInLink.endsWith("#")) {
signInLink += "#";
}
if (!CommonUtils.isEmpty(signInLink)) {
// Redirect to it
request.getSession().setAttribute(DBWConstants.STATE_ATTR_SIGN_IN_STATE, DBWConstants.SignInState.GLOBAL);
server/bundles/io.cloudbeaver.server/src/io/cloudbeaver/service/navigator/WebDatabaseObjectInfo.java
+7 -2
View File
@@ -26,6 +26,7 @@ import org.jkiss.dbeaver.model.preferences.DBPPropertyDescriptor;
import org.jkiss.dbeaver.model.struct.*;
import org.jkiss.dbeaver.model.struct.rdb.DBSCatalog;
import org.jkiss.dbeaver.model.struct.rdb.DBSSchema;
import org.jkiss.dbeaver.model.struct.rdb.DBSTable;
import org.jkiss.dbeaver.runtime.properties.PropertyCollector;
import org.jkiss.utils.CommonUtils;
@@ -181,7 +182,11 @@ public class WebDatabaseObjectInfo {
}
}
if (object instanceof DBSDataManipulator) features.add(OBJECT_FEATURE_DATA_MANIPULATOR);
if (object instanceof DBSEntity && !(object instanceof DBSDataType) && isDiagramSupported) {
if (object instanceof DBSEntity &&
!(object instanceof DBSDataType) &&
!(object instanceof DBSDocumentContainer) &&
isDiagramSupported
) {
features.add(OBJECT_FEATURE_ENTITY);
}
if (object instanceof DBSSchema) features.add(OBJECT_FEATURE_SCHEMA);
@@ -190,7 +195,7 @@ public class WebDatabaseObjectInfo {
features.add(OBJECT_FEATURE_OBJECT_CONTAINER);
try {
Class<? extends DBSObject> childType = ((DBSObjectContainer) object).getPrimaryChildType(null);
if (DBSEntity.class.isAssignableFrom(childType)) {
if (DBSTable.class.isAssignableFrom(childType)) {
features.add(OBJECT_FEATURE_ENTITY_CONTAINER);
}
} catch (Exception e) {