The Unified and Autonomous Development Platform
feat: Issues links between projects with different access authorization (OD-2175)
Robin Shen9b18f025daa7
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.htmlindex a96583519c..7cc2d1f4ef 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.html@@ -105,11 +105,6 @@</div></div></wicket:fragment>- <wicket:fragment wicket:id="unauthorizedLinkedIssueFrag">- <div class="bg-light rounded p-3">- <span wicket:id="number" class="mr-2"></span> <wicket:svg href="warning" class="icon"></wicket:svg> You are not authorized to access this issue- </div>- </wicket:fragment><wicket:fragment wicket:id="multipleLinksFrag"><div wicket:id="name" class="head d-flex align-items-center"></div><ul class="body linked-issues list-unstyled mb-0">diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.javaindex 2f71b92a5b..2a8d76fbb2 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java@@ -1,7 +1,6 @@package io.onedev.server.web.component.issue.side;import com.google.common.collect.Lists;-import com.hazelcast.shaded.org.snakeyaml.engine.v2.api.Load;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.*;import io.onedev.server.entityreference.EntityReference;@@ -589,12 +588,7 @@ public abstract class IssueSidePanel extends Panel {return fragment;} else {- Fragment fragment = new Fragment(componentId, "unauthorizedLinkedIssueFrag", IssueSidePanel.this);- if (getProject().equals(linkedIssue.getProject()))- fragment.add(new Label("number", "#" + linkedIssue.getNumber()));- else- fragment.add(new Label("number", linkedIssue.getProject().getPath() + "#" + linkedIssue.getNumber()));- return fragment;+ return new WebMarkupContainer(componentId).setVisible(false);}}diff --git a/server-core/src/main/java/io/onedev/server/xodus/AbstractMultiEnvironmentManager.java b/server-core/src/main/java/io/onedev/server/xodus/AbstractMultiEnvironmentManager.javaindex 5a6fc4cfe4..732fa2f0d1 100644--- a/server-core/src/main/java/io/onedev/server/xodus/AbstractMultiEnvironmentManager.java+++ b/server-core/src/main/java/io/onedev/server/xodus/AbstractMultiEnvironmentManager.java@@ -1,9 +1,5 @@package io.onedev.server.xodus;-import java.io.File;-import java.util.Map;-import java.util.concurrent.ConcurrentHashMap;-import io.onedev.commons.utils.FileUtils;import io.onedev.server.event.Listen;import io.onedev.server.event.system.SystemStopped;@@ -11,6 +7,10 @@ import jetbrains.exodus.backup.BackupStrategy;import jetbrains.exodus.backup.VirtualFileDescriptor;import jetbrains.exodus.env.Environment;+import java.io.File;+import java.util.Map;+import java.util.concurrent.ConcurrentHashMap;+public abstract class AbstractMultiEnvironmentManager extends AbstractEnvironmentManager {private final Map<String, Environment> envs = new ConcurrentHashMap<>();diff --git a/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoManager.java b/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoManager.javaindex 70ba278d43..acff900cf9 100644--- a/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoManager.java+++ b/server-core/src/main/java/io/onedev/server/xodus/DefaultCommitInfoManager.java@@ -1075,7 +1075,7 @@ public class DefaultCommitInfoManager extends AbstractMultiEnvironmentManagercollect(projectId);}}-+@Sessional@Listenpublic void on(ActiveServerChanged event) {