Skip to content

The Unified and Autonomous Development Platform

Fix issue #674 - Inheritance of boards, queries and link/field display setting from parent project

Robin Shen03ad0b798c73
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildQueryPersonalizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildQueryPersonalizationManager.java
index 823a194d09..48785b9a17 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildQueryPersonalizationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildQueryPersonalizationManager.java
@@ -44,8 +44,8 @@ public class DefaultBuildQueryPersonalizationManager extends BaseEntityManager<B
Collection<String> retainNames = new HashSet<>();
retainNames.addAll(personalization.getQueries().stream()
.map(it->NamedQuery.PERSONAL_NAME_PREFIX+it.getName()).collect(Collectors.toSet()));
- retainNames.addAll(personalization.getProject().getBuildSetting().getNamedQueries(true).stream()
- .map(it->NamedQuery.GLOBAL_NAME_PREFIX+it.getName()).collect(Collectors.toSet()));
+ retainNames.addAll(personalization.getProject().getNamedBuildQueries().stream()
+ .map(it->NamedQuery.COMMON_NAME_PREFIX+it.getName()).collect(Collectors.toSet()));
personalization.getQuerySubscriptionSupport().getQuerySubscriptions().retainAll(retainNames);
if (personalization.getQuerySubscriptionSupport().getQuerySubscriptions().isEmpty() && personalization.getQueries().isEmpty()) {
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCommitQueryPersonalizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCommitQueryPersonalizationManager.java
index c9f73bce23..80d37e9e03 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCommitQueryPersonalizationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCommitQueryPersonalizationManager.java
@@ -45,7 +45,7 @@ public class DefaultCommitQueryPersonalizationManager extends BaseEntityManager<
retainNames.addAll(personalization.getQueries().stream()
.map(it->NamedQuery.PERSONAL_NAME_PREFIX+it.getName()).collect(Collectors.toSet()));
retainNames.addAll(personalization.getProject().getNamedCommitQueries().stream()
- .map(it->NamedQuery.GLOBAL_NAME_PREFIX+it.getName()).collect(Collectors.toSet()));
+ .map(it->NamedQuery.COMMON_NAME_PREFIX+it.getName()).collect(Collectors.toSet()));
personalization.getQuerySubscriptionSupport().getQuerySubscriptions().retainAll(retainNames);
if (personalization.getQuerySubscriptionSupport().getQuerySubscriptions().isEmpty() && personalization.getQueries().isEmpty()) {
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueQueryPersonalizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueQueryPersonalizationManager.java
index 09ed69c17d..a9a33355ba 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueQueryPersonalizationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueQueryPersonalizationManager.java
@@ -44,8 +44,8 @@ public class DefaultIssueQueryPersonalizationManager extends BaseEntityManager<I
Collection<String> retainNames = new HashSet<>();
retainNames.addAll(personalization.getQueries().stream()
.map(it->NamedQuery.PERSONAL_NAME_PREFIX+it.getName()).collect(Collectors.toSet()));
- retainNames.addAll(personalization.getProject().getIssueSetting().getNamedQueries(true).stream()
- .map(it->NamedQuery.GLOBAL_NAME_PREFIX+it.getName()).collect(Collectors.toSet()));
+ retainNames.addAll(personalization.getProject().getNamedIssueQueries().stream()
+ .map(it->NamedQuery.COMMON_NAME_PREFIX+it.getName()).collect(Collectors.toSet()));
personalization.getQueryWatchSupport().getQueryWatches().keySet().retainAll(retainNames);
if (personalization.getQueryWatchSupport().getQueryWatches().isEmpty() && personalization.getQueries().isEmpty()) {
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestQueryPersonalizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestQueryPersonalizationManager.java
index 884b8ca844..365443b1f1 100644
--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestQueryPersonalizationManager.java
+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestQueryPersonalizationManager.java
@@ -44,8 +44,8 @@ public class DefaultPullRequestQueryPersonalizationManager extends BaseEntityMan
Collection<String> retainNames = new HashSet<>();
retainNames.addAll(personalization.getQueries().stream()
.map(it->NamedQuery.PERSONAL_NAME_PREFIX+it.getName()).collect(Collectors.toSet()));
- retainNames.addAll(personalization.getProject().getPullRequestSetting().getNamedQueries(true).stream()
- .map(it->NamedQuery.GLOBAL_NAME_PREFIX+it.getName()).collect(Collectors.toSet()));
+ retainNames.addAll(personalization.getProject().getNamedPullRequestQueries().stream()
+ .map(it->NamedQuery.COMMON_NAME_PREFIX+it.getName()).collect(Collectors.toSet()));
personalization.getQueryWatchSupport().getQueryWatches().keySet().retainAll(retainNames);
if (personalization.getQueryWatchSupport().getQueryWatches().isEmpty() && personalization.getQueries().isEmpty()) {
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 5953749b8e..f9f87f03ea 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
@@ -125,9 +125,12 @@ import io.onedev.server.model.support.WebHook;
import io.onedev.server.model.support.build.BuildPreservation;
import io.onedev.server.model.support.build.DefaultFixedIssueFilter;
import io.onedev.server.model.support.build.JobSecret;
+import io.onedev.server.model.support.build.NamedBuildQuery;
import io.onedev.server.model.support.build.ProjectBuildSetting;
import io.onedev.server.model.support.build.actionauthorization.ActionAuthorization;
+import io.onedev.server.model.support.issue.NamedIssueQuery;
import io.onedev.server.model.support.issue.ProjectIssueSetting;
+import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;
import io.onedev.server.model.support.pullrequest.ProjectPullRequestSetting;
import io.onedev.server.persistence.SessionManager;
import io.onedev.server.persistence.TransactionManager;
@@ -1935,4 +1938,68 @@ public class Project extends AbstractEntity {
|| patternSet.getExcludes().stream().anyMatch(it->PathUtils.isSelfOrAncestor(path, it));
}
+ @Nullable
+ public NamedIssueQuery getNamedIssueQuery(String name) {
+ for (NamedIssueQuery namedQuery: getNamedIssueQueries()) {
+ if (namedQuery.getName().equals(name))
+ return namedQuery;
+ }
+ return null;
+ }
+
+ @Nullable
+ public NamedBuildQuery getNamedBuildQuery(String name) {
+ for (NamedBuildQuery namedQuery: getNamedBuildQueries()) {
+ if (namedQuery.getName().equals(name))
+ return namedQuery;
+ }
+ return null;
+ }
+
+ @Nullable
+ public NamedPullRequestQuery getNamedPullRequestQuery(String name) {
+ for (NamedPullRequestQuery namedQuery: getNamedPullRequestQueries()) {
+ if (namedQuery.getName().equals(name))
+ return namedQuery;
+ }
+ return null;
+ }
+
+ public List<NamedIssueQuery> getNamedIssueQueries() {
+ Project current = this;
+ do {
+ List<NamedIssueQuery> namedQueries = current.getIssueSetting().getNamedQueries();
+ if (namedQueries != null)
+ return (ArrayList<NamedIssueQuery>) namedQueries;
+ current = current.getParent();
+ } while (current != null);
+
+ return (ArrayList<NamedIssueQuery>) OneDev.getInstance(SettingManager.class).getIssueSetting().getNamedQueries();
+ }
+
+ public List<NamedBuildQuery> getNamedBuildQueries() {
+ Project current = this;
+ do {
+ List<NamedBuildQuery> namedQueries = current.getBuildSetting().getNamedQueries();
+ if (namedQueries != null)
+ return (ArrayList<NamedBuildQuery>) namedQueries;
+ current = current.getParent();
+ } while (current != null);
+
+ return (ArrayList<NamedBuildQuery>) OneDev.getInstance(SettingManager.class).getBuildSetting().getNamedQueries();
+ }
+
+ public List<NamedPullRequestQuery> getNamedPullRequestQueries() {
+ Project current = this;
+ do {
+ List<NamedPullRequestQuery> namedQueries = current.getPullRequestSetting().getNamedQueries();
+ if (namedQueries != null)
+ return (ArrayList<NamedPullRequestQuery>) namedQueries;
+ current = current.getParent();
+ } while (current != null);
+
+ return (ArrayList<NamedPullRequestQuery>) OneDev.getInstance(SettingManager.class)
+ .getPullRequestSetting().getNamedQueries();
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/NamedQuery.java b/server-core/src/main/java/io/onedev/server/model/support/NamedQuery.java
index a65056fd52..6c888384bb 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/NamedQuery.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/NamedQuery.java
@@ -10,7 +10,7 @@ import io.onedev.server.web.editable.annotation.Editable;
@Editable
public interface NamedQuery extends Serializable {
- public static final String GLOBAL_NAME_PREFIX = "g:";
+ public static final String COMMON_NAME_PREFIX = "g:";
public static final String PERSONAL_NAME_PREFIX = "p:";
@@ -28,9 +28,9 @@ public interface NamedQuery extends Serializable {
}
@Nullable
- public static String getGlobalName(String name) {
- if (name.startsWith(GLOBAL_NAME_PREFIX))
- return name.substring(GLOBAL_NAME_PREFIX.length());
+ public static String getCommonName(String name) {
+ if (name.startsWith(COMMON_NAME_PREFIX))
+ return name.substring(COMMON_NAME_PREFIX.length());
else
return null;
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java b/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java
index d79e33318d..6de508cbe5 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/build/ProjectBuildSetting.java
@@ -100,26 +100,14 @@ public class ProjectBuildSetting implements Serializable {
}
@Nullable
- public List<NamedBuildQuery> getNamedQueries(boolean useDefaultIfNotDefined) {
- if (useDefaultIfNotDefined && namedQueries == null)
- return new ArrayList<>(getGlobalSetting().getNamedQueries());
- else
- return namedQueries;
+ public List<NamedBuildQuery> getNamedQueries() {
+ return namedQueries;
}
public void setNamedQueries(@Nullable List<NamedBuildQuery> namedQueries) {
this.namedQueries = namedQueries;
}
- @Nullable
- public NamedBuildQuery getNamedQuery(String name) {
- for (NamedBuildQuery namedQuery: getNamedQueries(true)) {
- if (namedQuery.getName().equals(name))
- return namedQuery;
- }
- return null;
- }
-
private IssueQueryUpdater getQueryUpdater(DefaultFixedIssueFilter filter, int index) {
return new IssueQueryUpdater() {
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java
index a74fcf69be..74b719976b 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java
@@ -46,11 +46,8 @@ public class ProjectIssueSetting implements Serializable {
}
@Nullable
- public List<String> getListFields(boolean useDefaultIfNotDefined) {
- if (useDefaultIfNotDefined && listFields == null)
- return new ArrayList<>(getGlobalSetting().getListFields());
- else
- return listFields;
+ public List<String> getListFields() {
+ return listFields;
}
public void setListFields(@Nullable List<String> listFields) {
@@ -58,11 +55,8 @@ public class ProjectIssueSetting implements Serializable {
}
@Nullable
- public List<String> getListLinks(boolean useDefaultIfNotDefined) {
- if (useDefaultIfNotDefined && listLinks == null)
- return new ArrayList<>(getGlobalSetting().getListLinks());
- else
- return listLinks;
+ public List<String> getListLinks() {
+ return listLinks;
}
public void setListLinks(List<String> listLinks) {
@@ -70,11 +64,8 @@ public class ProjectIssueSetting implements Serializable {
}
@Nullable
- public List<BoardSpec> getBoardSpecs(boolean useDefaultIfNotDefined) {
- if (useDefaultIfNotDefined && boardSpecs == null)
- return new ArrayList<>(getGlobalSetting().getBoardSpecs());
- else
- return boardSpecs;
+ public List<BoardSpec> getBoardSpecs() {
+ return boardSpecs;
}
public void setBoardSpecs(@Nullable List<BoardSpec> boardSpecs) {
@@ -82,26 +73,14 @@ public class ProjectIssueSetting implements Serializable {
}
@Nullable
- public List<NamedIssueQuery> getNamedQueries(boolean useDefaultIfNotDefined) {
- if (useDefaultIfNotDefined && namedQueries == null)
- return new ArrayList<>(getGlobalSetting().getNamedQueries());
- else
- return namedQueries;
+ public List<NamedIssueQuery> getNamedQueries() {
+ return namedQueries;
}
public void setNamedQueries(@Nullable List<NamedIssueQuery> namedQueries) {
this.namedQueries = namedQueries;
}
- @Nullable
- public NamedIssueQuery getNamedQuery(String name) {
- for (NamedIssueQuery namedQuery: getNamedQueries(true)) {
- if (namedQuery.getName().equals(name))
- return namedQuery;
- }
- return null;
- }
-
public void onRenameUser(String oldName, String newName) {
if (boardSpecs != null) {
for (BoardSpec board: boardSpecs)
diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ProjectPullRequestSetting.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ProjectPullRequestSetting.java
index 058d8fddf8..85e6498e0c 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ProjectPullRequestSetting.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/ProjectPullRequestSetting.java
@@ -1,48 +1,23 @@
package io.onedev.server.model.support.pullrequest;
import java.io.Serializable;
-import java.util.ArrayList;
import java.util.List;
import javax.annotation.Nullable;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.SettingManager;
-import io.onedev.server.model.support.administration.GlobalPullRequestSetting;
-
public class ProjectPullRequestSetting implements Serializable {
private static final long serialVersionUID = 1L;
private List<NamedPullRequestQuery> namedQueries;
- private transient GlobalPullRequestSetting setting;
-
- private GlobalPullRequestSetting getGlobalSetting() {
- if (setting == null)
- setting = OneDev.getInstance(SettingManager.class).getPullRequestSetting();
- return setting;
- }
-
@Nullable
- public List<NamedPullRequestQuery> getNamedQueries(boolean useDefaultIfNotDefined) {
- if (useDefaultIfNotDefined && namedQueries == null)
- return new ArrayList<>(getGlobalSetting().getNamedQueries());
- else
- return namedQueries;
+ public List<NamedPullRequestQuery> getNamedQueries() {
+ return namedQueries;
}
public void setNamedQueries(@Nullable List<NamedPullRequestQuery> namedQueries) {
this.namedQueries = namedQueries;
}
- @Nullable
- public NamedPullRequestQuery getNamedQuery(String name) {
- for (NamedPullRequestQuery namedQuery: getNamedQueries(true)) {
- if (namedQuery.getName().equals(name))
- return namedQuery;
- }
- return null;
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java
index 3a31d6c675..cca7c26f3d 100644
--- a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java
@@ -87,10 +87,10 @@ public class BuildNotificationManager extends AbstractNotificationManager {
Map<User, Collection<String>> subscribedQueryStrings = new HashMap<>();
for (BuildQueryPersonalization personalization: project.getBuildQueryPersonalizations()) {
for (String name: personalization.getQuerySubscriptionSupport().getQuerySubscriptions()) {
- String globalName = NamedQuery.getGlobalName(name);
- if (globalName != null) {
+ String commonName = NamedQuery.getCommonName(name);
+ if (commonName != null) {
fillSubscribedQueryStrings(subscribedQueryStrings, personalization.getUser(),
- NamedQuery.find(project.getBuildSetting().getNamedQueries(true), globalName));
+ NamedQuery.find(project.getNamedBuildQueries(), commonName));
}
String personalName = NamedQuery.getPersonalName(name);
if (personalName != null) {
@@ -126,7 +126,7 @@ public class BuildNotificationManager extends AbstractNotificationManager {
subscribedQueryStrings.clear();
for (User user: userManager.query()) {
for (String name: user.getBuildQueryPersonalization().getQuerySubscriptionSupport().getQuerySubscriptions()) {
- String globalName = NamedQuery.getGlobalName(name);
+ String globalName = NamedQuery.getCommonName(name);
if (globalName != null) {
fillSubscribedQueryStrings(subscribedQueryStrings, user,
NamedQuery.find(settingManager.getBuildSetting().getNamedQueries(), globalName));
diff --git a/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java
index 0d2a9aa482..53baf9f2b9 100644
--- a/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java
@@ -68,7 +68,7 @@ public class CommitNotificationManager extends AbstractNotificationManager {
Map<User, Collection<String>> subscribedQueryStrings = new HashMap<>();
for (CommitQueryPersonalization setting: project.getCommitQueryPersonalizations()) {
for (String name: setting.getQuerySubscriptionSupport().getQuerySubscriptions()) {
- String globalName = NamedQuery.getGlobalName(name);
+ String globalName = NamedQuery.getCommonName(name);
if (globalName != null) {
fillSubscribedQueryStrings(subscribedQueryStrings, setting.getUser(),
NamedQuery.find(project.getNamedCommitQueries(), globalName));
diff --git a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
index 8dfa169673..31bcb455a0 100644
--- a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java
@@ -106,7 +106,7 @@ public class IssueNotificationManager extends AbstractNotificationManager {
@Override
protected Collection<? extends NamedQuery> getNamedQueries() {
- return issue.getProject().getIssueSetting().getNamedQueries(true);
+ return issue.getProject().getNamedIssueQueries();
}
}.getWatches().entrySet()) {
diff --git a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
index b968895ce5..f88a435388 100644
--- a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
+++ b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java
@@ -117,7 +117,7 @@ public class PullRequestNotificationManager extends AbstractNotificationManager
@Override
protected Collection<? extends NamedQuery> getNamedQueries() {
- return request.getTargetProject().getPullRequestSetting().getNamedQueries(true);
+ return request.getTargetProject().getNamedPullRequestQueries();
}
}.getWatches().entrySet()) {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/QueryWatchBuilder.java b/server-core/src/main/java/io/onedev/server/search/entity/QueryWatchBuilder.java
index b17c5633c4..b0d53ed2d2 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/QueryWatchBuilder.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/QueryWatchBuilder.java
@@ -29,7 +29,7 @@ public abstract class QueryWatchBuilder<T extends AbstractEntity> {
public QueryWatchBuilder() {
for (QueryPersonalization<?> personalization: getQueryPersonalizations()) {
for (Map.Entry<String, Boolean> entry: personalization.getQueryWatchSupport().getQueryWatches().entrySet()) {
- String globalName = NamedQuery.getGlobalName(entry.getKey());
+ String globalName = NamedQuery.getCommonName(entry.getKey());
if (globalName != null) {
if (matches(NamedQuery.find(getNamedQueries(), globalName), personalization.getUser())) {
watches.putIfAbsent(personalization.getUser(), entry.getValue());
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index 116dd2a2e0..c34a7008ea 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -523,8 +523,8 @@ public abstract class IssueListPanel extends Panel {
protected void onConfigure() {
super.onConfigure();
setVisible(getProject() != null
- && getProject().getIssueSetting().getListFields(false) != null
- && getProject().getIssueSetting().getListLinks(false) != null);
+ && getProject().getIssueSetting().getListFields() != null
+ && getProject().getIssueSetting().getListLinks() != null);
}
});
@@ -1367,17 +1367,25 @@ public abstract class IssueListPanel extends Panel {
}
private List<String> getListFields() {
- if (getProject() != null)
- return getProject().getIssueSetting().getListFields(true);
- else
- return getGlobalIssueSetting().getListFields();
+ Project current = getProject();
+ while (current != null) {
+ List<String> listFields = current.getIssueSetting().getListFields();
+ if (listFields != null)
+ return listFields;
+ current = current.getParent();
+ }
+ return getGlobalIssueSetting().getListFields();
}
private List<String> getListLinks() {
- if (getProject() != null)
- return getProject().getIssueSetting().getListLinks(true);
- else
- return getGlobalIssueSetting().getListLinks();
+ Project current = getProject();
+ while (current != null) {
+ List<String> listLinks = current.getIssueSetting().getListLinks();
+ if (listLinks != null)
+ return listLinks;
+ current = current.getParent();
+ }
+ return getGlobalIssueSetting().getListLinks();
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.html
index bb4ec609a5..52d55b9ad4 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.html
@@ -19,7 +19,7 @@
<a wicket:id="link" class="btn btn-sm btn-outline-secondary text-left"><span wicket:id="label"></span></a>
</span>
</div>
- <div wicket:id="globalQueries" class="mb-4">
+ <div wicket:id="commonQueries" class="mb-4">
<span class="btn-group">
<a wicket:id="subscriptionStatus" class="subscription-status btn btn-outline-secondary btn-sm btn-icon flex-shrink-0 h-auto"></a>
<a wicket:id="watchStatus" class="watch-status btn btn-outline-secondary btn-icon btn-sm flex-shrink-0 h-auto"></a>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java
index da81ad0d95..01540de3d0 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java
@@ -113,7 +113,7 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
handler.add(this);
}
- private boolean canEditGlobalQueries() {
+ private boolean canEditCommonQueries() {
return SecurityUtils.isAdministrator() || Project.get() != null && SecurityUtils.canManage(Project.get());
}
@@ -143,7 +143,7 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(SecurityUtils.getUser() != null && (getQueryPersonalization() != null || canEditGlobalQueries()));
+ setVisible(SecurityUtils.getUser() != null && (getQueryPersonalization() != null || canEditCommonQueries()));
}
@Override
@@ -173,20 +173,20 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
};
}
- private Component newGlobalQueriesEditor(String componentId, ModalPanel modal) {
- ArrayList<T> queries = getGlobalQueries();
+ private Component newCommonQueriesEditor(String componentId, ModalPanel modal) {
+ ArrayList<T> queries = getCommonQueries();
UseDefaultListener useDefaultListener;
if (queries == null) {
- queries = new ArrayList<>(getDefaultQueries());
+ queries = new ArrayList<>(getInheritedCommonQueries());
useDefaultListener = null;
- } else if (getDefaultQueries() != null) {
+ } else if (getInheritedCommonQueries() != null) {
useDefaultListener = new UseDefaultListener() {
@Override
public void onUseDefault(AjaxRequestTarget target) {
target.add(SavedQueriesPanel.this);
modal.close();
- onSaveGlobalQueries(null);
+ onSaveCommonQueries(null);
}
};
@@ -200,7 +200,7 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
protected void onSave(AjaxRequestTarget target, ArrayList<T> queries) {
target.add(SavedQueriesPanel.this);
modal.close();
- onSaveGlobalQueries(queries);
+ onSaveCommonQueries(queries);
}
@Override
@@ -236,7 +236,7 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
});
fragment.add(newPersonalQueriesEditor(TAB_PANEL_ID, modal));
- if (canEditGlobalQueries()) {
+ if (canEditCommonQueries()) {
tabs.add(new AjaxActionTab(Model.of("All Users")) {
@Override
@@ -247,7 +247,7 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
@Override
protected void onSelect(AjaxRequestTarget target, Component tabLink) {
- Component editor = newGlobalQueriesEditor(TAB_PANEL_ID, modal);
+ Component editor = newCommonQueriesEditor(TAB_PANEL_ID, modal);
fragment.replace(editor);
target.add(editor);
}
@@ -258,7 +258,7 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
fragment.add(new Tabbable("tab", tabs));
} else {
fragment = new Fragment(id, "editSavedQueriesFrag", SavedQueriesPanel.this);
- fragment.add(newGlobalQueriesEditor("content", modal));
+ fragment.add(newCommonQueriesEditor("content", modal));
}
fragment.add(new AjaxLink<Void>("close") {
@@ -357,12 +357,12 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
});
- add(new ListView<T>("globalQueries", new LoadableDetachableModel<List<T>>() {
+ add(new ListView<T>("commonQueries", new LoadableDetachableModel<List<T>>() {
@Override
protected List<T> load() {
List<T> namedQueries = new ArrayList<>();
- for (T namedQuery: getGlobalQueries()!=null?getGlobalQueries():getDefaultQueries())
+ for (T namedQuery: getCommonQueries()!=null?getCommonQueries():getInheritedCommonQueries())
namedQueries.add(namedQuery);
return namedQueries;
}
@@ -376,7 +376,7 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
link.add(new Label("label", namedQuery.getName()));
item.add(link);
- String globalName = NamedQuery.GLOBAL_NAME_PREFIX + namedQuery.getName();
+ String commonName = NamedQuery.COMMON_NAME_PREFIX + namedQuery.getName();
item.add(new WatchStatusLink("watchStatus") {
@@ -385,13 +385,13 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
target.add(this);
QueryPersonalization<T> personalization = getQueryPersonalization();
- personalization.getQueryWatchSupport().setWatchStatus(globalName, watchStatus);
+ personalization.getQueryWatchSupport().setWatchStatus(commonName, watchStatus);
personalization.onUpdated();
}
@Override
protected WatchStatus getWatchStatus() {
- return SavedQueriesPanel.this.getWatchStatus(globalName);
+ return SavedQueriesPanel.this.getWatchStatus(commonName);
}
@Override
@@ -412,15 +412,15 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
QueryPersonalization<T> personalization = getQueryPersonalization();
if (subscriptionStatus)
- personalization.getQuerySubscriptionSupport().getQuerySubscriptions().add(globalName);
+ personalization.getQuerySubscriptionSupport().getQuerySubscriptions().add(commonName);
else
- personalization.getQuerySubscriptionSupport().getQuerySubscriptions().remove(globalName);
+ personalization.getQuerySubscriptionSupport().getQuerySubscriptions().remove(commonName);
personalization.onUpdated();
}
@Override
protected boolean isSubscribed() {
- return getSubscriptionStatus(globalName);
+ return getSubscriptionStatus(commonName);
}
@Override
@@ -546,12 +546,12 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
protected abstract QueryPersonalization<T> getQueryPersonalization();
@Nullable
- protected abstract ArrayList<T> getGlobalQueries();
+ protected abstract ArrayList<T> getCommonQueries();
- protected abstract void onSaveGlobalQueries(ArrayList<T> queries);
+ protected abstract void onSaveCommonQueries(ArrayList<T> queries);
@Nullable
- protected ArrayList<T> getDefaultQueries() {
+ protected ArrayList<T> getInheritedCommonQueries() {
return null;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.java
index ccd42d15b6..05d91b0b6b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPage.java
@@ -76,12 +76,12 @@ public class AgentListPage extends AdministrationPage {
}
@Override
- protected ArrayList<NamedAgentQuery> getGlobalQueries() {
+ protected ArrayList<NamedAgentQuery> getCommonQueries() {
return (ArrayList<NamedAgentQuery>) getAgentSetting().getNamedQueries();
}
@Override
- protected void onSaveGlobalQueries(ArrayList<NamedAgentQuery> namedQueries) {
+ protected void onSaveCommonQueries(ArrayList<NamedAgentQuery> namedQueries) {
getAgentSetting().setNamedQueries(namedQueries);
OneDev.getInstance(SettingManager.class).saveAgentSetting(getAgentSetting());
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java b/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java
index ed64e2e025..7f8ef506ae 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/builds/BuildListPage.java
@@ -86,12 +86,12 @@ public class BuildListPage extends LayoutPage {
}
@Override
- protected ArrayList<NamedBuildQuery> getGlobalQueries() {
+ protected ArrayList<NamedBuildQuery> getCommonQueries() {
return (ArrayList<NamedBuildQuery>) getBuildSetting().getNamedQueries();
}
@Override
- protected void onSaveGlobalQueries(ArrayList<NamedBuildQuery> namedQueries) {
+ protected void onSaveCommonQueries(ArrayList<NamedBuildQuery> namedQueries) {
getBuildSetting().setNamedQueries(namedQueries);
OneDev.getInstance(SettingManager.class).saveBuildSetting(getBuildSetting());
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java
index ae7c3250ba..5072effefe 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/issues/IssueListPage.java
@@ -90,13 +90,13 @@ public class IssueListPage extends LayoutPage {
}
@Override
- protected void onSaveGlobalQueries(ArrayList<NamedIssueQuery> queries) {
+ protected void onSaveCommonQueries(ArrayList<NamedIssueQuery> queries) {
getIssueSetting().setNamedQueries(queries);
OneDev.getInstance(SettingManager.class).saveIssueSetting(getIssueSetting());
}
@Override
- protected ArrayList<NamedIssueQuery> getGlobalQueries() {
+ protected ArrayList<NamedIssueQuery> getCommonQueries() {
return (ArrayList<NamedIssueQuery>) getIssueSetting().getNamedQueries();
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java
index 76d1a69c9b..bd6f00173f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.java
@@ -85,12 +85,12 @@ public class ProjectListPage extends LayoutPage {
}
@Override
- protected ArrayList<NamedProjectQuery> getGlobalQueries() {
+ protected ArrayList<NamedProjectQuery> getCommonQueries() {
return (ArrayList<NamedProjectQuery>) getProjectSetting().getNamedQueries();
}
@Override
- protected void onSaveGlobalQueries(ArrayList<NamedProjectQuery> namedQueries) {
+ protected void onSaveCommonQueries(ArrayList<NamedProjectQuery> namedQueries) {
getProjectSetting().setNamedQueries(namedQueries);
OneDev.getInstance(SettingManager.class).saveProjectSetting(getProjectSetting());
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java
index 37651398cf..24fa7ced2d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/ProjectBuildsPage.java
@@ -27,8 +27,8 @@ import io.onedev.server.model.support.build.NamedBuildQuery;
import io.onedev.server.model.support.build.ProjectBuildSetting;
import io.onedev.server.web.component.build.list.BuildListPanel;
import io.onedev.server.web.component.modal.ModalPanel;
-import io.onedev.server.web.component.savedquery.PersonalQuerySupport;
import io.onedev.server.web.component.savedquery.NamedQueriesBean;
+import io.onedev.server.web.component.savedquery.PersonalQuerySupport;
import io.onedev.server.web.component.savedquery.SaveQueryPanel;
import io.onedev.server.web.component.savedquery.SavedQueriesPanel;
import io.onedev.server.web.page.project.ProjectPage;
@@ -85,19 +85,22 @@ public class ProjectBuildsPage extends ProjectPage {
}
@Override
- protected ArrayList<NamedBuildQuery> getGlobalQueries() {
- return (ArrayList<NamedBuildQuery>) getProject().getBuildSetting().getNamedQueries(false);
+ protected ArrayList<NamedBuildQuery> getCommonQueries() {
+ return (ArrayList<NamedBuildQuery>) getProject().getBuildSetting().getNamedQueries();
}
@Override
- protected void onSaveGlobalQueries(ArrayList<NamedBuildQuery> namedQueries) {
+ protected void onSaveCommonQueries(ArrayList<NamedBuildQuery> namedQueries) {
getProject().getBuildSetting().setNamedQueries(namedQueries);
OneDev.getInstance(ProjectManager.class).save(getProject());
}
@Override
- protected ArrayList<NamedBuildQuery> getDefaultQueries() {
- return (ArrayList<NamedBuildQuery>) getBuildSetting().getNamedQueries();
+ protected ArrayList<NamedBuildQuery> getInheritedCommonQueries() {
+ if (getProject().getParent() != null)
+ return (ArrayList<NamedBuildQuery>) getProject().getParent().getNamedBuildQueries();
+ else
+ return (ArrayList<NamedBuildQuery>) getBuildSetting().getNamedQueries();
}
});
@@ -174,12 +177,12 @@ public class ProjectBuildsPage extends ProjectPage {
@Override
protected void onSave(AjaxRequestTarget target, String name) {
ProjectBuildSetting setting = getProject().getBuildSetting();
- if (setting.getNamedQueries(false) == null)
+ if (setting.getNamedQueries() == null)
setting.setNamedQueries(new ArrayList<>(getBuildSetting().getNamedQueries()));
- NamedBuildQuery namedQuery = getProject().getBuildSetting().getNamedQuery(name);
+ NamedBuildQuery namedQuery = getProject().getNamedBuildQuery(name);
if (namedQuery == null) {
namedQuery = new NamedBuildQuery(name, query);
- setting.getNamedQueries(false).add(namedQuery);
+ setting.getNamedQueries().add(namedQuery);
} else {
namedQuery.setQuery(query);
}
@@ -237,8 +240,8 @@ public class ProjectBuildsPage extends ProjectPage {
if (project.getBuildQueryPersonalizationOfCurrentUser() != null
&& !project.getBuildQueryPersonalizationOfCurrentUser().getQueries().isEmpty()) {
query = project.getBuildQueryPersonalizationOfCurrentUser().getQueries().iterator().next().getQuery();
- } else if (!project.getBuildSetting().getNamedQueries(true).isEmpty()) {
- query = project.getBuildSetting().getNamedQueries(true).iterator().next().getQuery();
+ } else if (!project.getNamedBuildQueries().isEmpty()) {
+ query = project.getNamedBuildQueries().iterator().next().getQuery();
}
return paramsOf(project, query, page);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java
index dedb02049e..c2d6a540bc 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/ProjectCodeCommentsPage.java
@@ -85,12 +85,12 @@ public class ProjectCodeCommentsPage extends ProjectPage {
}
@Override
- protected ArrayList<NamedCodeCommentQuery> getGlobalQueries() {
+ protected ArrayList<NamedCodeCommentQuery> getCommonQueries() {
return getProject().getNamedCodeCommentQueries();
}
@Override
- protected void onSaveGlobalQueries(ArrayList<NamedCodeCommentQuery> projectQueries) {
+ protected void onSaveCommonQueries(ArrayList<NamedCodeCommentQuery> projectQueries) {
getProject().setNamedCodeCommentQueries(projectQueries);
OneDev.getInstance(ProjectManager.class).save(getProject());
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
index bd7411654a..dd0617fc7f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
@@ -87,12 +87,12 @@ public class ProjectCommitsPage extends ProjectPage {
}
@Override
- protected ArrayList<NamedCommitQuery> getGlobalQueries() {
+ protected ArrayList<NamedCommitQuery> getCommonQueries() {
return getProject().getNamedCommitQueries();
}
@Override
- protected void onSaveGlobalQueries(ArrayList<NamedCommitQuery> projectQueries) {
+ protected void onSaveCommonQueries(ArrayList<NamedCommitQuery> projectQueries) {
getProject().setNamedCommitQueries(projectQueries);
OneDev.getInstance(ProjectManager.class).save(getProject());
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java
index 706623efce..65701765c4 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java
@@ -43,6 +43,7 @@ import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.MilestoneManager;
import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
@@ -89,7 +90,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {
private static final String PARAM_BACKLOG_QUERY = "backlog-query";
- private final List<BoardSpec> boards;
+ private List<BoardSpec> boards;
private final int boardIndex;
@@ -174,7 +175,16 @@ public class IssueBoardsPage extends ProjectIssuesPage {
public IssueBoardsPage(PageParameters params) {
super(params);
- boards = getProject().getIssueSetting().getBoardSpecs(true);
+ Project current = getProject();
+ do {
+ boards = current.getIssueSetting().getBoardSpecs();
+ if (boards != null)
+ break;
+ current = current.getParent();
+ } while (current != null);
+
+ if (boards == null)
+ boards = OneDev.getInstance(SettingManager.class).getIssueSetting().getBoardSpecs();
String boardName = params.get(PARAM_BOARD).toString();
if (StringUtils.isNotBlank(boardName)) {
@@ -295,7 +305,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {
protected void onConfigure() {
super.onConfigure();
setVisible(SecurityUtils.canManageIssues(getProject())
- && getProject().getIssueSetting().getBoardSpecs(false) != null);
+ && getProject().getIssueSetting().getBoardSpecs() != null);
}
}.add(new ConfirmClickModifier("This will discard all project specific boards, do you want to continue?")));
@@ -821,7 +831,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {
protected void onConfigure() {
super.onConfigure();
setVisible(SecurityUtils.canManageIssues(getProject())
- && getProject().getIssueSetting().getBoardSpecs(false) != null);
+ && getProject().getIssueSetting().getBoardSpecs() != null);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java
index df16d2f325..8e3bef5291 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java
@@ -25,8 +25,8 @@ import io.onedev.server.model.support.issue.NamedIssueQuery;
import io.onedev.server.model.support.issue.ProjectIssueSetting;
import io.onedev.server.web.component.issue.list.IssueListPanel;
import io.onedev.server.web.component.modal.ModalPanel;
-import io.onedev.server.web.component.savedquery.PersonalQuerySupport;
import io.onedev.server.web.component.savedquery.NamedQueriesBean;
+import io.onedev.server.web.component.savedquery.PersonalQuerySupport;
import io.onedev.server.web.component.savedquery.SaveQueryPanel;
import io.onedev.server.web.component.savedquery.SavedQueriesPanel;
import io.onedev.server.web.page.project.issues.ProjectIssuesPage;
@@ -79,19 +79,22 @@ public class ProjectIssueListPage extends ProjectIssuesPage {
}
@Override
- protected ArrayList<NamedIssueQuery> getGlobalQueries() {
- return (ArrayList<NamedIssueQuery>) getProject().getIssueSetting().getNamedQueries(false);
+ protected ArrayList<NamedIssueQuery> getCommonQueries() {
+ return (ArrayList<NamedIssueQuery>) getProject().getIssueSetting().getNamedQueries();
}
@Override
- protected void onSaveGlobalQueries(ArrayList<NamedIssueQuery> namedQueries) {
+ protected void onSaveCommonQueries(ArrayList<NamedIssueQuery> namedQueries) {
getProject().getIssueSetting().setNamedQueries(namedQueries);
OneDev.getInstance(ProjectManager.class).save(getProject());
}
@Override
- protected ArrayList<NamedIssueQuery> getDefaultQueries() {
- return (ArrayList<NamedIssueQuery>) getIssueSetting().getNamedQueries();
+ protected ArrayList<NamedIssueQuery> getInheritedCommonQueries() {
+ if (getProject().getParent() != null)
+ return (ArrayList<NamedIssueQuery>) getProject().getParent().getNamedIssueQueries();
+ else
+ return (ArrayList<NamedIssueQuery>) getIssueSetting().getNamedQueries();
}
});
@@ -170,12 +173,12 @@ public class ProjectIssueListPage extends ProjectIssuesPage {
@Override
protected void onSave(AjaxRequestTarget target, String name) {
ProjectIssueSetting setting = getProject().getIssueSetting();
- if (setting.getNamedQueries(false) == null)
+ if (setting.getNamedQueries() == null)
setting.setNamedQueries(new ArrayList<>(getIssueSetting().getNamedQueries()));
- NamedIssueQuery namedQuery = setting.getNamedQuery(name);
+ NamedIssueQuery namedQuery = getProject().getNamedIssueQuery(name);
if (namedQuery == null) {
namedQuery = new NamedIssueQuery(name, query);
- setting.getNamedQueries(false).add(namedQuery);
+ setting.getNamedQueries().add(namedQuery);
} else {
namedQuery.setQuery(query);
}
@@ -233,8 +236,8 @@ public class ProjectIssueListPage extends ProjectIssuesPage {
if (project.getIssueQueryPersonalizationOfCurrentUser() != null
&& !project.getIssueQueryPersonalizationOfCurrentUser().getQueries().isEmpty()) {
query = project.getIssueQueryPersonalizationOfCurrentUser().getQueries().iterator().next().getQuery();
- } else if (!project.getIssueSetting().getNamedQueries(true).isEmpty()) {
- query = project.getIssueSetting().getNamedQueries(true).iterator().next().getQuery();
+ } else if (!project.getNamedIssueQueries().isEmpty()) {
+ query = project.getNamedIssueQueries().iterator().next().getQuery();
}
return paramsOf(project, query, page);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java
index 7ad521f3bb..e82ee48eb7 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.java
@@ -28,8 +28,8 @@ import io.onedev.server.model.support.pullrequest.ProjectPullRequestSetting;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.component.pullrequest.list.PullRequestListPanel;
-import io.onedev.server.web.component.savedquery.PersonalQuerySupport;
import io.onedev.server.web.component.savedquery.NamedQueriesBean;
+import io.onedev.server.web.component.savedquery.PersonalQuerySupport;
import io.onedev.server.web.component.savedquery.SaveQueryPanel;
import io.onedev.server.web.component.savedquery.SavedQueriesPanel;
import io.onedev.server.web.page.project.ProjectPage;
@@ -86,17 +86,20 @@ public class ProjectPullRequestsPage extends ProjectPage {
}
@Override
- protected ArrayList<NamedPullRequestQuery> getGlobalQueries() {
- return (ArrayList<NamedPullRequestQuery>) getProject().getPullRequestSetting().getNamedQueries(false);
+ protected ArrayList<NamedPullRequestQuery> getCommonQueries() {
+ return (ArrayList<NamedPullRequestQuery>) getProject().getPullRequestSetting().getNamedQueries();
}
@Override
- protected ArrayList<NamedPullRequestQuery> getDefaultQueries() {
- return (ArrayList<NamedPullRequestQuery>) getPullRequestSetting().getNamedQueries();
+ protected ArrayList<NamedPullRequestQuery> getInheritedCommonQueries() {
+ if (getProject().getParent() != null)
+ return (ArrayList<NamedPullRequestQuery>) getProject().getParent().getNamedPullRequestQueries();
+ else
+ return (ArrayList<NamedPullRequestQuery>) getPullRequestSetting().getNamedQueries();
}
@Override
- protected void onSaveGlobalQueries(ArrayList<NamedPullRequestQuery> namedQueries) {
+ protected void onSaveCommonQueries(ArrayList<NamedPullRequestQuery> namedQueries) {
getProject().getPullRequestSetting().setNamedQueries(namedQueries);
OneDev.getInstance(ProjectManager.class).save(getProject());
}
@@ -177,12 +180,12 @@ public class ProjectPullRequestsPage extends ProjectPage {
@Override
protected void onSave(AjaxRequestTarget target, String name) {
ProjectPullRequestSetting setting = getProject().getPullRequestSetting();
- if (setting.getNamedQueries(false) == null)
+ if (setting.getNamedQueries() == null)
setting.setNamedQueries(new ArrayList<>(getPullRequestSetting().getNamedQueries()));
- NamedPullRequestQuery namedQuery = setting.getNamedQuery(name);
+ NamedPullRequestQuery namedQuery = getProject().getNamedPullRequestQuery(name);
if (namedQuery == null) {
namedQuery = new NamedPullRequestQuery(name, query);
- setting.getNamedQueries(false).add(namedQuery);
+ setting.getNamedQueries().add(namedQuery);
} else {
namedQuery.setQuery(query);
}
@@ -245,8 +248,8 @@ public class ProjectPullRequestsPage extends ProjectPage {
if (project.getPullRequestQueryPersonalizationOfCurrentUser() != null
&& !project.getPullRequestQueryPersonalizationOfCurrentUser().getQueries().isEmpty()) {
query = project.getPullRequestQueryPersonalizationOfCurrentUser().getQueries().iterator().next().getQuery();
- } else if (!project.getPullRequestSetting().getNamedQueries(true).isEmpty()) {
- query = project.getPullRequestSetting().getNamedQueries(true).iterator().next().getQuery();
+ } else if (!project.getNamedPullRequestQueries().isEmpty()) {
+ query = project.getNamedPullRequestQueries().iterator().next().getQuery();
}
return paramsOf(project, query, page);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.java b/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.java
index 4b8ed0065c..c391d05b98 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/pullrequests/PullRequestListPage.java
@@ -80,13 +80,13 @@ public class PullRequestListPage extends LayoutPage {
}
@Override
- protected void onSaveGlobalQueries(ArrayList<NamedPullRequestQuery> queries) {
+ protected void onSaveCommonQueries(ArrayList<NamedPullRequestQuery> queries) {
getPullRequestSetting().setNamedQueries(queries);
OneDev.getInstance(SettingManager.class).savePullRequestSetting(getPullRequestSetting());
}
@Override
- protected ArrayList<NamedPullRequestQuery> getGlobalQueries() {
+ protected ArrayList<NamedPullRequestQuery> getCommonQueries() {
return (ArrayList<NamedPullRequestQuery>) getPullRequestSetting().getNamedQueries();
}