Skip to content

The Unified and Autonomous Development Platform

fix: Minor entity reference bugs

Robin Shen11e0c9ff7980
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
index 9095fbec1b..8957e7547b 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java
@@ -1,7 +1,6 @@
package io.onedev.server.entitymanager.impl;
import com.google.common.base.Preconditions;
-import com.google.common.collect.Sets;
import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.map.IMap;
import io.onedev.commons.loader.ManagedSerializedForm;
@@ -358,25 +357,21 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui
List<Build> builds = new ArrayList<>();
EntityCriteria<Build> criteria = newCriteria();
- Set<Project> projects = Sets.newHashSet(project);
- projects.addAll(project.getForkAncestors());
List<Criterion> projectCriterions = new ArrayList<>();
- for (Project each: projects) {
- Collection<String> availableJobNames = jobNames.get(each.getId());
- if (availableJobNames != null && !availableJobNames.isEmpty()) {
- Collection<String> accessibleJobNames = getAccessibleJobNames(each);
- if (accessibleJobNames.containsAll(availableJobNames)) {
- projectCriterions.add(Restrictions.eq(Build.PROP_PROJECT, each));
- } else {
- List<Criterion> jobCriterions = new ArrayList<>();
- for (String jobName: accessibleJobNames)
- jobCriterions.add(Restrictions.eq(Build.PROP_JOB_NAME, jobName));
- if (!jobCriterions.isEmpty()) {
- projectCriterions.add(Restrictions.and(
- Restrictions.eq(Build.PROP_PROJECT, each),
- Restrictions.or(jobCriterions.toArray(new Criterion[0]))));
- }
+ Collection<String> availableJobNames = jobNames.get(project.getId());
+ if (availableJobNames != null && !availableJobNames.isEmpty()) {
+ Collection<String> accessibleJobNames = getAccessibleJobNames(project);
+ if (accessibleJobNames.containsAll(availableJobNames)) {
+ projectCriterions.add(Restrictions.eq(Build.PROP_PROJECT, project));
+ } else {
+ List<Criterion> jobCriterions = new ArrayList<>();
+ for (String jobName: accessibleJobNames)
+ jobCriterions.add(Restrictions.eq(Build.PROP_JOB_NAME, jobName));
+ if (!jobCriterions.isEmpty()) {
+ projectCriterions.add(Restrictions.and(
+ Restrictions.eq(Build.PROP_PROJECT, project),
+ Restrictions.or(jobCriterions.toArray(new Criterion[0]))));
}
}
}
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
index c1b5ebf395..a7f1ea1ccd 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueManager.java
@@ -807,15 +807,6 @@ public class DefaultIssueManager extends BaseEntityManager<Issue> implements Iss
projectPredicates.add(buildNonConfidentialPredicate(builder, root, project));
projectPredicates.add(buildAuthorizationPredicate(criteriaQuery, builder, root, project));
}
-
- for (Project forkParent: project.getForkAncestors()) {
- if (SecurityUtils.canAccessConfidentialIssues(forkParent)) {
- projectPredicates.add(builder.equal(root.get(Issue.PROP_PROJECT), forkParent));
- } else if (SecurityUtils.canAccessProject(forkParent)) {
- projectPredicates.add(buildNonConfidentialPredicate(builder, root, forkParent));
- projectPredicates.add(buildAuthorizationPredicate(criteriaQuery, builder, root, forkParent));
- }
- }
predicates.add(builder.or(projectPredicates.toArray(new Predicate[0])));
if (fuzzyQuery.length() != 0) {
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
index c8aca17cfe..4e0b4865cb 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestManager.java
@@ -916,9 +916,7 @@ public class DefaultPullRequestManager extends BaseEntityManager<PullRequest>
List<PullRequest> requests = new ArrayList<>();
EntityCriteria<PullRequest> criteria = newCriteria();
- Set<Project> projects = Sets.newHashSet(project);
- projects.addAll(project.getForkAncestors().stream().filter(it->SecurityUtils.canReadCode(it)).collect(Collectors.toSet()));
- criteria.add(Restrictions.in(PullRequest.PROP_TARGET_PROJECT, projects));
+ criteria.add(Restrictions.eq(PullRequest.PROP_TARGET_PROJECT, project));
if (fuzzyQuery.length() != 0) {
try {
diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.java
index e12bcad6a0..b524d5cd1a 100644
--- a/server-core/src/main/java/io/onedev/server/model/Project.java
+++ b/server-core/src/main/java/io/onedev/server/model/Project.java
@@ -426,7 +426,7 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabel
@Editable(order=150, description = "Optionally define a unique key for the project with two or " +
"more upper case letters. This key can be used to reference issues, builds, and pull requests " +
- "with a stable and short notion <code>&lt;project key&gt;-&lt;number&gt;</code> instead of " +
+ "with a stable and short form <code>&lt;project key&gt;-&lt;number&gt;</code> instead of " +
"<code>&lt;project path&gt;#&lt;number&gt;</code>")
@ProjectKey
@Nullable
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
index f1cf9fe7f9..8c93c367d6 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
@@ -527,6 +527,7 @@ onedev.server.markdown = {
callback("referenceQuery", atChar, match.query, match.type, match.project);
}
function beforeInsertReference(atChar) {
+ $input.focus();
var match = matchReference(atChar);
if (match) {
$input.range(match.index, $input.caret());