Skip to content

The Unified and Autonomous Development Platform

Fix issue #1249 - Properties defined in project displayed as imported in build spec

Robin Shen1d44cd882997
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java
index 2e2c859de1..b6b8b49a6e 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/BuildSpec.java
@@ -13,6 +13,8 @@ import io.onedev.commons.utils.LinearRange;
import io.onedev.commons.utils.StringUtils;
import io.onedev.commons.utils.WordUtils;
import io.onedev.server.OneDev;
+import io.onedev.server.annotation.ClassValidating;
+import io.onedev.server.annotation.Editable;
import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.job.JobDependency;
import io.onedev.server.buildspec.param.ParamUtils;
@@ -23,13 +25,10 @@ import io.onedev.server.buildspec.step.UseTemplateStep;
import io.onedev.server.job.JobAuthorizationContext;
import io.onedev.server.migration.VersionedYamlDoc;
import io.onedev.server.migration.XmlBuildSpecMigrator;
-import io.onedev.server.model.Project;
import io.onedev.server.model.support.build.JobProperty;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ComponentContext;
import io.onedev.server.validation.Validatable;
-import io.onedev.server.annotation.ClassValidating;
-import io.onedev.server.annotation.Editable;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
import io.onedev.server.web.util.SuggestionUtils;
import io.onedev.server.web.util.WicketUtils;
@@ -40,7 +39,10 @@ import org.yaml.snakeyaml.DumperOptions.FlowStyle;
import org.yaml.snakeyaml.nodes.*;
import javax.annotation.Nullable;
-import javax.validation.*;
+import javax.validation.ConstraintValidatorContext;
+import javax.validation.ConstraintViolation;
+import javax.validation.ValidationException;
+import javax.validation.Validator;
import java.io.Serializable;
import java.nio.charset.StandardCharsets;
import java.util.*;
@@ -195,10 +197,6 @@ public class BuildSpec implements Serializable, Validatable {
public Map<String, JobProperty> getPropertyMap() {
if (propertyMap == null) {
propertyMap = new LinkedHashMap<>();
- if (Project.get() != null) {
- for (JobProperty property : Project.get().getHierarchyJobProperties())
- propertyMap.put(property.getName(), property);
- }
for (BuildSpec buildSpec: getImportedBuildSpecs(new HashSet<>())) {
for (JobProperty property : buildSpec.getProperties())
propertyMap.put(property.getName(), property);
diff --git a/server-core/src/main/java/io/onedev/server/util/interpolative/VariableInterpolator.java b/server-core/src/main/java/io/onedev/server/util/interpolative/VariableInterpolator.java
index f3d2d86f1e..ee5008eb31 100644
--- a/server-core/src/main/java/io/onedev/server/util/interpolative/VariableInterpolator.java
+++ b/server-core/src/main/java/io/onedev/server/util/interpolative/VariableInterpolator.java
@@ -17,6 +17,7 @@ import javax.annotation.Nullable;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.model.Project;
import io.onedev.server.model.support.build.JobProperty;
import io.onedev.server.buildspec.job.JobVariable;
import io.onedev.server.buildspec.param.ParamCombination;
@@ -92,10 +93,15 @@ public class VariableInterpolator {
propertyName = t.substring("properties:".length());
JobProperty property = build.getSpec().getPropertyMap().get(propertyName);
- if (property != null)
+ if (property != null) {
return property.getValue();
- else
+ } else {
+ for (var projectProperty: build.getProject().getHierarchyJobProperties()) {
+ if (projectProperty.getName().equals(propertyName))
+ return projectProperty.getValue();
+ }
throw new ExplicitException("Undefined property: " + propertyName);
+ }
} else if (t.startsWith(PREFIX_SECRET) || t.startsWith("secrets:")) {
String secretName;
if (t.startsWith(PREFIX_SECRET))
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
index 3cd3dbdd4b..50ef695a3b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java
@@ -292,9 +292,6 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
ProjectServiceDeskSettingPage.class, ProjectServiceDeskSettingPage.paramsOf(getProject())));
}
- settingMenuItems.add(new SidebarMenuItem.Page(null, "Web Hooks",
- WebHooksPage.class, WebHooksPage.paramsOf(getProject())));
-
List<Class<? extends ContributedProjectSetting>> contributedSettingClasses = new ArrayList<>();
for (ProjectSettingContribution contribution:OneDev.getExtensions(ProjectSettingContribution.class)) {
for (Class<? extends ContributedProjectSetting> settingClass: contribution.getSettingClasses())
@@ -303,6 +300,7 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
contributedSettingClasses.sort(Comparator.comparingInt(EditableUtils::getOrder));
Map<String, List<SidebarMenuItem>> contributedSettingMenuItems = new HashMap<>();
+
for (var contributedSettingClass: contributedSettingClasses) {
var group = EditableUtils.getGroup(contributedSettingClass);
if (group == null)
@@ -318,6 +316,15 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
ContributedProjectSettingPage.class,
ContributedProjectSettingPage.paramsOf(getProject(), contributedSettingClass)));
}
+
+ SidebarMenuItem webHooksItem = new SidebarMenuItem.Page(null, "Web Hooks",
+ WebHooksPage.class, WebHooksPage.paramsOf(getProject()));
+ var notificationItems = contributedSettingMenuItems.get("Notification");
+ if (notificationItems == null)
+ settingMenuItems.add(webHooksItem);
+ else
+ notificationItems.add(0, webHooksItem);
+
for (var entry: contributedSettingMenuItems.entrySet()) {
if (entry.getKey().length() == 0) {
settingMenuItems.addAll(entry.getValue());
diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
index 039b3ea717..56c012d400 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
@@ -14,6 +14,7 @@ import io.onedev.server.git.GitUtils;
import io.onedev.server.infomanager.CommitInfoManager;
import io.onedev.server.model.*;
import io.onedev.server.model.support.administration.GroovyScript;
+import io.onedev.server.model.support.build.JobProperty;
import io.onedev.server.model.support.build.JobSecret;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.AccessProject;
@@ -227,6 +228,10 @@ public class SuggestionUtils {
}
for (String propertyName: buildSpec.getPropertyMap().keySet())
variables.put(VariableInterpolator.PREFIX_PROPERTY + propertyName, null);
+ for (JobProperty property: project.getHierarchyJobProperties()) {
+ if (!buildSpec.getPropertyMap().containsKey(property.getName()))
+ variables.put(VariableInterpolator.PREFIX_PROPERTY + property.getName(), null);
+ }
for (JobSecret secret: project.getHierarchyJobSecrets())
variables.put(VariableInterpolator.PREFIX_SECRET + secret.getName(), null);