The Unified and Autonomous Development Platform
Add global issue list
Robin Shenbaf06e8187e3
diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.javaindex a016e087f0..1257a5ac52 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/IssueManager.java@@ -15,9 +15,9 @@ import io.onedev.server.persistence.dao.EntityManager;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.issue.IssueCriteria;import io.onedev.server.util.ValueSetEdit;-import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldResolution;-import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;-import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedStateResolution;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;public interface IssueManager extends EntityManager<Issue> {@@ -26,9 +26,9 @@ public interface IssueManager extends EntityManager<Issue> {void open(Issue issue);- List<Issue> query(Project project, User user, EntityQuery<Issue> issueQuery, int firstResult, int maxResults);+ List<Issue> query(@Nullable Project project, User user, EntityQuery<Issue> issueQuery, int firstResult, int maxResults);- int count(Project project, User user, @Nullable IssueCriteria issueCriteria);+ int count(@Nullable Project project, User user, @Nullable IssueCriteria issueCriteria);List<Issue> query(Project project, @Nullable String term, int count);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.javaindex 6862311cba..a7746c5942 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java@@ -6,7 +6,7 @@ import javax.annotation.Nullable;import io.onedev.server.model.Setting;import io.onedev.server.model.support.administration.BackupSetting;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.model.support.administration.GroovyScript;import io.onedev.server.model.support.administration.MailSetting;import io.onedev.server.model.support.administration.SecuritySetting;@@ -93,9 +93,9 @@ public interface SettingManager extends EntityManager<Setting> {void saveSecuritySetting(SecuritySetting securitySetting);- GlobalIssueSetting getIssueSetting();+ IssueSetting getIssueSetting();- void saveIssueSetting(GlobalIssueSetting issueSetting);+ void saveIssueSetting(IssueSetting issueSetting);@NullableAuthenticator getAuthenticator();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.javaindex 5524c3fbc7..6afb4ec327 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@@ -263,10 +263,9 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsEntityCriteria<Build> criteria = newCriteria();criteria.add(Restrictions.eq("project", project));- Collection<String> accessibleJobNames = getAccessibleJobNames(project, user);- if (accessibleJobNames != null) {+ if (!User.asSubject(user).isPermitted(new ProjectPermission(project, new ManageProject()))) {List<Criterion> jobCriterions = new ArrayList<>();- for (String jobName: accessibleJobNames)+ for (String jobName: getAccessibleJobNames(project, user))jobCriterions.add(Restrictions.eq("jobName", jobName));criteria.add(Restrictions.or(jobCriterions.toArray(new Criterion[jobCriterions.size()])));}@@ -313,10 +312,9 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsList<Predicate> predicates = new ArrayList<>();predicates.add(builder.equal(root.get(BuildConstants.ATTR_PROJECT), project));- Collection<String> accessibleJobNames = getAccessibleJobNames(project, user);- if (accessibleJobNames != null) {+ if (!User.asSubject(user).isPermitted(new ProjectPermission(project, new ManageProject()))) {List<Predicate> jobPredicates = new ArrayList<>();- for (String jobName: accessibleJobNames)+ for (String jobName: getAccessibleJobNames(project, user))jobPredicates.add(builder.equal(root.get(BuildConstants.ATTR_JOB), jobName));predicates.add(builder.or(jobPredicates.toArray(new Predicate[jobPredicates.size()])));}@@ -592,34 +590,30 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implements}return accessibleJobNames;}-+private Collection<String> getAccessibleJobNames(Project project, User user) {- if (User.asSubject(user).isPermitted(new ProjectPermission(project, new ManageProject()))) {- return null;- } else {- Collection<String> jobNames = getJobNames(project.getId());- Collection<String> accessibleJobNames = new HashSet<>();- if (user != null) {- for (UserAuthorization authorization: user.getAuthorizations()) {- if (authorization.getProject().equals(project))- accessibleJobNames.addAll(getAccessibleJobNames(authorization.getRole(), jobNames));- }- for (Group group: user.getGroups()) {- for (GroupAuthorization authorization: group.getAuthorizations()) {- if (authorization.getProject().equals(project))- accessibleJobNames.addAll(getAccessibleJobNames(authorization.getRole(), jobNames));- }- }+ Collection<String> jobNames = getJobNames(project.getId());+ Collection<String> accessibleJobNames = new HashSet<>();+ if (user != null) {+ for (UserAuthorization authorization: user.getProjectAuthorizations()) {+ if (authorization.getProject().equals(project))+ accessibleJobNames.addAll(getAccessibleJobNames(authorization.getRole(), jobNames));}- Group group = groupManager.findAnonymous();- if (group != null) {- for (GroupAuthorization authorization: group.getAuthorizations()) {+ for (Group group: user.getGroups()) {+ for (GroupAuthorization authorization: group.getProjectAuthorizations()) {if (authorization.getProject().equals(project))accessibleJobNames.addAll(getAccessibleJobNames(authorization.getRole(), jobNames));}}- return accessibleJobNames;}+ Group group = groupManager.findAnonymous();+ if (group != null) {+ for (GroupAuthorization authorization: group.getProjectAuthorizations()) {+ if (authorization.getProject().equals(project))+ accessibleJobNames.addAll(getAccessibleJobNames(authorization.getRole(), jobNames));+ }+ }+ return accessibleJobNames;}private void populateAccessibleJobNames(Map<Long, Collection<String>> accessibleJobNames, Map<Long, Collection<String>> jobNames,@@ -654,16 +648,16 @@ public class DefaultBuildManager extends AbstractEntityManager<Build> implementsMap<Long, Collection<String>> accessibleJobNames = new HashMap<>();if (user != null) {- for (UserAuthorization authorization: user.getAuthorizations())+ for (UserAuthorization authorization: user.getProjectAuthorizations())populateAccessibleJobNames(accessibleJobNames, jobNames, authorization.getProject(), authorization.getRole());for (Group group: user.getGroups()) {- for (GroupAuthorization authorization: group.getAuthorizations())+ for (GroupAuthorization authorization: group.getProjectAuthorizations())populateAccessibleJobNames(accessibleJobNames, jobNames, authorization.getProject(), authorization.getRole());}}Group group = groupManager.findAnonymous();if (group != null) {- for (GroupAuthorization authorization: group.getAuthorizations())+ for (GroupAuthorization authorization: group.getProjectAuthorizations())populateAccessibleJobNames(accessibleJobNames, jobNames, authorization.getProject(), authorization.getRole());}return accessibleJobNames;diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildQuerySettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildQuerySettingManager.javaindex 3aa8aec522..1acb28c193 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildQuerySettingManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildQuerySettingManager.java@@ -39,9 +39,9 @@ public class DefaultBuildQuerySettingManager extends AbstractEntityManager<Buildpublic void save(BuildQuerySetting setting) {setting.getQuerySubscriptionSupport().getUserQuerySubscriptions().retainAll(setting.getUserQueries().stream().map(it->it.getName()).collect(Collectors.toSet()));- setting.getQuerySubscriptionSupport().getProjectQuerySubscriptions().retainAll(- setting.getProject().getSavedBuildQueries().stream().map(it->it.getName()).collect(Collectors.toSet()));- if (setting.getQuerySubscriptionSupport().getProjectQuerySubscriptions().isEmpty() && setting.getUserQueries().isEmpty()) {+ setting.getQuerySubscriptionSupport().getQuerySubscriptions().retainAll(+ setting.getProject().getNamedBuildQueries().stream().map(it->it.getName()).collect(Collectors.toSet()));+ if (setting.getQuerySubscriptionSupport().getQuerySubscriptions().isEmpty() && setting.getUserQueries().isEmpty()) {if (!setting.isNew())delete(setting);} else {diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCommitQuerySettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCommitQuerySettingManager.javaindex acebf637ec..b395f29ca6 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCommitQuerySettingManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultCommitQuerySettingManager.java@@ -39,9 +39,9 @@ public class DefaultCommitQuerySettingManager extends AbstractEntityManager<Commpublic void save(CommitQuerySetting setting) {setting.getQuerySubscriptionSupport().getUserQuerySubscriptions().retainAll(setting.getUserQueries().stream().map(it->it.getName()).collect(Collectors.toSet()));- setting.getQuerySubscriptionSupport().getProjectQuerySubscriptions().retainAll(- setting.getProject().getSavedCommitQueries().stream().map(it->it.getName()).collect(Collectors.toSet()));- if (setting.getQuerySubscriptionSupport().getProjectQuerySubscriptions().isEmpty() && setting.getUserQueries().isEmpty()) {+ setting.getQuerySubscriptionSupport().getQuerySubscriptions().retainAll(+ setting.getProject().getNamedCommitQueries().stream().map(it->it.getName()).collect(Collectors.toSet()));+ if (setting.getQuerySubscriptionSupport().getQuerySubscriptions().isEmpty() && setting.getUserQueries().isEmpty()) {if (!setting.isNew())delete(setting);} else {diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupAuthorizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupAuthorizationManager.javaindex 5799332b4b..6d2ef92d12 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupAuthorizationManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultGroupAuthorizationManager.java@@ -25,7 +25,7 @@ public class DefaultGroupAuthorizationManager extends AbstractEntityManager<Grou@Transactional@Overridepublic void authorize(Group group, Collection<GroupAuthorization> authorizations) {- for (Iterator<GroupAuthorization> it = group.getAuthorizations().iterator(); it.hasNext();) {+ for (Iterator<GroupAuthorization> it = group.getProjectAuthorizations().iterator(); it.hasNext();) {GroupAuthorization authorization = it.next();boolean found = false;for (GroupAuthorization newAuthorization: authorizations) {@@ -43,14 +43,14 @@ public class DefaultGroupAuthorizationManager extends AbstractEntityManager<Groufor (GroupAuthorization newAuthorization: authorizations) {boolean found = false;- for (GroupAuthorization authorization: group.getAuthorizations()) {+ for (GroupAuthorization authorization: group.getProjectAuthorizations()) {if (authorization.getProject().equals(newAuthorization.getProject())) {found = true;break;}}if (!found) {- group.getAuthorizations().add(newAuthorization);+ group.getProjectAuthorizations().add(newAuthorization);save(newAuthorization);}}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.javaindex 3c6109c0ce..f2fa8e2705 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@@ -39,6 +39,7 @@ import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.IssueQuerySettingManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.event.entity.EntityRemoved;import io.onedev.server.event.issue.IssueCommitted;import io.onedev.server.event.issue.IssueEvent;@@ -50,7 +51,7 @@ import io.onedev.server.model.IssueQuerySetting;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;import io.onedev.server.model.support.issue.NamedIssueQuery;import io.onedev.server.model.support.issue.StateSpec;@@ -69,11 +70,12 @@ import io.onedev.server.search.entity.issue.IssueCriteria;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.MilestoneCriteria;import io.onedev.server.util.IssueConstants;+import io.onedev.server.util.SecurityUtils;import io.onedev.server.util.ValueSetEdit;import io.onedev.server.util.facade.IssueFacade;-import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldResolution;-import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;-import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedStateResolution;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;@Singletonpublic class DefaultIssueManager extends AbstractEntityManager<Issue> implements IssueManager {@@ -90,6 +92,8 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsprivate final ProjectManager projectManager;+ private final UserManager userManager;+private final TransactionManager transactionManager;private final Map<Long, IssueFacade> issues = new HashMap<>();@@ -99,7 +103,8 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Injectpublic DefaultIssueManager(Dao dao, IssueFieldManager issueFieldManager,TransactionManager transactionManager, IssueQuerySettingManager issueQuerySettingManager,- SettingManager settingManager, ListenerRegistry listenerRegistry, ProjectManager projectManager) {+ SettingManager settingManager, ListenerRegistry listenerRegistry,+ ProjectManager projectManager, UserManager userManager) {super(dao);this.issueFieldManager = issueFieldManager;this.issueQuerySettingManager = issueQuerySettingManager;@@ -107,6 +112,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsthis.settingManager = settingManager;this.projectManager = projectManager;this.transactionManager = transactionManager;+ this.userManager = userManager;}@SuppressWarnings("unchecked")@@ -167,9 +173,17 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements});}- private Predicate[] getPredicates(io.onedev.server.search.entity.EntityCriteria<Issue> criteria, Project project, Root<Issue> root, CriteriaBuilder builder, User user) {+ private Predicate[] getPredicates(io.onedev.server.search.entity.EntityCriteria<Issue> criteria,+ @Nullable Project project, Root<Issue> root, CriteriaBuilder builder, User user) {List<Predicate> predicates = new ArrayList<>();- predicates.add(builder.equal(root.get("project"), project));+ if (project != null) {+ predicates.add(builder.equal(root.get("project"), project));+ } else if (!SecurityUtils.isAdministrator()) {+ List<Predicate> projectPredicates = new ArrayList<>();+ for (Project each: projectManager.getAccessibleProjects(user))+ projectPredicates.add(builder.equal(root.get(IssueConstants.ATTR_PROJECT), each));+ predicates.add(builder.or(projectPredicates.toArray(new Predicate[projectPredicates.size()])));+ }if (criteria != null)predicates.add(criteria.getPredicate(project, root, builder, user));return predicates.toArray(new Predicate[0]);@@ -206,13 +220,14 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsreturn query;}- private GlobalIssueSetting getGlobalIssueSetting() {+ private IssueSetting getIssueSetting() {return settingManager.getIssueSetting();}@Sessional@Override- public List<Issue> query(Project project, User user, io.onedev.server.search.entity.EntityQuery<Issue> issueQuery, int firstResult, int maxResults) {+ public List<Issue> query(@Nullable Project project, User user, io.onedev.server.search.entity.EntityQuery<Issue> issueQuery,+ int firstResult, int maxResults) {CriteriaQuery<Issue> criteriaQuery = buildCriteriaQuery(getSession(), project, issueQuery, user);Query<Issue> query = getSession().createQuery(criteriaQuery);query.setFirstResult(firstResult);@@ -233,7 +248,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Sessional@Override- public int count(Project project, User user, IssueCriteria issueCriteria) {+ public int count(@Nullable Project project, User user, IssueCriteria issueCriteria) {CriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);Root<Issue> root = criteriaQuery.from(Issue.class);@@ -247,7 +262,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Overridepublic int count(Milestone milestone, User user, @Nullable StateSpec.Category category) {if (category != null) {- IssueCriteria criteria = getGlobalIssueSetting().getCategoryCriteria(category);+ IssueCriteria criteria = getIssueSetting().getCategoryCriteria(category);if (criteria != null) {List<IssueCriteria> criterias = new ArrayList<>();criterias.add(new MilestoneCriteria(milestone.getName()));@@ -268,27 +283,33 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementspublic Collection<String> getUndefinedStates() {Query<String> query = getSession().createQuery("select distinct state from Issue");- Set<String> undefinedStates = new HashSet<>(query.getResultList());+ Collection<String> undefinedStates = new HashSet<>(query.getResultList());for (Iterator<String> it = undefinedStates.iterator(); it.hasNext();) {- if (getGlobalIssueSetting().getStateSpec(it.next()) != null)+ if (getIssueSetting().getStateSpec(it.next()) != null)it.remove();}- for (Project project: projectManager.query()) {+ for (Project project: projectManager.query())undefinedStates.addAll(project.getIssueSetting().getUndefinedStates(project));- }- for (IssueQuerySetting setting: issueQuerySettingManager.query()) {- for (NamedIssueQuery namedQuery: setting.getUserQueries()) {- try {- undefinedStates.addAll(IssueQuery.parse(setting.getProject(), namedQuery.getQuery(), false).getUndefinedStates());- } catch (Exception e) {- }- }- }+ for (IssueQuerySetting setting: issueQuerySettingManager.query())+ populateUndefinedStates(undefinedStates, setting.getProject(), setting.getUserQueries());++ for (User user: userManager.query())+ populateUndefinedStates(undefinedStates, null, user.getIssueQuerySetting().getUserQueries());return undefinedStates;}++ private void populateUndefinedStates(Collection<String> undefinedStates, @Nullable Project project,+ List<NamedIssueQuery> namedQueries) {+ for (NamedIssueQuery namedQuery: namedQueries) {+ try {+ undefinedStates.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false).getUndefinedStates());+ } catch (Exception e) {+ }+ }+ }@Transactional@Override@@ -300,21 +321,26 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsquery.executeUpdate();}- for (Project project: projectManager.query()) {+ for (Project project: projectManager.query())project.getIssueSetting().fixUndefinedStates(resolutions);- }- for (IssueQuerySetting setting: issueQuerySettingManager.query()) {- for (NamedIssueQuery namedQuery: setting.getUserQueries()) {- try {- IssueQuery query = IssueQuery.parse(setting.getProject(), namedQuery.getQuery(), false);- for (Map.Entry<String, UndefinedStateResolution> resolutionEntry: resolutions.entrySet())- query.onRenameState(resolutionEntry.getKey(), resolutionEntry.getValue().getNewState());- namedQuery.setQuery(query.toString());- } catch (Exception e) {- }+ for (IssueQuerySetting setting: issueQuerySettingManager.query())+ fixUndefinedStates(resolutions, setting.getProject(), setting.getUserQueries());++ for (User user: userManager.query())+ fixUndefinedStates(resolutions, null, user.getIssueQuerySetting().getUserQueries());+ }++ private void fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions,+ @Nullable Project project, List<NamedIssueQuery> namedQueries) {+ for (NamedIssueQuery namedQuery: namedQueries) {+ try {+ IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), false);+ for (Map.Entry<String, UndefinedStateResolution> resolutionEntry: resolutions.entrySet())+ query.onRenameState(resolutionEntry.getKey(), resolutionEntry.getValue().getNewState());+ namedQuery.setQuery(query.toString());+ } catch (Exception e) {}- issueQuerySettingManager.save(setting);}}@@ -361,22 +387,31 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsQuery<?> query = getSession().createQuery("select distinct name from IssueField");Set<String> undefinedFields = new HashSet<>();for (String fieldName: (List<String>)query.getResultList()) {- FieldSpec field = getGlobalIssueSetting().getFieldSpec(fieldName);+ FieldSpec field = getIssueSetting().getFieldSpec(fieldName);if (field == null)undefinedFields.add(fieldName);}- for (Project project: projectManager.query()) {++ for (Project project: projectManager.query())undefinedFields.addAll(project.getIssueSetting().getUndefinedFields(project));- }- for (IssueQuerySetting setting: issueQuerySettingManager.query()) {- for (NamedIssueQuery namedQuery: setting.getUserQueries()) {- try {- undefinedFields.addAll(IssueQuery.parse(setting.getProject(), namedQuery.getQuery(), false).getUndefinedFields());- } catch (Exception e) {- }++ for (IssueQuerySetting setting: issueQuerySettingManager.query())+ populateUndefinedFields(undefinedFields, setting.getProject(), setting.getUserQueries());++ for (User user: userManager.query())+ populateUndefinedFields(undefinedFields, null, user.getIssueQuerySetting().getUserQueries());++ return undefinedFields;+ }++ private void populateUndefinedFields(Collection<String> undefinedFields,+ @Nullable Project project, List<NamedIssueQuery> namedQueries) {+ for (NamedIssueQuery namedQuery: namedQueries) {+ try {+ undefinedFields.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false).getUndefinedFields());+ } catch (Exception e) {}}- return undefinedFields;}@Transactional@@ -395,34 +430,39 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsquery.executeUpdate();}- for (Project project: projectManager.query()) {+ for (Project project: projectManager.query())project.getIssueSetting().fixUndefinedFields(resolutions);- }- for (IssueQuerySetting setting: issueQuerySettingManager.query()) {- for (Iterator<NamedIssueQuery> it = setting.getUserQueries().iterator(); it.hasNext();) {- NamedIssueQuery namedQuery = it.next();- try {- IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);- boolean remove = false;- for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {- UndefinedFieldResolution resolution = entry.getValue();- if (resolution.getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD) {- query.onRenameField(entry.getKey(), resolution.getNewField());- } else if (query.onDeleteField(entry.getKey())) {- remove = true;- break;- }- }- if (remove)- it.remove();- else- namedQuery.setQuery(query.toString());- } catch (Exception e) {- }+ for (IssueQuerySetting setting: issueQuerySettingManager.query())+ fixUndefinedFields(resolutions, setting.getProject(), setting.getUserQueries());++ for (User user: userManager.query())+ fixUndefinedFields(resolutions, null, user.getIssueQuerySetting().getUserQueries());+ }++ private void fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions,+ @Nullable Project project, List<NamedIssueQuery> namedQueries) {+ for (Iterator<NamedIssueQuery> it = namedQueries.iterator(); it.hasNext();) {+ NamedIssueQuery namedQuery = it.next();+ try {+ IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), false);+ boolean remove = false;+ for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {+ UndefinedFieldResolution resolution = entry.getValue();+ if (resolution.getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD) {+ query.onRenameField(entry.getKey(), resolution.getNewField());+ } else if (query.onDeleteField(entry.getKey())) {+ remove = true;+ break;+ }+ }+ if (remove)+ it.remove();+ else+ namedQuery.setQuery(query.toString());+ } catch (Exception e) {}}-}@SuppressWarnings({ "unchecked", "rawtypes" })@@ -431,11 +471,11 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementspublic Collection<UndefinedFieldValue> getUndefinedFieldValues() {Query query = getSession().createQuery("select distinct name, value from IssueField where type=:choice");query.setParameter("choice", FieldSpec.ENUMERATION);- Set<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();+ Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();for (Object[] row: (List<Object[]>)query.getResultList()) {String fieldName = (String) row[0];String fieldValue = (String) row[1];- SpecifiedChoices specifiedChoices = SpecifiedChoices.of(getGlobalIssueSetting().getFieldSpec(fieldName));+ SpecifiedChoices specifiedChoices = SpecifiedChoices.of(getIssueSetting().getFieldSpec(fieldName));if (specifiedChoices != null && !specifiedChoices.getChoiceValues().contains(fieldValue)) {undefinedFieldValues.add(new UndefinedFieldValue(fieldName, fieldValue));}@@ -444,17 +484,24 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsfor (Project project: projectManager.query())undefinedFieldValues.addAll(project.getIssueSetting().getUndefinedFieldValues());- for (IssueQuerySetting setting: issueQuerySettingManager.query()) {- for (NamedIssueQuery namedQuery: setting.getUserQueries()) {- try {- undefinedFieldValues.addAll(IssueQuery.parse(setting.getProject(), namedQuery.getQuery(), false).getUndefinedFieldValues());- } catch (Exception e) {- }- }- }+ for (IssueQuerySetting setting: issueQuerySettingManager.query())+ populateUndefinedFieldValues(undefinedFieldValues, setting.getProject(), setting.getUserQueries());++ for (User user: userManager.query())+ populateUndefinedFieldValues(undefinedFieldValues, null, user.getIssueQuerySetting().getUserQueries());return undefinedFieldValues;}++ private void populateUndefinedFieldValues(Collection<UndefinedFieldValue> undefinedFieldValues,+ @Nullable Project project, List<NamedIssueQuery> namedQueries) {+ for (NamedIssueQuery namedQuery: namedQueries) {+ try {+ undefinedFieldValues.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false).getUndefinedFieldValues());+ } catch (Exception e) {+ }+ }+ }@SuppressWarnings("rawtypes")@Transactional@@ -480,19 +527,25 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsproject.getIssueSetting().fixUndefinedFieldValues(valueSetEdits);}- for (IssueQuerySetting setting: issueQuerySettingManager.query()) {- for (Iterator<NamedIssueQuery> it = setting.getUserQueries().iterator(); it.hasNext();) {- NamedIssueQuery namedQuery = it.next();- try {- IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);- if (query.fixUndefinedFieldValues(valueSetEdits))- it.remove();- else- namedQuery.setQuery(query.toString());- } catch (Exception e) {- }+ for (IssueQuerySetting setting: issueQuerySettingManager.query())+ fixUndefinedFieldValues(valueSetEdits, setting.getProject(), setting.getUserQueries());++ for (User user: userManager.query())+ fixUndefinedFieldValues(valueSetEdits, null, user.getIssueQuerySetting().getUserQueries());+ }++ private void fixUndefinedFieldValues(Map<String, ValueSetEdit> valueSetEdits,+ @Nullable Project project, List<NamedIssueQuery> namedQueries) {+ for (Iterator<NamedIssueQuery> it = namedQueries.iterator(); it.hasNext();) {+ NamedIssueQuery namedQuery = it.next();+ try {+ IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), false);+ if (query.fixUndefinedFieldValues(valueSetEdits))+ it.remove();+ else+ namedQuery.setQuery(query.toString());+ } catch (Exception e) {}- issueQuerySettingManager.save(setting);}}@@ -507,7 +560,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsString name = (String) row[0];String value = (String) row[1];long ordinal = (long) row[2];- SpecifiedChoices specifiedChoices = SpecifiedChoices.of(getGlobalIssueSetting().getFieldSpec(name));+ SpecifiedChoices specifiedChoices = SpecifiedChoices.of(getIssueSetting().getFieldSpec(name));if (specifiedChoices != null) {long newOrdinal = specifiedChoices.getChoiceValues().indexOf(value);if (ordinal != newOrdinal) {diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueQuerySettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueQuerySettingManager.javaindex bb14d550fd..36ba4a3133 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueQuerySettingManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueQuerySettingManager.java@@ -39,9 +39,9 @@ public class DefaultIssueQuerySettingManager extends AbstractEntityManager<Issuepublic void save(IssueQuerySetting setting) {setting.getQueryWatchSupport().getUserQueryWatches().keySet().retainAll(setting.getUserQueries().stream().map(it->it.getName()).collect(Collectors.toSet()));- setting.getQueryWatchSupport().getProjectQueryWatches().keySet().retainAll(- setting.getProject().getIssueSetting().getSavedQueries(true).stream().map(it->it.getName()).collect(Collectors.toSet()));- if (setting.getQueryWatchSupport().getProjectQueryWatches().isEmpty() && setting.getUserQueries().isEmpty()) {+ setting.getQueryWatchSupport().getQueryWatches().keySet().retainAll(+ setting.getProject().getIssueSetting().getNamedQueries(true).stream().map(it->it.getName()).collect(Collectors.toSet()));+ if (setting.getQueryWatchSupport().getQueryWatches().isEmpty() && setting.getUserQueries().isEmpty()) {if (!setting.isNew())delete(setting);} else {diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.javaindex 51e88f2393..b4b03c345c 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultMilestoneManager.java@@ -22,7 +22,7 @@ import io.onedev.server.event.issue.IssueOpened;import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.model.support.issue.StateSpec;import io.onedev.server.model.support.issue.changedata.IssueBatchUpdateData;import io.onedev.server.model.support.issue.changedata.IssueMilestoneChangeData;@@ -44,7 +44,7 @@ public class DefaultMilestoneManager extends AbstractEntityManager<Milestone> imthis.settingManager = settingManager;}- private GlobalIssueSetting getIssueSetting() {+ private IssueSetting getIssueSetting() {return settingManager.getIssueSetting();}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.javaindex ef8aa33fcf..8b95f7c628 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultProjectManager.java@@ -415,15 +415,15 @@ public class DefaultProjectManager extends AbstractEntityManager<Project> implem} else {if (user != null) {for (Membership membership: user.getMemberships()) {- for (GroupAuthorization authorization: membership.getGroup().getAuthorizations())+ for (GroupAuthorization authorization: membership.getGroup().getProjectAuthorizations())projects.add(authorization.getProject());}- for (UserAuthorization authorization: user.getAuthorizations())+ for (UserAuthorization authorization: user.getProjectAuthorizations())projects.add(authorization.getProject());}Group group = groupManager.findAnonymous();if (group != null) {- for (GroupAuthorization authorization: group.getAuthorizations())+ for (GroupAuthorization authorization: group.getProjectAuthorizations())projects.add(authorization.getProject());}}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestQuerySettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestQuerySettingManager.javaindex b633334391..20810971b3 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestQuerySettingManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestQuerySettingManager.java@@ -39,9 +39,9 @@ public class DefaultPullRequestQuerySettingManager extends AbstractEntityManagerpublic void save(PullRequestQuerySetting setting) {setting.getQueryWatchSupport().getUserQueryWatches().keySet().retainAll(setting.getUserQueries().stream().map(it->it.getName()).collect(Collectors.toSet()));- setting.getQueryWatchSupport().getProjectQueryWatches().keySet().retainAll(- setting.getProject().getIssueSetting().getSavedQueries(true).stream().map(it->it.getName()).collect(Collectors.toSet()));- if (setting.getQueryWatchSupport().getProjectQueryWatches().isEmpty() && setting.getUserQueries().isEmpty()) {+ setting.getQueryWatchSupport().getQueryWatches().keySet().retainAll(+ setting.getProject().getIssueSetting().getNamedQueries(true).stream().map(it->it.getName()).collect(Collectors.toSet()));+ if (setting.getQueryWatchSupport().getQueryWatches().isEmpty() && setting.getUserQueries().isEmpty()) {if (!setting.isNew())delete(setting);} else {diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.javaindex 44caa217c2..3cdae4906b 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java@@ -15,7 +15,7 @@ import io.onedev.server.maintenance.DataManager;import io.onedev.server.model.Setting;import io.onedev.server.model.Setting.Key;import io.onedev.server.model.support.administration.BackupSetting;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.model.support.administration.GroovyScript;import io.onedev.server.model.support.administration.MailSetting;import io.onedev.server.model.support.administration.SecuritySetting;@@ -160,7 +160,7 @@ public class DefaultSettingManager extends AbstractEntityManager<Setting> implem@Transactional@Override- public void saveIssueSetting(GlobalIssueSetting issueSetting) {+ public void saveIssueSetting(IssueSetting issueSetting) {Setting setting = getSetting(Key.ISSUE);if (setting == null) {setting = new Setting();@@ -172,7 +172,7 @@ public class DefaultSettingManager extends AbstractEntityManager<Setting> implem@Sessional@Override- public GlobalIssueSetting getIssueSetting() {+ public IssueSetting getIssueSetting() {Setting setting;if (issueSettingId == null) {setting = getSetting(Key.ISSUE);@@ -181,7 +181,7 @@ public class DefaultSettingManager extends AbstractEntityManager<Setting> implem} else {setting = load(issueSettingId);}- return (GlobalIssueSetting) setting.getValue();+ return (IssueSetting) setting.getValue();}@Transactionaldiff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserAuthorizationManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserAuthorizationManager.javaindex b229e4c60e..092f0b7fb3 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserAuthorizationManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultUserAuthorizationManager.java@@ -26,7 +26,7 @@ public class DefaultUserAuthorizationManager extends AbstractEntityManager<UserA@Transactional@Overridepublic void authorize(User user, Collection<UserAuthorization> authorizations) {- for (Iterator<UserAuthorization> it = user.getAuthorizations().iterator(); it.hasNext();) {+ for (Iterator<UserAuthorization> it = user.getProjectAuthorizations().iterator(); it.hasNext();) {UserAuthorization authorization = it.next();boolean found = false;for (UserAuthorization newAuthorization: authorizations) {@@ -44,14 +44,14 @@ public class DefaultUserAuthorizationManager extends AbstractEntityManager<UserAfor (UserAuthorization newAuthorization: authorizations) {boolean found = false;- for (UserAuthorization authorization: user.getAuthorizations()) {+ for (UserAuthorization authorization: user.getProjectAuthorizations()) {if (authorization.getProject().equals(newAuthorization.getProject())) {found = true;break;}}if (!found) {- user.getAuthorizations().add(newAuthorization);+ user.getProjectAuthorizations().add(newAuthorization);save(newAuthorization);}}diff --git a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.javaindex 316e2f4573..cd2807bc4e 100644--- a/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java+++ b/server-core/src/main/java/io/onedev/server/maintenance/DefaultDataManager.java@@ -41,7 +41,7 @@ import io.onedev.server.model.Setting;import io.onedev.server.model.Setting.Key;import io.onedev.server.model.User;import io.onedev.server.model.support.administration.BackupSetting;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.model.support.administration.MailSetting;import io.onedev.server.model.support.administration.SecuritySetting;import io.onedev.server.model.support.administration.SystemSetting;@@ -193,7 +193,7 @@ public class DefaultDataManager implements DataManager, Serializable {}setting = settingManager.getSetting(Key.ISSUE);if (setting == null) {- settingManager.saveIssueSetting(new GlobalIssueSetting());+ settingManager.saveIssueSetting(new IssueSetting());}setting = settingManager.getSetting(Key.AUTHENTICATOR);if (setting == null) {diff --git a/server-core/src/main/java/io/onedev/server/model/BuildQuerySetting.java b/server-core/src/main/java/io/onedev/server/model/BuildQuerySetting.javaindex 8c8c05a39f..21530a22ee 100644--- a/server-core/src/main/java/io/onedev/server/model/BuildQuerySetting.java+++ b/server-core/src/main/java/io/onedev/server/model/BuildQuerySetting.java@@ -23,7 +23,7 @@ import io.onedev.server.util.watch.QueryWatchSupport;indexes={@Index(columnList="o_project_id"), @Index(columnList="o_user_id")},uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "o_user_id"})})-public class BuildQuerySetting extends QuerySetting<NamedBuildQuery> {+public class BuildQuerySetting extends AbstractEntity implements QuerySetting<NamedBuildQuery> {private static final long serialVersionUID = 1L;@@ -45,7 +45,7 @@ public class BuildQuerySetting extends QuerySetting<NamedBuildQuery> {@Lob@Column(nullable=false, length=65535)- private LinkedHashSet<String> projectQuerySubscriptions = new LinkedHashSet<>();+ private LinkedHashSet<String> querySubscriptions = new LinkedHashSet<>();@Overridepublic Project getProject() {@@ -90,11 +90,11 @@ public class BuildQuerySetting extends QuerySetting<NamedBuildQuery> {}@Override- public LinkedHashSet<String> getProjectQuerySubscriptions() {- return projectQuerySubscriptions;+ public LinkedHashSet<String> getQuerySubscriptions() {+ return querySubscriptions;}};}-+}diff --git a/server-core/src/main/java/io/onedev/server/model/CodeCommentQuerySetting.java b/server-core/src/main/java/io/onedev/server/model/CodeCommentQuerySetting.javaindex 531b20d231..be9e6f994d 100644--- a/server-core/src/main/java/io/onedev/server/model/CodeCommentQuerySetting.java+++ b/server-core/src/main/java/io/onedev/server/model/CodeCommentQuerySetting.java@@ -22,7 +22,7 @@ import io.onedev.server.util.watch.QueryWatchSupport;indexes={@Index(columnList="o_project_id"), @Index(columnList="o_user_id")},uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "o_user_id"})})-public class CodeCommentQuerySetting extends QuerySetting<NamedCodeCommentQuery> {+public class CodeCommentQuerySetting extends AbstractEntity implements QuerySetting<NamedCodeCommentQuery> {private static final long serialVersionUID = 1L;diff --git a/server-core/src/main/java/io/onedev/server/model/CommitQuerySetting.java b/server-core/src/main/java/io/onedev/server/model/CommitQuerySetting.javaindex d47e111665..49099126f1 100644--- a/server-core/src/main/java/io/onedev/server/model/CommitQuerySetting.java+++ b/server-core/src/main/java/io/onedev/server/model/CommitQuerySetting.java@@ -23,7 +23,7 @@ import io.onedev.server.util.watch.QueryWatchSupport;indexes={@Index(columnList="o_project_id"), @Index(columnList="o_user_id")},uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "o_user_id"})})-public class CommitQuerySetting extends QuerySetting<NamedCommitQuery> {+public class CommitQuerySetting extends AbstractEntity implements QuerySetting<NamedCommitQuery> {private static final long serialVersionUID = 1L;@@ -92,7 +92,7 @@ public class CommitQuerySetting extends QuerySetting<NamedCommitQuery> {}@Override- public LinkedHashSet<String> getProjectQuerySubscriptions() {+ public LinkedHashSet<String> getQuerySubscriptions() {return projectQuerySubscriptions;}diff --git a/server-core/src/main/java/io/onedev/server/model/Group.java b/server-core/src/main/java/io/onedev/server/model/Group.javaindex 85a053e466..6cccc06939 100644--- a/server-core/src/main/java/io/onedev/server/model/Group.java+++ b/server-core/src/main/java/io/onedev/server/model/Group.java@@ -35,7 +35,7 @@ public class Group extends AbstractEntity {@OneToMany(mappedBy="group", cascade=CascadeType.REMOVE)@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)- private Collection<GroupAuthorization> authorizations = new ArrayList<>();+ private Collection<GroupAuthorization> projectAuthorizations = new ArrayList<>();@OneToMany(mappedBy="group", cascade=CascadeType.REMOVE)@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)@@ -86,12 +86,12 @@ public class Group extends AbstractEntity {this.createProjects = createProjects;}- public Collection<GroupAuthorization> getAuthorizations() {- return authorizations;+ public Collection<GroupAuthorization> getProjectAuthorizations() {+ return projectAuthorizations;}- public void setAuthorizations(Collection<GroupAuthorization> authorizations) {- this.authorizations = authorizations;+ public void setProjectAuthorizations(Collection<GroupAuthorization> projectAuthorizations) {+ this.projectAuthorizations = projectAuthorizations;}public Collection<Membership> getMemberships() {diff --git a/server-core/src/main/java/io/onedev/server/model/Issue.java b/server-core/src/main/java/io/onedev/server/model/Issue.javaindex 8e851d9ae0..464b9bddd4 100644--- a/server-core/src/main/java/io/onedev/server/model/Issue.java+++ b/server-core/src/main/java/io/onedev/server/model/Issue.java@@ -42,7 +42,7 @@ import io.onedev.server.cache.CommitInfoManager;import io.onedev.server.cache.UserInfoManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.support.EntityWatch;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.storage.AttachmentStorageSupport;import io.onedev.server.util.Input;@@ -363,12 +363,12 @@ public class Issue extends AbstractEntity implements Referenceable, AttachmentStreturn null;}- private GlobalIssueSetting getIssueSetting() {+ private IssueSetting getIssueSetting() {return OneDev.getInstance(SettingManager.class).getIssueSetting();}public long getFieldOrdinal(String fieldName, Object fieldValue) {- GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();+ IssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();FieldSpec fieldSpec = issueSetting.getFieldSpec(fieldName);if (fieldSpec != null)return fieldSpec.getOrdinal(fieldValue);diff --git a/server-core/src/main/java/io/onedev/server/model/IssueQuerySetting.java b/server-core/src/main/java/io/onedev/server/model/IssueQuerySetting.javaindex 19b34aa9e9..7fde11e044 100644--- a/server-core/src/main/java/io/onedev/server/model/IssueQuerySetting.java+++ b/server-core/src/main/java/io/onedev/server/model/IssueQuerySetting.java@@ -23,7 +23,7 @@ import io.onedev.server.util.watch.QueryWatchSupport;indexes={@Index(columnList="o_project_id"), @Index(columnList="o_user_id")},uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "o_user_id"})})-public class IssueQuerySetting extends QuerySetting<NamedIssueQuery> {+public class IssueQuerySetting extends AbstractEntity implements QuerySetting<NamedIssueQuery> {private static final long serialVersionUID = 1L;@@ -44,7 +44,7 @@ public class IssueQuerySetting extends QuerySetting<NamedIssueQuery> {private LinkedHashMap<String, Boolean> userQueryWatches = new LinkedHashMap<>();@Column(nullable=false, length=65535)- private LinkedHashMap<String, Boolean> projectQueryWatches = new LinkedHashMap<>();+ private LinkedHashMap<String, Boolean> queryWatches = new LinkedHashMap<>();@Overridepublic Project getProject() {@@ -78,8 +78,8 @@ public class IssueQuerySetting extends QuerySetting<NamedIssueQuery> {this.userQueryWatches = userQueryWatches;}- public void setProjectQueryWatches(LinkedHashMap<String, Boolean> projectQueryWatches) {- this.projectQueryWatches = projectQueryWatches;+ public void setQueryWatches(LinkedHashMap<String, Boolean> projectQueryWatches) {+ this.queryWatches = projectQueryWatches;}@Override@@ -92,8 +92,8 @@ public class IssueQuerySetting extends QuerySetting<NamedIssueQuery> {}@Override- public LinkedHashMap<String, Boolean> getProjectQueryWatches() {- return projectQueryWatches;+ public LinkedHashMap<String, Boolean> getQueryWatches() {+ return queryWatches;}};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.javaindex c79f4909c2..0d6f06f324 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@@ -109,7 +109,7 @@ import io.onedev.server.model.support.NamedCommitQuery;import io.onedev.server.model.support.Secret;import io.onedev.server.model.support.TagProtection;import io.onedev.server.model.support.WebHook;-import io.onedev.server.model.support.issue.IssueSetting;+import io.onedev.server.model.support.issue.ProjectIssueSetting;import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;import io.onedev.server.persistence.SessionManager;import io.onedev.server.persistence.TransactionManager;@@ -234,19 +234,19 @@ public class Project extends AbstractEntity {private Collection<CodeComment> codeComments = new ArrayList<>();@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)- private Collection<IssueQuerySetting> issueQuerySettings = new ArrayList<>();+ private Collection<IssueQuerySetting> userIssueQuerySettings = new ArrayList<>();@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)- private Collection<CommitQuerySetting> commitQuerySettings = new ArrayList<>();+ private Collection<CommitQuerySetting> userCommitQuerySettings = new ArrayList<>();@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)- private Collection<PullRequestQuerySetting> pullRequestQuerySettings = new ArrayList<>();+ private Collection<PullRequestQuerySetting> userPullRequestQuerySettings = new ArrayList<>();@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)- private Collection<CodeCommentQuerySetting> codeCommentQuerySettings = new ArrayList<>();+ private Collection<CodeCommentQuerySetting> userCodeCommentQuerySettings = new ArrayList<>();@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)- private Collection<BuildQuerySetting> buildQuerySettings = new ArrayList<>();+ private Collection<BuildQuerySetting> userBuildQuerySettings = new ArrayList<>();@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)private Collection<Milestone> milestones = new ArrayList<>();@@ -254,7 +254,7 @@ public class Project extends AbstractEntity {@Lob@Column(length=65535, nullable=false)@JsonView(DefaultView.class)- private IssueSetting issueSetting = new IssueSetting();+ private ProjectIssueSetting issueSetting = new ProjectIssueSetting();@Lob@Column(length=65535, nullable=false)@@ -264,59 +264,59 @@ public class Project extends AbstractEntity {@Lob@Column(length=65535, nullable=false)@JsonView(DefaultView.class)- private ArrayList<NamedCommitQuery> savedCommitQueries = new ArrayList<>();+ private ArrayList<NamedCommitQuery> namedCommitQueries = new ArrayList<>();{- savedCommitQueries.add(new NamedCommitQuery("All", "all"));- savedCommitQueries.add(new NamedCommitQuery("Default branch", "default-branch"));- savedCommitQueries.add(new NamedCommitQuery("Authored by me", "authored-by-me"));- savedCommitQueries.add(new NamedCommitQuery("Committed by me", "committed-by-me"));- savedCommitQueries.add(new NamedCommitQuery("Committed recently", "after(last week)"));+ namedCommitQueries.add(new NamedCommitQuery("All", "all"));+ namedCommitQueries.add(new NamedCommitQuery("Default branch", "default-branch"));+ namedCommitQueries.add(new NamedCommitQuery("Authored by me", "authored-by-me"));+ namedCommitQueries.add(new NamedCommitQuery("Committed by me", "committed-by-me"));+ namedCommitQueries.add(new NamedCommitQuery("Committed recently", "after(last week)"));}@Lob@Column(length=65535, nullable=false)@JsonView(DefaultView.class)- private ArrayList<NamedPullRequestQuery> savedPullRequestQueries = new ArrayList<>();+ private ArrayList<NamedPullRequestQuery> namedPullRequestQueries = new ArrayList<>();{- savedPullRequestQueries.add(new NamedPullRequestQuery("Open", "open"));- savedPullRequestQueries.add(new NamedPullRequestQuery("To be reviewed by me", "to be reviewed by me"));- savedPullRequestQueries.add(new NamedPullRequestQuery("To be changed by me", "submitted by me and someone requested for changes"));- savedPullRequestQueries.add(new NamedPullRequestQuery("Request for changes by me", "requested for changes by me"));- savedPullRequestQueries.add(new NamedPullRequestQuery("Approved by me", "approved by me"));- savedPullRequestQueries.add(new NamedPullRequestQuery("Submitted by me", "submitted by me"));- savedPullRequestQueries.add(new NamedPullRequestQuery("Submitted recently", "\"Submit Date\" is after \"last week\""));- savedPullRequestQueries.add(new NamedPullRequestQuery("Updated recently", "\"Update Date\" is after \"last week\""));- savedPullRequestQueries.add(new NamedPullRequestQuery("Closed", "merged or discarded"));- savedPullRequestQueries.add(new NamedPullRequestQuery("All", "all"));+ namedPullRequestQueries.add(new NamedPullRequestQuery("Open", "open"));+ namedPullRequestQueries.add(new NamedPullRequestQuery("To be reviewed by me", "to be reviewed by me"));+ namedPullRequestQueries.add(new NamedPullRequestQuery("To be changed by me", "submitted by me and someone requested for changes"));+ namedPullRequestQueries.add(new NamedPullRequestQuery("Request for changes by me", "requested for changes by me"));+ namedPullRequestQueries.add(new NamedPullRequestQuery("Approved by me", "approved by me"));+ namedPullRequestQueries.add(new NamedPullRequestQuery("Submitted by me", "submitted by me"));+ namedPullRequestQueries.add(new NamedPullRequestQuery("Submitted recently", "\"Submit Date\" is after \"last week\""));+ namedPullRequestQueries.add(new NamedPullRequestQuery("Updated recently", "\"Update Date\" is after \"last week\""));+ namedPullRequestQueries.add(new NamedPullRequestQuery("Closed", "merged or discarded"));+ namedPullRequestQueries.add(new NamedPullRequestQuery("All", "all"));}@Lob@Column(length=65535, nullable=false)@JsonView(DefaultView.class)- private ArrayList<NamedCodeCommentQuery> savedCodeCommentQueries = new ArrayList<>();+ private ArrayList<NamedCodeCommentQuery> namedCodeCommentQueries = new ArrayList<>();{- savedCodeCommentQueries.add(new NamedCodeCommentQuery("All", "all"));- savedCodeCommentQueries.add(new NamedCodeCommentQuery("Created by me", "created by me"));- savedCodeCommentQueries.add(new NamedCodeCommentQuery("Created recently", "\"Create Date\" is after \"last week\""));- savedCodeCommentQueries.add(new NamedCodeCommentQuery("Updated recently", "\"Update Date\" is after \"last week\""));+ namedCodeCommentQueries.add(new NamedCodeCommentQuery("All", "all"));+ namedCodeCommentQueries.add(new NamedCodeCommentQuery("Created by me", "created by me"));+ namedCodeCommentQueries.add(new NamedCodeCommentQuery("Created recently", "\"Create Date\" is after \"last week\""));+ namedCodeCommentQueries.add(new NamedCodeCommentQuery("Updated recently", "\"Update Date\" is after \"last week\""));}@Lob@Column(length=65535, nullable=false)@JsonView(DefaultView.class)- private ArrayList<NamedBuildQuery> savedBuildQueries = new ArrayList<>();+ private ArrayList<NamedBuildQuery> namedBuildQueries = new ArrayList<>();{- savedBuildQueries.add(new NamedBuildQuery("All", "all"));- savedBuildQueries.add(new NamedBuildQuery("Successful", "successful"));- savedBuildQueries.add(new NamedBuildQuery("Failed", "failed"));- savedBuildQueries.add(new NamedBuildQuery("Failed eventually", "failed and not(will retry)"));- savedBuildQueries.add(new NamedBuildQuery("In error", "in error"));- savedBuildQueries.add(new NamedBuildQuery("Cancelled", "cancelled"));- savedBuildQueries.add(new NamedBuildQuery("Timed out", "timed out"));- savedBuildQueries.add(new NamedBuildQuery("Running", "running"));- savedBuildQueries.add(new NamedBuildQuery("Waiting", "waiting"));- savedBuildQueries.add(new NamedBuildQuery("Queueing", "queueing"));- savedBuildQueries.add(new NamedBuildQuery("Build recently", "\"Submit Date\" is after \"last week\""));+ namedBuildQueries.add(new NamedBuildQuery("All", "all"));+ namedBuildQueries.add(new NamedBuildQuery("Successful", "successful"));+ namedBuildQueries.add(new NamedBuildQuery("Failed", "failed"));+ namedBuildQueries.add(new NamedBuildQuery("Failed eventually", "failed and not(will retry)"));+ namedBuildQueries.add(new NamedBuildQuery("In error", "in error"));+ namedBuildQueries.add(new NamedBuildQuery("Cancelled", "cancelled"));+ namedBuildQueries.add(new NamedBuildQuery("Timed out", "timed out"));+ namedBuildQueries.add(new NamedBuildQuery("Running", "running"));+ namedBuildQueries.add(new NamedBuildQuery("Waiting", "waiting"));+ namedBuildQueries.add(new NamedBuildQuery("Queueing", "queueing"));+ namedBuildQueries.add(new NamedBuildQuery("Build recently", "\"Submit Date\" is after \"last week\""));}@Lob@@ -1033,11 +1033,11 @@ public class Project extends AbstractEntity {this.codeComments = codeComments;}- public IssueSetting getIssueSetting() {+ public ProjectIssueSetting getIssueSetting() {return issueSetting;}- public void setIssueSetting(IssueSetting issueSetting) {+ public void setIssueSetting(ProjectIssueSetting issueSetting) {this.issueSetting = issueSetting;}@@ -1049,112 +1049,76 @@ public class Project extends AbstractEntity {this.buildSetting = buildSetting;}- public ArrayList<NamedCommitQuery> getSavedCommitQueries() {- return savedCommitQueries;+ public ArrayList<NamedCommitQuery> getNamedCommitQueries() {+ return namedCommitQueries;}- public void setSavedCommitQueries(ArrayList<NamedCommitQuery> savedCommitQueries) {- this.savedCommitQueries = savedCommitQueries;+ public void setNamedCommitQueries(ArrayList<NamedCommitQuery> namedCommitQueries) {+ this.namedCommitQueries = namedCommitQueries;}- public ArrayList<NamedPullRequestQuery> getSavedPullRequestQueries() {- return savedPullRequestQueries;+ public ArrayList<NamedPullRequestQuery> getNamedPullRequestQueries() {+ return namedPullRequestQueries;}- public void setSavedPullRequestQueries(ArrayList<NamedPullRequestQuery> savedPullRequestQueries) {- this.savedPullRequestQueries = savedPullRequestQueries;+ public void setNamedPullRequestQueries(ArrayList<NamedPullRequestQuery> namedPullRequestQueries) {+ this.namedPullRequestQueries = namedPullRequestQueries;}- @Nullable- public NamedCommitQuery getSavedCommitQuery(String name) {- for (NamedCommitQuery namedQuery: getSavedCommitQueries()) {- if (namedQuery.getName().equals(name))- return namedQuery;- }- return null;- }-- @Nullable- public NamedPullRequestQuery getSavedPullRequestQuery(String name) {- for (NamedPullRequestQuery namedQuery: getSavedPullRequestQueries()) {- if (namedQuery.getName().equals(name))- return namedQuery;- }- return null;- }-- @Nullable- public NamedCodeCommentQuery getSavedCodeCommentQuery(String name) {- for (NamedCodeCommentQuery namedQuery: getSavedCodeCommentQueries()) {- if (namedQuery.getName().equals(name))- return namedQuery;- }- return null;- }-- @Nullable- public NamedBuildQuery getSavedBuildQuery(String name) {- for (NamedBuildQuery namedQuery: getSavedBuildQueries()) {- if (namedQuery.getName().equals(name))- return namedQuery;- }- return null;- }-- public ArrayList<NamedCodeCommentQuery> getSavedCodeCommentQueries() {- return savedCodeCommentQueries;+ public ArrayList<NamedCodeCommentQuery> getNamedCodeCommentQueries() {+ return namedCodeCommentQueries;}- public void setSavedCodeCommentQueries(ArrayList<NamedCodeCommentQuery> savedCodeCommentQueries) {- this.savedCodeCommentQueries = savedCodeCommentQueries;+ public void setNamedCodeCommentQueries(ArrayList<NamedCodeCommentQuery> namedCodeCommentQueries) {+ this.namedCodeCommentQueries = namedCodeCommentQueries;}- public ArrayList<NamedBuildQuery> getSavedBuildQueries() {- return savedBuildQueries;+ public ArrayList<NamedBuildQuery> getNamedBuildQueries() {+ return namedBuildQueries;}- public void setSavedBuildQueries(ArrayList<NamedBuildQuery> savedBuildQueries) {- this.savedBuildQueries = savedBuildQueries;+ public void setNamedBuildQueries(ArrayList<NamedBuildQuery> namedBuildQueries) {+ this.namedBuildQueries = namedBuildQueries;}- public Collection<IssueQuerySetting> getIssueQuerySettings() {- return issueQuerySettings;+ public Collection<IssueQuerySetting> getUserIssueQuerySettings() {+ return userIssueQuerySettings;}- public void setIssueQuerySettings(Collection<IssueQuerySetting> issueQuerySettings) {- this.issueQuerySettings = issueQuerySettings;+ public void setUserIssueQuerySettings(Collection<IssueQuerySetting> userIssueQuerySettings) {+ this.userIssueQuerySettings = userIssueQuerySettings;}- public Collection<CommitQuerySetting> getCommitQuerySettings() {- return commitQuerySettings;+ public Collection<CommitQuerySetting> getUserCommitQuerySettings() {+ return userCommitQuerySettings;}- public void setCommitQuerySettings(Collection<CommitQuerySetting> commitQuerySettings) {- this.commitQuerySettings = commitQuerySettings;+ public void setUserCommitQuerySettings(Collection<CommitQuerySetting> userCommitQuerySettings) {+ this.userCommitQuerySettings = userCommitQuerySettings;}- public Collection<PullRequestQuerySetting> getPullRequestQuerySettings() {- return pullRequestQuerySettings;+ public Collection<PullRequestQuerySetting> getUserPullRequestQuerySettings() {+ return userPullRequestQuerySettings;}- public void setPullRequestQuerySettings(Collection<PullRequestQuerySetting> pullRequestQuerySettings) {- this.pullRequestQuerySettings = pullRequestQuerySettings;+ public void setUserPullRequestQuerySettings(Collection<PullRequestQuerySetting> userPullRequestQuerySettings) {+ this.userPullRequestQuerySettings = userPullRequestQuerySettings;}- public Collection<CodeCommentQuerySetting> getCodeCommentQuerySettings() {- return codeCommentQuerySettings;+ public Collection<CodeCommentQuerySetting> getUserCodeCommentQuerySettings() {+ return userCodeCommentQuerySettings;}- public void setCodeCommentQuerySettings(Collection<CodeCommentQuerySetting> codeCommentQuerySettings) {- this.codeCommentQuerySettings = codeCommentQuerySettings;+ public void setUserCodeCommentQuerySettings(Collection<CodeCommentQuerySetting> userCodeCommentQuerySettings) {+ this.userCodeCommentQuerySettings = userCodeCommentQuerySettings;}- public Collection<BuildQuerySetting> getBuildQuerySettings() {- return buildQuerySettings;+ public Collection<BuildQuerySetting> getUserBuildQuerySettings() {+ return userBuildQuerySettings;}- public void setBuildQuerySettings(Collection<BuildQuerySetting> buildQuerySettings) {- this.buildQuerySettings = buildQuerySettings;+ public void setUserBuildQuerySettings(Collection<BuildQuerySetting> userBuildQuerySettings) {+ this.userBuildQuerySettings = userBuildQuerySettings;}public Collection<Build> getBuilds() {diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestQuerySetting.java b/server-core/src/main/java/io/onedev/server/model/PullRequestQuerySetting.javaindex bcc4dd169a..4fd8d49511 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequestQuerySetting.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestQuerySetting.java@@ -23,7 +23,7 @@ import io.onedev.server.util.watch.QueryWatchSupport;indexes={@Index(columnList="o_project_id"), @Index(columnList="o_user_id")},uniqueConstraints={@UniqueConstraint(columnNames={"o_project_id", "o_user_id"})})-public class PullRequestQuerySetting extends QuerySetting<NamedPullRequestQuery> {+public class PullRequestQuerySetting extends AbstractEntity implements QuerySetting<NamedPullRequestQuery> {private static final long serialVersionUID = 1L;@@ -44,7 +44,7 @@ public class PullRequestQuerySetting extends QuerySetting<NamedPullRequestQuery>private LinkedHashMap<String, Boolean> userQueryWatches = new LinkedHashMap<>();@Column(nullable=false, length=65535)- private LinkedHashMap<String, Boolean> projectQueryWatches = new LinkedHashMap<>();+ private LinkedHashMap<String, Boolean> queryWatches = new LinkedHashMap<>();@Overridepublic Project getProject() {@@ -78,8 +78,8 @@ public class PullRequestQuerySetting extends QuerySetting<NamedPullRequestQuery>this.userQueryWatches = userQueryWatches;}- public void setProjectQueryWatches(LinkedHashMap<String, Boolean> projectQueryWatches) {- this.projectQueryWatches = projectQueryWatches;+ public void setQueryWatches(LinkedHashMap<String, Boolean> projectQueryWatches) {+ this.queryWatches = projectQueryWatches;}@Override@@ -92,8 +92,8 @@ public class PullRequestQuerySetting extends QuerySetting<NamedPullRequestQuery>}@Override- public LinkedHashMap<String, Boolean> getProjectQueryWatches() {- return projectQueryWatches;+ public LinkedHashMap<String, Boolean> getQueryWatches() {+ return queryWatches;}};diff --git a/server-core/src/main/java/io/onedev/server/model/User.java b/server-core/src/main/java/io/onedev/server/model/User.javaindex 94693c9b88..d85a062217 100644--- a/server-core/src/main/java/io/onedev/server/model/User.java+++ b/server-core/src/main/java/io/onedev/server/model/User.java@@ -2,6 +2,7 @@ package io.onedev.server.model;import java.util.ArrayList;import java.util.Collection;+import java.util.LinkedHashMap;import java.util.stream.Collectors;import javax.annotation.Nullable;@@ -9,6 +10,7 @@ import javax.persistence.CascadeType;import javax.persistence.Column;import javax.persistence.Entity;import javax.persistence.Index;+import javax.persistence.Lob;import javax.persistence.OneToMany;import javax.persistence.Table;import javax.persistence.Version;@@ -31,8 +33,12 @@ import com.google.common.base.Preconditions;import io.onedev.commons.launcher.loader.AppLoader;import io.onedev.commons.utils.matchscore.MatchScoreUtils;+import io.onedev.server.model.support.QuerySetting;+import io.onedev.server.model.support.issue.NamedIssueQuery;import io.onedev.server.util.jackson.DefaultView;import io.onedev.server.util.validation.annotation.UserName;+import io.onedev.server.util.watch.QuerySubscriptionSupport;+import io.onedev.server.util.watch.QueryWatchSupport;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Password;@@ -67,7 +73,7 @@ public class User extends AbstractEntity implements AuthenticationInfo {@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)- private Collection<UserAuthorization> authorizations = new ArrayList<>();+ private Collection<UserAuthorization> projectAuthorizations = new ArrayList<>();@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)@@ -83,10 +89,89 @@ public class User extends AbstractEntity implements AuthenticationInfo {private Collection<IssueWatch> issueWatches = new ArrayList<>();@OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)- private Collection<IssueQuerySetting> issueQuerySettings = new ArrayList<>();+ private Collection<IssueQuerySetting> projectIssueQuerySettings = new ArrayList<>();+ @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ private Collection<BuildQuerySetting> projectBuildQuerySettings = new ArrayList<>();++ @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ private Collection<PullRequestQuerySetting> projectPullRequestQuerySettings = new ArrayList<>();++ @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ private Collection<CommitQuerySetting> projectCommitQuerySettings = new ArrayList<>();++ @OneToMany(mappedBy="user", cascade=CascadeType.REMOVE)+ private Collection<CodeCommentQuerySetting> projectCodeCommentQuerySettings = new ArrayList<>();++ @Lob+ @Column(nullable=false, length=65535)+ private ArrayList<NamedIssueQuery> userIssueQueries = new ArrayList<>();++ @Lob+ @Column(nullable=false, length=65535)+ private LinkedHashMap<String, Boolean> userIssueQueryWatches = new LinkedHashMap<>();++ @Column(nullable=false, length=65535)+ private LinkedHashMap<String, Boolean> issueQueryWatches = new LinkedHashMap<>();+private transient Collection<Group> groups;+ public void setUserQueryWatches(LinkedHashMap<String, Boolean> userQueryWatches) {+ this.userIssueQueryWatches = userQueryWatches;+ }++ public void setQueryWatches(LinkedHashMap<String, Boolean> queryWatches) {+ this.issueQueryWatches = queryWatches;+ }++ public QuerySetting<NamedIssueQuery> getIssueQuerySetting() {+ return new QuerySetting<NamedIssueQuery>() {++ @Override+ public Project getProject() {+ return null;+ }++ @Override+ public User getUser() {+ return User.this;+ }++ @Override+ public ArrayList<NamedIssueQuery> getUserQueries() {+ return userIssueQueries;+ }++ @Override+ public void setUserQueries(ArrayList<NamedIssueQuery> userQueries) {+ User.this.userIssueQueries = userQueries;+ }++ @Override+ public QueryWatchSupport<NamedIssueQuery> getQueryWatchSupport() {+ return new QueryWatchSupport<NamedIssueQuery>() {++ @Override+ public LinkedHashMap<String, Boolean> getUserQueryWatches() {+ return userIssueQueryWatches;+ }++ @Override+ public LinkedHashMap<String, Boolean> getQueryWatches() {+ return issueQueryWatches;+ }++ };+ }++ @Override+ public QuerySubscriptionSupport<NamedIssueQuery> getQuerySubscriptionSupport() {+ return null;+ }++ };+ }+@Overridepublic PrincipalCollection getPrincipals() {return new SimplePrincipalCollection(getId(), "");@@ -205,20 +290,12 @@ public class User extends AbstractEntity implements AuthenticationInfo {return version;}- public Collection<IssueQuerySetting> getIssueQuerySettings() {- return issueQuerySettings;- }-- public void setIssueQuerySettings(Collection<IssueQuerySetting> issueQuerySettings) {- this.issueQuerySettings = issueQuerySettings;- }-- public Collection<UserAuthorization> getAuthorizations() {- return authorizations;+ public Collection<UserAuthorization> getProjectAuthorizations() {+ return projectAuthorizations;}- public void setAuthorizations(Collection<UserAuthorization> authorizations) {- this.authorizations = authorizations;+ public void setProjectAuthorizations(Collection<UserAuthorization> projectAuthorizations) {+ this.projectAuthorizations = projectAuthorizations;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/support/NamedBuildQuery.java b/server-core/src/main/java/io/onedev/server/model/support/NamedBuildQuery.javaindex f95eabc900..a0dd46a320 100644--- a/server-core/src/main/java/io/onedev/server/model/support/NamedBuildQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/NamedBuildQuery.java@@ -44,5 +44,5 @@ public class NamedBuildQuery implements NamedQuery {public void setQuery(String query) {this.query = query;}-+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/model/support/NamedCodeCommentQuery.java b/server-core/src/main/java/io/onedev/server/model/support/NamedCodeCommentQuery.javaindex d68796f3fb..5d014b97e9 100644--- a/server-core/src/main/java/io/onedev/server/model/support/NamedCodeCommentQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/NamedCodeCommentQuery.java@@ -44,5 +44,5 @@ public class NamedCodeCommentQuery implements NamedQuery {public void setQuery(String query) {this.query = query;}-+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/model/support/NamedCommitQuery.java b/server-core/src/main/java/io/onedev/server/model/support/NamedCommitQuery.javaindex e393386a95..08968c4d86 100644--- a/server-core/src/main/java/io/onedev/server/model/support/NamedCommitQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/NamedCommitQuery.java@@ -44,5 +44,5 @@ public class NamedCommitQuery implements NamedQuery {public void setQuery(String query) {this.query = query;}-+}\ No newline at end of filediff --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.javaindex 3baf92a612..2ef4abcd88 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@@ -1,6 +1,9 @@package io.onedev.server.model.support;import java.io.Serializable;+import java.util.Collection;++import javax.annotation.Nullable;import io.onedev.server.web.editable.annotation.Editable;@@ -11,4 +14,13 @@ public interface NamedQuery extends Serializable {String getQuery();+ @Nullable+ public static <T extends NamedQuery> T find(Collection<T> namedQueries, String name) {+ for (T namedQuery: namedQueries) {+ if (namedQuery.getName().equals(name))+ return namedQuery;+ }+ return null;+ }+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/model/support/QuerySetting.java b/server-core/src/main/java/io/onedev/server/model/support/QuerySetting.javaindex 57106f4e35..6eab19a7b1 100644--- a/server-core/src/main/java/io/onedev/server/model/support/QuerySetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/QuerySetting.java@@ -5,38 +5,27 @@ import java.util.ArrayList;import javax.annotation.Nullable;import javax.persistence.MappedSuperclass;-import io.onedev.server.model.AbstractEntity;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.util.watch.QuerySubscriptionSupport;import io.onedev.server.util.watch.QueryWatchSupport;@MappedSuperclass-public abstract class QuerySetting<T extends NamedQuery> extends AbstractEntity {+public interface QuerySetting<T extends NamedQuery> {- private static final long serialVersionUID = 1L;-- public abstract Project getProject();+ @Nullable+ Project getProject();- public abstract User getUser();+ User getUser();- public abstract ArrayList<T> getUserQueries();+ ArrayList<T> getUserQueries();- public abstract void setUserQueries(ArrayList<T> userQueries);+ void setUserQueries(ArrayList<T> userQueries);@Nullable- public abstract QueryWatchSupport<T> getQueryWatchSupport();+ QueryWatchSupport<T> getQueryWatchSupport();@Nullable- public abstract QuerySubscriptionSupport<T> getQuerySubscriptionSupport();+ QuerySubscriptionSupport<T> getQuerySubscriptionSupport();- @Nullable- public T getUserQuery(String name) {- for (T namedQuery: getUserQueries()) {- if (namedQuery.getName().equals(name))- return namedQuery;- }- return null;- }-}diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/IssueSetting.javasimilarity index 84%rename from server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.javarename to server-core/src/main/java/io/onedev/server/model/support/administration/IssueSetting.javaindex d85320198e..5eb806b3c4 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/GlobalIssueSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/IssueSetting.java@@ -41,7 +41,7 @@ import io.onedev.server.util.ValueSetEdit;import io.onedev.server.web.editable.annotation.Editable;@Editable-public class GlobalIssueSetting implements Serializable {+public class IssueSetting implements Serializable {private static final long serialVersionUID = 1L;@@ -51,17 +51,17 @@ public class GlobalIssueSetting implements Serializable {private List<FieldSpec> fieldSpecs = new ArrayList<>();- private Set<String> defaultPromptFieldsUponIssueOpen = new HashSet<>();+ private Collection<String> defaultPromptFieldsUponIssueOpen = new HashSet<>();private List<BoardSpec> defaultBoardSpecs = new ArrayList<>();- private Set<String> defaultListFields = new HashSet<>();+ private Collection<String> listFields = new HashSet<>();- private List<NamedIssueQuery> defaultQueries = new ArrayList<>();+ private List<NamedIssueQuery> namedQueries = new ArrayList<>();private boolean reconciled = true;- public GlobalIssueSetting() {+ public IssueSetting() {ChoiceField type = new ChoiceField();type.setName("Type");SpecifiedChoices specifiedChoices = new SpecifiedChoices();@@ -220,20 +220,20 @@ public class GlobalIssueSetting implements Serializable {board.setDisplayFields(Lists.newArrayList(IssueConstants.FIELD_STATE, "Type", "Priority", "Assignee", "Resolution", "Duplicate With"));defaultBoardSpecs.add(board);- defaultListFields.add("Type");- defaultListFields.add("Priority");- defaultListFields.add("Assignee");-- defaultQueries.add(new NamedIssueQuery("Outstanding", "outstanding"));- defaultQueries.add(new NamedIssueQuery("My outstanding", "outstanding and mine"));- defaultQueries.add(new NamedIssueQuery("Submitted recently", "\"Submit Date\" is after \"last week\""));- defaultQueries.add(new NamedIssueQuery("Updated recently", "\"Update Date\" is after \"last week\""));- defaultQueries.add(new NamedIssueQuery("Submitted by me", "submitted by me"));- defaultQueries.add(new NamedIssueQuery("Assigned to me", "\"Assignee\" is me"));- defaultQueries.add(new NamedIssueQuery("Critical outstanding", "outstanding and \"Priority\" is \"Critical\""));- defaultQueries.add(new NamedIssueQuery("Unassigned outstanding", "outstanding and \"Assignee\" is empty"));- defaultQueries.add(new NamedIssueQuery("Closed", "closed"));- defaultQueries.add(new NamedIssueQuery("All", "all"));+ listFields.add("Type");+ listFields.add("Priority");+ listFields.add("Assignee");++ namedQueries.add(new NamedIssueQuery("Open", "\"State\" is \"Open\""));+ namedQueries.add(new NamedIssueQuery("My open", "\"State\" is \"Open\" and mine"));+ namedQueries.add(new NamedIssueQuery("Submitted recently", "\"Submit Date\" is after \"last week\""));+ namedQueries.add(new NamedIssueQuery("Updated recently", "\"Update Date\" is after \"last week\""));+ namedQueries.add(new NamedIssueQuery("Submitted by me", "submitted by me"));+ namedQueries.add(new NamedIssueQuery("Assigned to me", "\"Assignee\" is me"));+ namedQueries.add(new NamedIssueQuery("Critical open", "\"State\" is \"Open\" and \"Priority\" is \"Critical\""));+ namedQueries.add(new NamedIssueQuery("Unassigned open", "\"State\" is \"Open\" and \"Assignee\" is empty"));+ namedQueries.add(new NamedIssueQuery("Closed", "\"State\" is \"Closed\""));+ namedQueries.add(new NamedIssueQuery("All", "all"));}public List<String> sortFieldNames(Collection<String> fieldNames) {@@ -275,11 +275,11 @@ public class GlobalIssueSetting implements Serializable {this.fieldSpecs = fieldSpecs;}- public Set<String> getDefaultPromptFieldsUponIssueOpen() {+ public Collection<String> getDefaultPromptFieldsUponIssueOpen() {return defaultPromptFieldsUponIssueOpen;}- public void setDefaultPromptFieldsUponIssueOpen(Set<String> defaultPromptFieldsUponIssueOpen) {+ public void setDefaultPromptFieldsUponIssueOpen(Collection<String> defaultPromptFieldsUponIssueOpen) {this.defaultPromptFieldsUponIssueOpen = defaultPromptFieldsUponIssueOpen;}@@ -321,7 +321,7 @@ public class GlobalIssueSetting implements Serializable {it.remove();}- for (Iterator<NamedIssueQuery> it = getDefaultQueries().iterator(); it.hasNext();) {+ for (Iterator<NamedIssueQuery> it = getNamedQueries().iterator(); it.hasNext();) {NamedIssueQuery namedQuery = it.next();try {IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);@@ -339,7 +339,7 @@ public class GlobalIssueSetting implements Serializable {transition.onRenameState(oldName, newName);for (BoardSpec board: getDefaultBoardSpecs())board.onRenameState(oldName, newName);- for (NamedIssueQuery namedQuery: getDefaultQueries()) {+ for (NamedIssueQuery namedQuery: getNamedQueries()) {try {IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);query.onRenameState(oldName, newName);@@ -370,7 +370,7 @@ public class GlobalIssueSetting implements Serializable {it.remove();}- for (Iterator<NamedIssueQuery> it = getDefaultQueries().iterator(); it.hasNext();) {+ for (Iterator<NamedIssueQuery> it = getNamedQueries().iterator(); it.hasNext();) {NamedIssueQuery namedQuery = it.next();try {IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);@@ -400,7 +400,7 @@ public class GlobalIssueSetting implements Serializable {field.onRenameInput(oldName, newName);for (BoardSpec board: getDefaultBoardSpecs())board.onRenameField(this, oldName, newName);- for (NamedIssueQuery namedQuery: getDefaultQueries()) {+ for (NamedIssueQuery namedQuery: getNamedQueries()) {try {IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);query.onRenameField(oldName, newName);@@ -421,7 +421,7 @@ public class GlobalIssueSetting implements Serializable {it.remove();}- for (Iterator<NamedIssueQuery> it = getDefaultQueries().iterator(); it.hasNext();) {+ for (Iterator<NamedIssueQuery> it = getNamedQueries().iterator(); it.hasNext();) {NamedIssueQuery namedQuery = it.next();try {IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);@@ -511,21 +511,20 @@ public class GlobalIssueSetting implements Serializable {this.defaultBoardSpecs = defaultBoardSpecs;}- public Set<String> getDefaultListFields() {- return defaultListFields;+ public Collection<String> getListFields() {+ return listFields;}- public void setDefaultListFields(Set<String> defaultListFields) {- this.defaultListFields = defaultListFields;+ public void setListFields(Collection<String> listFields) {+ this.listFields = listFields;}- @Editable(order=300, description="Define default issue queries for all projects")- public List<NamedIssueQuery> getDefaultQueries() {- return defaultQueries;+ public List<NamedIssueQuery> getNamedQueries() {+ return namedQueries;}- public void setDefaultQueries(List<NamedIssueQuery> defaultQueries) {- this.defaultQueries = defaultQueries;+ public void setNamedQueries(List<NamedIssueQuery> namedQueries) {+ this.namedQueries = namedQueries;}}diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.javaindex c4ba45df40..02c864b1c8 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java@@ -19,7 +19,7 @@ import com.google.common.collect.Lists;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.model.support.issue.fieldspec.ChoiceField;import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.model.support.issue.fieldspec.GroupChoiceField;@@ -29,13 +29,13 @@ import io.onedev.server.util.EditContext;import io.onedev.server.util.IssueConstants;import io.onedev.server.util.Usage;import io.onedev.server.util.ValueSetEdit;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;import io.onedev.server.web.component.stringchoice.StringChoiceProvider;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.IssueQuery;-import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldResolution;-import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;-import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedStateResolution;@Editablepublic class BoardSpec implements Serializable {@@ -138,7 +138,7 @@ public class BoardSpec implements Serializable {private static List<String> getIdentifyFieldChoices() {List<String> choices = new ArrayList<>();choices.add(IssueConstants.FIELD_STATE);- for (FieldSpec fieldSpec: getGlobalIssueSetting().getFieldSpecs()) {+ for (FieldSpec fieldSpec: getIssueSetting().getFieldSpecs()) {if (!fieldSpec.isAllowMultiple() && (fieldSpec instanceof ChoiceField || fieldSpec instanceof UserChoiceField || fieldSpec instanceof GroupChoiceField))choices.add(fieldSpec.getName());}@@ -149,7 +149,7 @@ public class BoardSpec implements Serializable {private static List<String> getDisplayFieldsChoices() {List<String> choices = new ArrayList<>();choices.add(IssueConstants.FIELD_STATE);- for (FieldSpec fieldSpec: getGlobalIssueSetting().getFieldSpecs()) {+ for (FieldSpec fieldSpec: getIssueSetting().getFieldSpecs()) {choices.add(fieldSpec.getName());}return choices;@@ -160,10 +160,10 @@ public class BoardSpec implements Serializable {Map<String, String> choices = new LinkedHashMap<>();String fieldName = (String) EditContext.get().getInputValue("identifyField");if (IssueConstants.FIELD_STATE.equals(fieldName)) {- for (StateSpec state: getGlobalIssueSetting().getStateSpecs())+ for (StateSpec state: getIssueSetting().getStateSpecs())choices.put(state.getName(), state.getName());} else if (fieldName != null) {- FieldSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(fieldName);+ FieldSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);if (fieldSpec != null) {for (String each: fieldSpec.getPossibleValues())choices.put(each, each);@@ -174,7 +174,7 @@ public class BoardSpec implements Serializable {return choices;}- private static GlobalIssueSetting getGlobalIssueSetting() {+ private static IssueSetting getIssueSetting() {return OneDev.getInstance(SettingManager.class).getIssueSetting();}@@ -196,7 +196,7 @@ public class BoardSpec implements Serializable {}if (getIdentifyField().equals(IssueConstants.FIELD_STATE)) {for (String column: getColumns()) {- if (getGlobalIssueSetting().getStateSpec(column) == null)+ if (getIssueSetting().getStateSpec(column) == null)undefinedStates.add(column);}}@@ -236,13 +236,13 @@ public class BoardSpec implements Serializable {}}if (!IssueConstants.FIELD_STATE.equals(getIdentifyField())) {- FieldSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(getIdentifyField());+ FieldSpec fieldSpec = getIssueSetting().getFieldSpec(getIdentifyField());if (fieldSpec == null)undefinedFields.add(getIdentifyField());}for (String displayField: getDisplayFields()) {if (!IssueConstants.FIELD_STATE.equals(displayField)) {- FieldSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(displayField);+ FieldSpec fieldSpec = getIssueSetting().getFieldSpec(displayField);if (fieldSpec == null)undefinedFields.add(displayField);}@@ -306,7 +306,7 @@ public class BoardSpec implements Serializable {return BoardSpec.class.getName() + ":" + projectId;}- public void onRenameUser(GlobalIssueSetting issueSetting, String oldName, String newName) {+ public void onRenameUser(IssueSetting issueSetting, String oldName, String newName) {FieldSpec fieldSpec = issueSetting.getFieldSpec(getIdentifyField());if (fieldSpec instanceof UserChoiceField) {for (int i=0; i<getColumns().size(); i++) {@@ -317,7 +317,7 @@ public class BoardSpec implements Serializable {}@Nullable- public Usage onDeleteUser(GlobalIssueSetting issueSetting, String userName) {+ public Usage onDeleteUser(IssueSetting issueSetting, String userName) {FieldSpec fieldSpec = issueSetting.getFieldSpec(getIdentifyField());if (fieldSpec instanceof UserChoiceField) {for (Iterator<String> it = getColumns().iterator(); it.hasNext();) {@@ -331,7 +331,7 @@ public class BoardSpec implements Serializable {return new Usage();}- public void onRenameField(GlobalIssueSetting issueSetting, String oldName, String newName) {+ public void onRenameField(IssueSetting issueSetting, String oldName, String newName) {if (getIdentifyField().equals(oldName))setIdentifyField(newName);int index = getDisplayFields().indexOf(oldName);@@ -393,7 +393,7 @@ public class BoardSpec implements Serializable {}- public boolean onDeleteField(GlobalIssueSetting issueSetting, String fieldName) {+ public boolean onDeleteField(IssueSetting issueSetting, String fieldName) {getDisplayFields().remove(fieldName);if (getBaseQuery() != null) {try {@@ -491,7 +491,7 @@ public class BoardSpec implements Serializable {public Collection<UndefinedFieldValue> getUndefinedFieldValues() {Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();if (!identifyField.equals(IssueConstants.FIELD_STATE)) {- SpecifiedChoices specifiedChoices = SpecifiedChoices.of(getGlobalIssueSetting().getFieldSpec(identifyField));+ SpecifiedChoices specifiedChoices = SpecifiedChoices.of(getIssueSetting().getFieldSpec(identifyField));if (specifiedChoices != null) {for (String column: getColumns()) {if (column != null && !specifiedChoices.getChoiceValues().contains(column))diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java b/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.javasimilarity index 73%rename from server-core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.javarename to server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.javaindex cf87e22ca9..4e2e46ff0a 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/ProjectIssueSetting.java@@ -14,41 +14,41 @@ import javax.annotation.Nullable;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Project;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.util.Usage;import io.onedev.server.util.ValueSetEdit;-import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldResolution;-import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldResolution.FixType;-import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;-import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedStateResolution;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution.FixType;-public class IssueSetting implements Serializable {+public class ProjectIssueSetting implements Serializable {private static final long serialVersionUID = 1L;private List<TransitionSpec> transitionSpecs;- private Set<String> promptFieldsUponIssueOpen;+ private Collection<String> promptFieldsUponIssueOpen;- private Set<String> listFields;+ private Collection<String> listFields;private List<BoardSpec> boardSpecs;- private List<NamedIssueQuery> savedQueries;+ private List<NamedIssueQuery> namedQueries;- private transient GlobalIssueSetting globalSetting;+ private transient IssueSetting setting;- private GlobalIssueSetting getGlobalSetting() {- if (globalSetting == null)- globalSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();- return globalSetting;+ private IssueSetting getSetting() {+ if (setting == null)+ setting = OneDev.getInstance(SettingManager.class).getIssueSetting();+ return setting;}@Nullablepublic List<TransitionSpec> getTransitionSpecs(boolean useDefaultIfNotDefined) {if (useDefaultIfNotDefined && transitionSpecs == null)- return new ArrayList<>(getGlobalSetting().getDefaultTransitionSpecs());+ return new ArrayList<>(getSetting().getDefaultTransitionSpecs());elsereturn transitionSpecs;}@@ -58,33 +58,33 @@ public class IssueSetting implements Serializable {}@Nullable- public Set<String> getPromptFieldsUponIssueOpen(boolean useDefaultIfNotDefined) {+ public Collection<String> getPromptFieldsUponIssueOpen(boolean useDefaultIfNotDefined) {if (useDefaultIfNotDefined && promptFieldsUponIssueOpen == null)- return new HashSet<>(getGlobalSetting().getDefaultPromptFieldsUponIssueOpen());+ return new HashSet<>(getSetting().getDefaultPromptFieldsUponIssueOpen());elsereturn promptFieldsUponIssueOpen;}- public void setPromptFieldsUponIssueOpen(@Nullable Set<String> promptFieldsUponIssueOpen) {+ public void setPromptFieldsUponIssueOpen(@Nullable Collection<String> promptFieldsUponIssueOpen) {this.promptFieldsUponIssueOpen = promptFieldsUponIssueOpen;}@Nullable- public Set<String> getListFields(boolean useDefaultIfNotDefined) {+ public Collection<String> getListFields(boolean useDefaultIfNotDefined) {if (useDefaultIfNotDefined && listFields == null)- return new HashSet<>(getGlobalSetting().getDefaultListFields());+ return new HashSet<>(getSetting().getListFields());elsereturn listFields;}- public void setListFields(@Nullable Set<String> listFields) {+ public void setListFields(@Nullable Collection<String> listFields) {this.listFields = listFields;}@Nullablepublic List<BoardSpec> getBoardSpecs(boolean useDefaultIfNotDefined) {if (useDefaultIfNotDefined && boardSpecs == null)- return new ArrayList<>(getGlobalSetting().getDefaultBoardSpecs());+ return new ArrayList<>(getSetting().getDefaultBoardSpecs());elsereturn boardSpecs;}@@ -94,20 +94,20 @@ public class IssueSetting implements Serializable {}@Nullable- public List<NamedIssueQuery> getSavedQueries(boolean useDefaultIfNotDefined) {- if (useDefaultIfNotDefined && savedQueries == null)- return new ArrayList<>(getGlobalSetting().getDefaultQueries());+ public List<NamedIssueQuery> getNamedQueries(boolean useDefaultIfNotDefined) {+ if (useDefaultIfNotDefined && namedQueries == null)+ return new ArrayList<>(getSetting().getNamedQueries());else- return savedQueries;+ return namedQueries;}- public void setSavedQueries(@Nullable List<NamedIssueQuery> savedQueries) {- this.savedQueries = savedQueries;+ public void setNamedQueries(@Nullable List<NamedIssueQuery> namedQueries) {+ this.namedQueries = namedQueries;}@Nullable- public NamedIssueQuery getSavedQuery(String name) {- for (NamedIssueQuery namedQuery: getSavedQueries(true)) {+ public NamedIssueQuery getNamedQuery(String name) {+ for (NamedIssueQuery namedQuery: getNamedQueries(true)) {if (namedQuery.getName().equals(name))return namedQuery;}@@ -117,7 +117,7 @@ public class IssueSetting implements Serializable {public void onRenameUser(String oldName, String newName) {if (boardSpecs != null) {for (BoardSpec board: boardSpecs)- board.onRenameUser(getGlobalSetting(), oldName, newName);+ board.onRenameUser(getSetting(), oldName, newName);}}@@ -134,7 +134,7 @@ public class IssueSetting implements Serializable {Usage usage = new Usage();if (boardSpecs != null) {for (Iterator<BoardSpec> it = boardSpecs.iterator(); it.hasNext();) {- Usage usageInBoard = it.next().onDeleteUser(getGlobalSetting(), userName);+ Usage usageInBoard = it.next().onDeleteUser(getSetting(), userName);if (usageInBoard != null)usage.add(usageInBoard);else@@ -164,22 +164,22 @@ public class IssueSetting implements Serializable {Set<String> undefinedFields = new HashSet<>();if (listFields != null) {for (String fieldName: listFields) {- if (getGlobalSetting().getFieldSpec(fieldName) == null)+ if (getSetting().getFieldSpec(fieldName) == null)undefinedFields.add(fieldName);}}if (promptFieldsUponIssueOpen != null) {for (String fieldName: promptFieldsUponIssueOpen) {- if (getGlobalSetting().getFieldSpec(fieldName) == null)+ if (getSetting().getFieldSpec(fieldName) == null)undefinedFields.add(fieldName);}}if (transitionSpecs != null) {for (TransitionSpec transition: transitionSpecs)- undefinedFields.addAll(transition.getUndefinedFields(getGlobalSetting()));+ undefinedFields.addAll(transition.getUndefinedFields(getSetting()));}- if (savedQueries != null) {- for (NamedIssueQuery namedQuery: savedQueries) {+ if (namedQueries != null) {+ for (NamedIssueQuery namedQuery: namedQueries) {try {undefinedFields.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false).getUndefinedFields());} catch (Exception e) {@@ -206,8 +206,8 @@ public class IssueSetting implements Serializable {promptFieldsUponIssueOpen.add(entry.getValue().getNewField());}}- if (savedQueries != null) {- for (Iterator<NamedIssueQuery> it = savedQueries.iterator(); it.hasNext();) {+ if (namedQueries != null) {+ for (Iterator<NamedIssueQuery> it = namedQueries.iterator(); it.hasNext();) {NamedIssueQuery namedQuery = it.next();try {IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);@@ -248,8 +248,8 @@ public class IssueSetting implements Serializable {public Collection<String> getUndefinedStates(Project project) {Set<String> undefinedStates = new HashSet<>();- if (savedQueries != null) {- for (NamedIssueQuery namedQuery: savedQueries) {+ if (namedQueries != null) {+ for (NamedIssueQuery namedQuery: namedQueries) {try {undefinedStates.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false).getUndefinedStates());} catch (Exception e) {@@ -271,8 +271,8 @@ public class IssueSetting implements Serializable {}public void fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {- if (savedQueries != null) {- for (NamedIssueQuery namedQuery: savedQueries) {+ if (namedQueries != null) {+ for (NamedIssueQuery namedQuery: namedQueries) {try {IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);for (Map.Entry<String, UndefinedStateResolution> resolutionEntry: resolutions.entrySet())@@ -296,8 +296,8 @@ public class IssueSetting implements Serializable {public Collection<UndefinedFieldValue> getUndefinedFieldValues() {Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();- if (savedQueries != null) {- for (NamedIssueQuery namedQuery: savedQueries) {+ if (namedQueries != null) {+ for (NamedIssueQuery namedQuery: namedQueries) {try {undefinedFieldValues.addAll(IssueQuery.parse(null, namedQuery.getQuery(), false).getUndefinedFieldValues());} catch (Exception e) {@@ -316,8 +316,8 @@ public class IssueSetting implements Serializable {}public void fixUndefinedFieldValues(Map<String, ValueSetEdit> valueSetEdits) {- if (savedQueries != null) {- for (Iterator<NamedIssueQuery> it = savedQueries.iterator(); it.hasNext();) {+ if (namedQueries != null) {+ for (Iterator<NamedIssueQuery> it = namedQueries.iterator(); it.hasNext();) {NamedIssueQuery namedQuery = it.next();try {boolean remove = false;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java b/server-core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.javaindex cb8a182ce1..d85ebb698a 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java@@ -17,7 +17,7 @@ import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.model.support.issue.transitionprerequisite.TransitionPrerequisite;@@ -31,14 +31,14 @@ import io.onedev.server.model.support.issue.transitiontrigger.TransitionTrigger;import io.onedev.server.util.Input;import io.onedev.server.util.Usage;import io.onedev.server.util.ValueSetEdit;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedStateResolution;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldResolution.FixType;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Multiline;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;-import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldResolution;-import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldResolution.FixType;-import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;-import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedStateResolution;@Editablepublic class TransitionSpec implements Serializable {@@ -125,7 +125,7 @@ public class TransitionSpec implements Serializable {@SuppressWarnings("unused")private static List<String> getFieldChoices() {List<String> fields = new ArrayList<>();- for (FieldSpec field: getGlobalIssueSetting().getFieldSpecs())+ for (FieldSpec field: getIssueSetting().getFieldSpecs())fields.add(field.getName());return fields;}@@ -222,19 +222,19 @@ public class TransitionSpec implements Serializable {return fromStates.isEmpty() || toState.equals(stateName);}- public Collection<String> getUndefinedFields(GlobalIssueSetting globalSetting) {+ public Collection<String> getUndefinedFields(IssueSetting setting) {Collection<String> undefinedFields = new HashSet<>();- if (getPrerequisite() != null && globalSetting.getFieldSpec(getPrerequisite().getInputName()) == null)+ if (getPrerequisite() != null && setting.getFieldSpec(getPrerequisite().getInputName()) == null)undefinedFields.add(getPrerequisite().getInputName());if (getTrigger() instanceof PressButtonTrigger) {PressButtonTrigger trigger = (PressButtonTrigger) getTrigger();for (String field: trigger.getPromptFields()) {- if (globalSetting.getFieldSpec(field) == null)+ if (setting.getFieldSpec(field) == null)undefinedFields.add(field);}}for (String field: getRemoveFields()) {- if (globalSetting.getFieldSpec(field) == null)+ if (setting.getFieldSpec(field) == null)undefinedFields.add(field);}return undefinedFields;@@ -296,7 +296,7 @@ public class TransitionSpec implements Serializable {@SuppressWarnings("unused")private static List<String> getStateChoices() {List<String> stateNames = new ArrayList<>();- for (StateSpec state: getGlobalIssueSetting().getStateSpecs())+ for (StateSpec state: getIssueSetting().getStateSpecs())stateNames.add(state.getName());return stateNames;}@@ -324,7 +324,7 @@ public class TransitionSpec implements Serializable {return false;}- private static GlobalIssueSetting getGlobalIssueSetting() {+ private static IssueSetting getIssueSetting() {return OneDev.getInstance(SettingManager.class).getIssueSetting();}@@ -332,7 +332,7 @@ public class TransitionSpec implements Serializable {Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();if (prerequisite != null) {ValueMatcher valueMatcher = prerequisite.getValueMatcher();- SpecifiedChoices specifiedChoices = SpecifiedChoices.of(getGlobalIssueSetting().getFieldSpec(prerequisite.getInputName()));+ SpecifiedChoices specifiedChoices = SpecifiedChoices.of(getIssueSetting().getFieldSpec(prerequisite.getInputName()));if (specifiedChoices != null) {if (valueMatcher instanceof ValueIsOneOf) {ValueIsOneOf valueIsOneOf = (ValueIsOneOf) valueMatcher;@@ -354,10 +354,10 @@ public class TransitionSpec implements Serializable {public Collection<? extends String> getUndefinedStates() {Collection<String> undefinedStates = new HashSet<>();- if (getGlobalIssueSetting().getStateSpec(toState) == null)+ if (getIssueSetting().getStateSpec(toState) == null)undefinedStates.add(toState);for (String fromState: fromStates) {- if (getGlobalIssueSetting().getStateSpec(fromState) == null)+ if (getIssueSetting().getStateSpec(fromState) == null)undefinedStates.add(fromState);}return undefinedStates;diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.javaindex d12ab7ce65..11c6979e15 100644--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java@@ -8,7 +8,7 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Project;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.editable.annotation.ChoiceProvider;@@ -62,7 +62,7 @@ public class PressButtonTrigger implements TransitionTrigger {@SuppressWarnings("unused")private static List<String> getFieldChoices() {List<String> fields = new ArrayList<>();- GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();+ IssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();for (FieldSpec field: issueSetting.getFieldSpecs())fields.add(field.getName());return fields;diff --git a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/NamedPullRequestQuery.java b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/NamedPullRequestQuery.javaindex 7aa605db27..a21ea4d417 100644--- a/server-core/src/main/java/io/onedev/server/model/support/pullrequest/NamedPullRequestQuery.java+++ b/server-core/src/main/java/io/onedev/server/model/support/pullrequest/NamedPullRequestQuery.java@@ -45,5 +45,5 @@ public class NamedPullRequestQuery implements NamedQuery {public void setQuery(String query) {this.query = query;}-+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.javaindex 684875becc..bf823ea55f 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@@ -63,11 +63,11 @@ public class BuildNotificationManager {public void on(BuildEvent event) {Project project = event.getProject();Map<User, Collection<String>> subscribedQueryStrings = new HashMap<>();- for (BuildQuerySetting setting: project.getBuildQuerySettings()) {- for (String queryName: setting.getQuerySubscriptionSupport().getProjectQuerySubscriptions())- fillSubscribedQueryStrings(subscribedQueryStrings, setting.getUser(), project.getSavedBuildQuery(queryName));- for (String queryName: setting.getQuerySubscriptionSupport().getUserQuerySubscriptions())- fillSubscribedQueryStrings(subscribedQueryStrings, setting.getUser(), setting.getUserQuery(queryName));+ for (BuildQuerySetting setting: project.getUserBuildQuerySettings()) {+ for (String name: setting.getQuerySubscriptionSupport().getQuerySubscriptions())+ fillSubscribedQueryStrings(subscribedQueryStrings, setting.getUser(), NamedQuery.find(project.getNamedBuildQueries(), name));+ for (String name: setting.getQuerySubscriptionSupport().getUserQuerySubscriptions())+ fillSubscribedQueryStrings(subscribedQueryStrings, setting.getUser(), NamedQuery.find(setting.getUserQueries(), name));}Build build = event.getBuild();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.javaindex a15868e8e2..5be2e52fc1 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@@ -52,11 +52,11 @@ public class CommitNotificationManager {if (!event.getNewCommitId().equals(ObjectId.zeroId())) {Project project = event.getProject();Map<User, Collection<String>> subscribedQueryStrings = new HashMap<>();- for (CommitQuerySetting setting: project.getCommitQuerySettings()) {- for (String queryName: setting.getQuerySubscriptionSupport().getProjectQuerySubscriptions())- fillSubscribedQueryStrings(subscribedQueryStrings, setting.getUser(), project.getSavedCommitQuery(queryName));- for (String queryName: setting.getQuerySubscriptionSupport().getUserQuerySubscriptions())- fillSubscribedQueryStrings(subscribedQueryStrings, setting.getUser(), setting.getUserQuery(queryName));+ for (CommitQuerySetting setting: project.getUserCommitQuerySettings()) {+ for (String name: setting.getQuerySubscriptionSupport().getQuerySubscriptions())+ fillSubscribedQueryStrings(subscribedQueryStrings, setting.getUser(), NamedQuery.find(project.getNamedCommitQueries(), name));+ for (String name: setting.getQuerySubscriptionSupport().getUserQuerySubscriptions())+ fillSubscribedQueryStrings(subscribedQueryStrings, setting.getUser(), NamedQuery.find(setting.getUserQueries(), name));}Collection<String> notifyEmails = new HashSet<>();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.javaindex 071cc3f51d..b865ef7796 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@@ -14,7 +14,9 @@ import com.google.common.collect.Lists;import io.onedev.commons.launcher.loader.Listen;import io.onedev.server.cache.UserInfoManager;import io.onedev.server.entitymanager.IssueWatchManager;+import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UrlManager;+import io.onedev.server.entitymanager.UserManager;import io.onedev.server.event.MarkdownAware;import io.onedev.server.event.issue.IssueChangeEvent;import io.onedev.server.event.issue.IssueCommented;@@ -44,16 +46,23 @@ public class IssueNotificationManager {private final IssueWatchManager issueWatchManager;+ private final UserManager userManager;+private final UserInfoManager userInfoManager;+ private final SettingManager settingManager;+@Injectpublic IssueNotificationManager(MarkdownManager markdownManager, MailManager mailManager,- UrlManager urlManager, IssueWatchManager issueWatchManager, UserInfoManager userInfoManager) {+ UrlManager urlManager, IssueWatchManager issueWatchManager, UserInfoManager userInfoManager,+ UserManager userManager, SettingManager settingManager) {this.mailManager = mailManager;this.urlManager = urlManager;this.markdownManager = markdownManager;this.issueWatchManager = issueWatchManager;this.userInfoManager = userInfoManager;+ this.userManager = userManager;+ this.settingManager = settingManager;}@Transactional@@ -71,7 +80,7 @@ public class IssueNotificationManager {@Overrideprotected Collection<? extends QuerySetting<?>> getQuerySettings() {- return issue.getProject().getIssueQuerySettings();+ return issue.getProject().getUserIssueQuerySettings();}@Override@@ -80,8 +89,34 @@ public class IssueNotificationManager {}@Override- protected NamedQuery getSavedProjectQuery(String name) {- return issue.getProject().getIssueSetting().getSavedQuery(name);+ protected Collection<? extends NamedQuery> getNamedQueries() {+ return issue.getProject().getIssueSetting().getNamedQueries(true);+ }++ }.getWatches().entrySet()) {+ watch(issue, entry.getKey(), entry.getValue());+ }++ for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<Issue>() {++ @Override+ protected Issue getEntity() {+ return issue;+ }++ @Override+ protected Collection<? extends QuerySetting<?>> getQuerySettings() {+ return userManager.query().stream().map(it->it.getIssueQuerySetting()).collect(Collectors.toList());+ }++ @Override+ protected EntityQuery<Issue> parse(String queryString) {+ return IssueQuery.parse(null, queryString, true);+ }++ @Override+ protected Collection<? extends NamedQuery> getNamedQueries() {+ return settingManager.getIssueSetting().getNamedQueries();}}.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.javaindex 078938e1c6..8d0d501fd3 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@@ -89,7 +89,7 @@ public class PullRequestNotificationManager implements PersistListener {@Overrideprotected Collection<? extends QuerySetting<?>> getQuerySettings() {- return request.getTargetProject().getPullRequestQuerySettings();+ return request.getTargetProject().getUserPullRequestQuerySettings();}@Override@@ -98,8 +98,8 @@ public class PullRequestNotificationManager implements PersistListener {}@Override- protected NamedQuery getSavedProjectQuery(String name) {- return request.getTargetProject().getSavedPullRequestQuery(name);+ protected Collection<? extends NamedQuery> getNamedQueries() {+ 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.javaindex dee0150bc3..e6a52a16f5 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@@ -22,15 +22,15 @@ public abstract class QueryWatchBuilder<T extends AbstractEntity> {for (QuerySetting<?> querySetting: getQuerySettings()) {boolean watched = false;for (Map.Entry<String, Boolean> entry: querySetting.getQueryWatchSupport().getUserQueryWatches().entrySet()) {- if (matches(querySetting.getUserQuery(entry.getKey()), querySetting.getUser())) {+ if (matches(NamedQuery.find(querySetting.getUserQueries(), entry.getKey()), querySetting.getUser())) {watches.putIfAbsent(querySetting.getUser(), entry.getValue());watched = true;break;}}if (!watched) {- for (Map.Entry<String, Boolean> entry: querySetting.getQueryWatchSupport().getProjectQueryWatches().entrySet()) {- if (matches(getSavedProjectQuery(entry.getKey()), querySetting.getUser())) {+ for (Map.Entry<String, Boolean> entry: querySetting.getQueryWatchSupport().getQueryWatches().entrySet()) {+ if (matches(NamedQuery.find(getNamedQueries(), entry.getKey()), querySetting.getUser())) {watches.putIfAbsent(querySetting.getUser(), entry.getValue());watched = true;break;@@ -63,7 +63,7 @@ public abstract class QueryWatchBuilder<T extends AbstractEntity> {protected abstract EntityQuery<T> parse(String queryString);- protected abstract NamedQuery getSavedProjectQuery(String name);+ protected abstract Collection<? extends NamedQuery> getNamedQueries();public Map<User, Boolean> getWatches() {return watches;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/AndCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/AndCriteria.javaindex 5d0606386a..8158efbcda 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/AndCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/AndCriteria.java@@ -17,7 +17,7 @@ import io.onedev.server.model.User;import io.onedev.server.search.entity.AndCriteriaHelper;import io.onedev.server.search.entity.ParensAware;import io.onedev.server.util.ValueSetEdit;-import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;public class AndCriteria extends IssueCriteria implements ParensAware {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.javaindex 107b550d6f..e871e000f6 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java@@ -17,10 +17,10 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;import io.onedev.server.util.ValueSetEdit;-import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;public class ChoiceFieldCriteria extends FieldCriteria {@@ -85,7 +85,7 @@ public class ChoiceFieldCriteria extends FieldCriteria {@Overridepublic Collection<UndefinedFieldValue> getUndefinedFieldValues() {Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();- GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();+ IssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();SpecifiedChoices specifiedChoices = SpecifiedChoices.of(issueSetting.getFieldSpec(getFieldName()));if (specifiedChoices != null && !specifiedChoices.getChoiceValues().contains(value)) {undefinedFieldValues.add(new UndefinedFieldValue(getFieldName(), value));diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ClosedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ClosedCriteria.javadeleted file mode 100644index 1140a7ff9c..0000000000--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ClosedCriteria.java+++ /dev/null@@ -1,42 +0,0 @@-package io.onedev.server.search.entity.issue;--import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.Issue;-import io.onedev.server.model.Project;-import io.onedev.server.model.User;-import io.onedev.server.model.support.issue.StateSpec;--public class ClosedCriteria extends IssueCriteria {-- private static final long serialVersionUID = 1L;-- private IssueCriteria getCriteria(Project project) {- return OneDev.getInstance(SettingManager.class).getIssueSetting().getCategoryCriteria(StateSpec.Category.CLOSED);- }-- @Override- public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {- return getCriteria(project).getPredicate(project, root, builder, user);- }-- @Override- public boolean matches(Issue issue, User user) {- return getCriteria(issue.getProject()).matches(issue, user);- }-- @Override- public boolean needsLogin() {- return false;- }-- @Override- public String toString() {- return IssueQuery.getRuleName(IssueQueryLexer.Closed);- }--}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.javaindex 79e1369782..f11f2dc4f7 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java@@ -16,7 +16,7 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.IssueField;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.util.IssueConstants;public abstract class FieldCriteria extends IssueCriteria {@@ -45,7 +45,7 @@ public abstract class FieldCriteria extends IssueCriteria {@Overridepublic Collection<String> getUndefinedFields() {Set<String> undefinedFields = new HashSet<>();- GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();+ IssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();if (!IssueConstants.QUERY_FIELDS.contains(fieldName)&& issueSetting.getFieldSpec(fieldName) == null) {undefinedFields.add(fieldName);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.javaindex 9ad3354a25..16373cba07 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java@@ -15,7 +15,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.search.entity.EntityCriteria;import io.onedev.server.util.ValueSetEdit;-import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;public abstract class IssueCriteria extends EntityCriteria<Issue> {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4index c4990cbcf3..abf1c89c66 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4@@ -7,7 +7,7 @@ query;criteria- : operator=(Mine|Outstanding|Closed|SubmittedByMe) #OperatorCriteria+ : operator=(Mine|SubmittedByMe) #OperatorCriteria| operator=(SubmittedBy|FixedInBuild) WS+ criteriaValue=Quoted #OperatorValueCriteria| FixedBetween WS+ revisionCriteria WS+ And WS+ revisionCriteria #FixedBetweenCriteria| criteriaField=Quoted WS+ operator=(IsMe|IsEmpty) #FieldOperatorCriteria@@ -34,14 +34,6 @@ All: 'all';-Outstanding- : 'outstanding'- ;--Closed- : 'closed'- ;-OrderBy: 'order' WS+ 'by';diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.javaindex c3caa00404..b309937d70 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java@@ -40,7 +40,7 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.model.support.issue.fieldspec.BooleanField;import io.onedev.server.model.support.issue.fieldspec.BuildChoiceField;import io.onedev.server.model.support.issue.fieldspec.ChoiceField;@@ -70,8 +70,8 @@ import io.onedev.server.search.entity.issue.IssueQueryParser.QueryContext;import io.onedev.server.search.entity.issue.IssueQueryParser.RevisionCriteriaContext;import io.onedev.server.util.IssueConstants;import io.onedev.server.util.ValueSetEdit;-import io.onedev.server.web.page.admin.issuesetting.GlobalIssueSettingPage;-import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;+import io.onedev.server.web.page.admin.issuesetting.IssueSettingPage;import io.onedev.server.web.util.WicketUtils;public class IssueQuery extends EntityQuery<Issue> {@@ -142,10 +142,6 @@ public class IssueQuery extends EntityQuery<Issue> {switch (ctx.operator.getType()) {case IssueQueryLexer.Mine:return new MineCriteria();- case IssueQueryLexer.Outstanding:- return new OutstandingCriteria();- case IssueQueryLexer.Closed:- return new ClosedCriteria();case IssueQueryLexer.SubmittedByMe:return new SubmittedByMeCriteria();default:@@ -172,13 +168,16 @@ public class IssueQuery extends EntityQuery<Issue> {if (ctx.SubmittedBy() != null) {return new SubmittedByCriteria(getUser(value), value);} else if (ctx.FixedInBuild() != null) {- return new FixedInCriteria(getBuild(project, value));+ if (project != null)+ return new FixedInCriteria(getBuild(project, value));+ else+ throw new OneException("Unsupported operator in global issue query: " + getRuleName(IssueQueryLexer.FixedInBuild));} else {throw new RuntimeException("Unexpected operator: " + ctx.operator.getText());}}- private ObjectId getCommitId(RevisionCriteriaContext revision) {+ private ObjectId getCommitId(Project project, RevisionCriteriaContext revision) {String value = getValue(revision.Quoted().getText());if (revision.Build() != null) {return ObjectId.fromString(getBuild(project, value).getCommitHash());@@ -192,15 +191,18 @@ public class IssueQuery extends EntityQuery<Issue> {}public IssueCriteria visitFixedBetweenCriteria(FixedBetweenCriteriaContext ctx) {+ if (project == null)+ throw new OneException("Unsupported operator in global issue query: " + getRuleName(IssueQueryLexer.FixedBetween));+RevisionCriteriaContext sinceRevision = ctx.revisionCriteria(0);int sinceType = sinceRevision.revisionType.getType();String sinceValue = getValue(sinceRevision.Quoted().getText());- ObjectId sinceCommitId = getCommitId(sinceRevision);+ ObjectId sinceCommitId = getCommitId(project, sinceRevision);RevisionCriteriaContext untilRevision = ctx.revisionCriteria(1);int untilType = untilRevision.revisionType.getType();String untilValue = getValue(untilRevision.Quoted().getText());- ObjectId untilCommitId = getCommitId(untilRevision);+ ObjectId untilCommitId = getCommitId(project, untilRevision);return new FixedBetweenCriteria(sinceType, sinceValue, sinceCommitId, untilType, untilValue, untilCommitId);}@@ -358,9 +360,9 @@ public class IssueQuery extends EntityQuery<Issue> {}}- private static GlobalIssueSetting getIssueSetting() {- if (WicketUtils.getPage() instanceof GlobalIssueSettingPage)- return ((GlobalIssueSettingPage)WicketUtils.getPage()).getSetting();+ private static IssueSetting getIssueSetting() {+ if (WicketUtils.getPage() instanceof IssueSettingPage)+ return ((IssueSettingPage)WicketUtils.getPage()).getSetting();elsereturn OneDev.getInstance(SettingManager.class).getIssueSetting();}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/MineCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/MineCriteria.javaindex fa513888dd..030698e71f 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/MineCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/MineCriteria.java@@ -12,7 +12,7 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.model.support.issue.fieldspec.UserChoiceField;@@ -23,7 +23,7 @@ public class MineCriteria extends IssueCriteria {private IssueCriteria getCriteria(Project project, User user) {IssueCriteria submitterCriteria = new SubmittedByCriteria(user, user.getName());List<IssueCriteria> fieldCriterias = new ArrayList<>();- GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();+ IssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();for (FieldSpec field: issueSetting.getFieldSpecs()) {if (field instanceof UserChoiceField) {IssueCriteria fieldCriteria = new FieldOperatorCriteria(field.getName(), IssueQueryLexer.IsMe);diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/NotCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/NotCriteria.javaindex 38ec72a052..14cd2bfe0b 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/NotCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/NotCriteria.java@@ -11,7 +11,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.search.entity.NotCriteriaHelper;import io.onedev.server.util.ValueSetEdit;-import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;public class NotCriteria extends IssueCriteria {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/OrCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/OrCriteria.javaindex dc4b5bc237..0a2a6526f9 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/OrCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/OrCriteria.java@@ -17,7 +17,7 @@ import io.onedev.server.model.User;import io.onedev.server.search.entity.OrCriteriaHelper;import io.onedev.server.search.entity.ParensAware;import io.onedev.server.util.ValueSetEdit;-import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValue;public class OrCriteria extends IssueCriteria implements ParensAware {diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/OutstandingCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/OutstandingCriteria.javadeleted file mode 100644index 1d8c4ed038..0000000000--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/OutstandingCriteria.java+++ /dev/null@@ -1,42 +0,0 @@-package io.onedev.server.search.entity.issue;--import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.Issue;-import io.onedev.server.model.Project;-import io.onedev.server.model.User;-import io.onedev.server.model.support.issue.StateSpec;--public class OutstandingCriteria extends IssueCriteria {-- private static final long serialVersionUID = 1L;-- private IssueCriteria getCriteria(Project project) {- return OneDev.getInstance(SettingManager.class).getIssueSetting().getCategoryCriteria(StateSpec.Category.OPEN);- }-- @Override- public Predicate getPredicate(Project project, Root<Issue> root, CriteriaBuilder builder, User user) {- return getCriteria(project).getPredicate(project, root, builder, user);- }-- @Override- public boolean matches(Issue issue, User user) {- return getCriteria(issue.getProject()).matches(issue, user);- }-- @Override- public boolean needsLogin() {- return false;- }-- @Override- public String toString() {- return IssueQuery.getRuleName(IssueQueryLexer.Outstanding);- }--}diff --git a/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java b/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.javaindex a408c17127..a796a11a37 100644--- a/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java+++ b/server-core/src/main/java/io/onedev/server/security/OneAuthorizingRealm.java@@ -107,15 +107,15 @@ public class OneAuthorizingRealm extends AuthorizingRealm {permissions.add(new SystemAdministration());if (group.isCreateProjects())permissions.add(new CreateProjects());- for (GroupAuthorization authorization: group.getAuthorizations())+ for (GroupAuthorization authorization: group.getProjectAuthorizations())permissions.add(new ProjectPermission(authorization.getProject(), authorization.getRole()));}- for (UserAuthorization authorization: user.getAuthorizations())+ for (UserAuthorization authorization: user.getProjectAuthorizations())permissions.add(new ProjectPermission(authorization.getProject(), authorization.getRole()));}Group group = groupManager.findAnonymous();if (group != null) {- for (GroupAuthorization authorization: group.getAuthorizations())+ for (GroupAuthorization authorization: group.getProjectAuthorizations())permissions.add(new ProjectPermission(authorization.getProject(), authorization.getRole()));}return permissions;diff --git a/server-core/src/main/java/io/onedev/server/util/IssueUtils.java b/server-core/src/main/java/io/onedev/server/util/IssueUtils.javaindex 02010c13b0..a1fc58d923 100644--- a/server-core/src/main/java/io/onedev/server/util/IssueUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/IssueUtils.java@@ -23,7 +23,7 @@ import io.onedev.server.OneDev;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Project;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.web.editable.BeanDescriptor;import io.onedev.server.web.editable.PropertyDescriptor;@@ -44,7 +44,7 @@ public class IssueUtils {@SuppressWarnings("unchecked")public static Class<? extends Serializable> defineFieldBeanClass(Project project) {String className = FIELD_BEAN_PREFIX + project.getId();- GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();+ IssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();return (Class<? extends Serializable>) FieldSpec.defineClass(className, "Issue Fields", issueSetting.getFieldSpecs());}diff --git a/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java b/server-core/src/main/java/io/onedev/server/util/SecurityUtils.javaindex 3fa0c7b70c..0d8119cd59 100644--- a/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java+++ b/server-core/src/main/java/io/onedev/server/util/SecurityUtils.java@@ -126,12 +126,12 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {if (role != null) {User user = getUser();if (user != null) {- for (UserAuthorization authorization: user.getAuthorizations()) {+ for (UserAuthorization authorization: user.getProjectAuthorizations()) {if (project.equals(authorization.getProject()) && authorization.getRole().equals(role))return true;}for (Group group: user.getGroups()) {- for (GroupAuthorization authorization: group.getAuthorizations()) {+ for (GroupAuthorization authorization: group.getProjectAuthorizations()) {if (project.equals(authorization.getProject()) && authorization.getRole().equals(role))return true;}@@ -139,7 +139,7 @@ public class SecurityUtils extends org.apache.shiro.SecurityUtils {}Group group = OneDev.getInstance(GroupManager.class).findAnonymous();if (group != null) {- for (GroupAuthorization authorization: group.getAuthorizations()) {+ for (GroupAuthorization authorization: group.getProjectAuthorizations()) {if (project.equals(authorization.getProject()) && authorization.getRole().equals(role))return true;}diff --git a/server-core/src/main/java/io/onedev/server/util/watch/QuerySubscriptionSupport.java b/server-core/src/main/java/io/onedev/server/util/watch/QuerySubscriptionSupport.javaindex d742f6440b..c74a1f69db 100644--- a/server-core/src/main/java/io/onedev/server/util/watch/QuerySubscriptionSupport.java+++ b/server-core/src/main/java/io/onedev/server/util/watch/QuerySubscriptionSupport.java@@ -8,6 +8,6 @@ public abstract class QuerySubscriptionSupport<T extends NamedQuery> {public abstract LinkedHashSet<String> getUserQuerySubscriptions();- public abstract LinkedHashSet<String> getProjectQuerySubscriptions();+ public abstract LinkedHashSet<String> getQuerySubscriptions();}diff --git a/server-core/src/main/java/io/onedev/server/util/watch/QueryWatchSupport.java b/server-core/src/main/java/io/onedev/server/util/watch/QueryWatchSupport.javaindex dde63fce36..50bc6f131e 100644--- a/server-core/src/main/java/io/onedev/server/util/watch/QueryWatchSupport.java+++ b/server-core/src/main/java/io/onedev/server/util/watch/QueryWatchSupport.java@@ -9,7 +9,7 @@ public abstract class QueryWatchSupport<T extends NamedQuery> {public abstract LinkedHashMap<String, Boolean> getUserQueryWatches();- public abstract LinkedHashMap<String, Boolean> getProjectQueryWatches();+ public abstract LinkedHashMap<String, Boolean> getQueryWatches();private WatchStatus getWatchStatus(Map<String, Boolean> watches, String name) {Boolean watching = watches.get(name);@@ -28,16 +28,16 @@ public abstract class QueryWatchSupport<T extends NamedQuery> {watches.remove(name);}- public WatchStatus getProjectWatchStatus(T namedQuery) {- return getWatchStatus(getProjectQueryWatches(), namedQuery.getName());+ public WatchStatus getWatchStatus(T namedQuery) {+ return getWatchStatus(getQueryWatches(), namedQuery.getName());}public WatchStatus getUserWatchStatus(T namedQuery) {return getWatchStatus(getUserQueryWatches(), namedQuery.getName());}- public void setProjectWatchStatus(T namedQuery, WatchStatus watchStatus) {- setWatchStatus(getProjectQueryWatches(), namedQuery.getName(), watchStatus);+ public void setWatchStatus(T namedQuery, WatchStatus watchStatus) {+ setWatchStatus(getQueryWatches(), namedQuery.getName(), watchStatus);}public void setUserWatchStatus(T namedQuery, WatchStatus watchStatus) {diff --git a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.javaindex 8c0896a730..f80e9bd044 100644--- a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java+++ b/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java@@ -27,7 +27,6 @@ import io.onedev.server.web.page.admin.group.GroupMembershipsPage;import io.onedev.server.web.page.admin.group.GroupProfilePage;import io.onedev.server.web.page.admin.group.NewGroupPage;import io.onedev.server.web.page.admin.issuesetting.DefaultBoardListPage;-import io.onedev.server.web.page.admin.issuesetting.DefaultQueryListPage;import io.onedev.server.web.page.admin.issuesetting.DefaultStateTransitionsPage;import io.onedev.server.web.page.admin.issuesetting.IssueFieldListPage;import io.onedev.server.web.page.admin.issuesetting.IssueStateListPage;@@ -49,6 +48,7 @@ import io.onedev.server.web.page.admin.user.UserPasswordPage;import io.onedev.server.web.page.admin.user.UserProfilePage;import io.onedev.server.web.page.admin.user.UserTokenPage;import io.onedev.server.web.page.init.ServerInitPage;+import io.onedev.server.web.page.issue.IssueListPage;import io.onedev.server.web.page.my.MyAvatarPage;import io.onedev.server.web.page.my.MyPasswordPage;import io.onedev.server.web.page.my.MyProfilePage;@@ -72,7 +72,7 @@ import io.onedev.server.web.page.project.issues.boards.IssueBoardsPage;import io.onedev.server.web.page.project.issues.create.NewIssuePage;import io.onedev.server.web.page.project.issues.detail.FixingBuildsPage;import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;-import io.onedev.server.web.page.project.issues.list.IssueListPage;+import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;import io.onedev.server.web.page.project.issues.milestones.MilestoneEditPage;import io.onedev.server.web.page.project.issues.milestones.MilestoneListPage;@@ -108,6 +108,7 @@ public class OneUrlMapper extends CompoundRequestMapper {public OneUrlMapper(WebApplication app) {add(new OnePageMapper("init", ServerInitPage.class));add(new OnePageMapper("loading", BrowserInfoPage.class));+ add(new OnePageMapper("issues", IssueListPage.class));addProjectPages();addMyPages();addAdministrationPages();@@ -174,7 +175,6 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new OnePageMapper("administration/settings/issue-states", IssueStateListPage.class));add(new OnePageMapper("administration/settings/state-transitions", DefaultStateTransitionsPage.class));add(new OnePageMapper("administration/settings/issue-boards", DefaultBoardListPage.class));- add(new OnePageMapper("administration/settings/default-issue-queries", DefaultQueryListPage.class));add(new OnePageMapper("administration/server-log", ServerLogPage.class));add(new OnePageMapper("administration/server-information", ServerInformationPage.class));@@ -243,7 +243,7 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new OnePageMapper("projects/${project}/issue-boards", IssueBoardsPage.class));add(new OnePageMapper("projects/${project}/issue-boards/${board}", IssueBoardsPage.class));- add(new OnePageMapper("projects/${project}/issue-list", IssueListPage.class));+ add(new OnePageMapper("projects/${project}/issue-list", ProjectIssueListPage.class));add(new OnePageMapper("projects/${project}/issues/${issue}", IssueActivitiesPage.class));add(new OnePageMapper("projects/${project}/issues/${issue}/activities", IssueActivitiesPage.class));add(new OnePageMapper("projects/${project}/issues/${issue}/builds", FixingBuildsPage.class));diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.javaindex 068ad920a3..ca93148434 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java@@ -1,5 +1,14 @@package io.onedev.server.web.behavior;+import static io.onedev.server.search.entity.EntityQuery.getValue;+import static io.onedev.server.search.entity.issue.IssueQuery.checkField;+import static io.onedev.server.search.entity.issue.IssueQuery.getOperator;+import static io.onedev.server.search.entity.issue.IssueQuery.getRuleName;+import static io.onedev.server.search.entity.issue.IssueQueryLexer.FixedBetween;+import static io.onedev.server.search.entity.issue.IssueQueryLexer.FixedInBuild;+import static io.onedev.server.search.entity.issue.IssueQueryLexer.IsMe;+import static io.onedev.server.search.entity.issue.IssueQueryLexer.Mine;+import static io.onedev.server.search.entity.issue.IssueQueryLexer.SubmittedBy;import static io.onedev.server.util.IssueConstants.FIELD_COMMENT;import static io.onedev.server.util.IssueConstants.FIELD_COMMENT_COUNT;import static io.onedev.server.util.IssueConstants.FIELD_DESCRIPTION;@@ -15,6 +24,8 @@ import java.util.ArrayList;import java.util.List;import java.util.stream.Collectors;+import javax.annotation.Nullable;+import org.apache.commons.lang3.StringUtils;import org.apache.wicket.Component;import org.apache.wicket.model.IModel;@@ -34,7 +45,7 @@ import io.onedev.server.OneException;import io.onedev.server.entitymanager.GroupManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Project;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.model.support.issue.fieldspec.BooleanField;import io.onedev.server.model.support.issue.fieldspec.BuildChoiceField;import io.onedev.server.model.support.issue.fieldspec.ChoiceField;@@ -46,8 +57,6 @@ import io.onedev.server.model.support.issue.fieldspec.NumberField;import io.onedev.server.model.support.issue.fieldspec.PullRequestChoiceField;import io.onedev.server.model.support.issue.fieldspec.TextField;import io.onedev.server.model.support.issue.fieldspec.UserChoiceField;-import io.onedev.server.search.entity.issue.IssueQuery;-import io.onedev.server.search.entity.issue.IssueQueryLexer;import io.onedev.server.search.entity.issue.IssueQueryParser;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.DateUtils;@@ -72,13 +81,14 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {projectModel.detach();}+ @Nullableprivate Project getProject() {return projectModel.getObject();}@Overrideprotected List<InputSuggestion> suggest(TerminalExpect terminalExpect) {- GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();+ IssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();@@ -118,17 +128,17 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {List<Element> operatorElements = terminalExpect.getState().findMatchedElementsByLabel("operator", true);Preconditions.checkState(operatorElements.size() == 1);String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());- int operator = IssueQuery.getOperator(operatorName);+ int operator = getOperator(operatorName);if (fieldElements.isEmpty()) {- if (operator == IssueQueryLexer.SubmittedBy)+ if (operator == SubmittedBy)return SuggestionUtils.suggestUsers(matchWith);else if (project != null)return SuggestionUtils.suggestBuilds(project, matchWith);} else {- String fieldName = IssueQuery.getValue(fieldElements.get(0).getMatchedText());+ String fieldName = getValue(fieldElements.get(0).getMatchedText());try {- IssueQuery.checkField(fieldName, operator);+ checkField(fieldName, operator);FieldSpec fieldSpec = issueSetting.getFieldSpec(fieldName);if (fieldSpec instanceof DateField || fieldName.equals(FIELD_SUBMIT_DATE)|| fieldName.equals(FIELD_UPDATE_DATE)) {@@ -192,28 +202,26 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {@Overrideprotected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {- if (suggestedLiteral.equals("mine")) {+ if (suggestedLiteral.equals(getRuleName(Mine))) {if (SecurityUtils.getUser() != null)return Optional.of("issues relevant to me");elsereturn null;}- if ((suggestedLiteral.equals("is me") || suggestedLiteral.equals("is not me")) && SecurityUtils.getUser() == null)+ if (suggestedLiteral.equals(getRuleName(IsMe)) && SecurityUtils.getUser() == null)return null;- if (suggestedLiteral.equals("open"))- return Optional.of("issues with state in open category");- else if (suggestedLiteral.equals("closed"))- return Optional.of("issues with state in closed category");+ if (getProject() == null && (suggestedLiteral.equals(getRuleName(FixedBetween)) || suggestedLiteral.equals(getRuleName(FixedInBuild))))+ return null;parseExpect = parseExpect.findExpectByLabel("operator");if (parseExpect != null) {List<Element> fieldElements = parseExpect.getState().findMatchedElementsByLabel("criteriaField", false);if (!fieldElements.isEmpty()) {- String fieldName = IssueQuery.getValue(fieldElements.iterator().next().getMatchedText());+ String fieldName = getValue(fieldElements.iterator().next().getMatchedText());try {- IssueQuery.checkField(fieldName, IssueQuery.getOperator(suggestedLiteral));+ checkField(fieldName, getOperator(suggestedLiteral));} catch (OneException e) {return null;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.javaindex 1a4da265c9..d30abe9500 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java@@ -65,11 +65,11 @@ import io.onedev.server.web.component.datatable.HistoryAwareDataTable;import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;import io.onedev.server.web.component.job.JobDefLink;import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.savedquery.SavedQueriesClosed;+import io.onedev.server.web.component.savedquery.SavedQueriesOpened;import io.onedev.server.web.model.EntityModel;import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;-import io.onedev.server.web.page.project.savedquery.SavedQueriesClosed;-import io.onedev.server.web.page.project.savedquery.SavedQueriesOpened;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.server.web.util.QueryPosition;import io.onedev.server.web.util.QuerySaveSupport;diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.javaindex 3ded5e28ad..c4ab9b2261 100644--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java@@ -51,13 +51,13 @@ import io.onedev.server.web.WebConstants;import io.onedev.server.web.behavior.CodeCommentQueryBehavior;import io.onedev.server.web.component.datatable.HistoryAwareDataTable;import io.onedev.server.web.component.datatable.LoadableDetachableDataProvider;+import io.onedev.server.web.component.savedquery.SavedQueriesClosed;+import io.onedev.server.web.component.savedquery.SavedQueriesOpened;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.compare.RevisionComparePage;import io.onedev.server.web.page.project.pullrequests.ProjectPullRequestsPage;import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;import io.onedev.server.web.page.project.pullrequests.detail.changes.PullRequestChangesPage;-import io.onedev.server.web.page.project.savedquery.SavedQueriesClosed;-import io.onedev.server.web.page.project.savedquery.SavedQueriesOpened;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.server.web.util.QuerySaveSupport;import io.onedev.server.web.util.VisibleVisitor;diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.javaindex 6a799d81c6..a72ade9a86 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java@@ -75,13 +75,13 @@ import io.onedev.server.web.component.commit.message.CommitMessagePanel;import io.onedev.server.web.component.commit.status.CommitStatusPanel;import io.onedev.server.web.component.contributorpanel.ContributorPanel;import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.savedquery.SavedQueriesClosed;+import io.onedev.server.web.component.savedquery.SavedQueriesOpened;import io.onedev.server.web.component.user.contributoravatars.ContributorAvatars;import io.onedev.server.web.model.EntityModel;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.compare.RevisionComparePage;-import io.onedev.server.web.page.project.savedquery.SavedQueriesClosed;-import io.onedev.server.web.page.project.savedquery.SavedQueriesOpened;import io.onedev.server.web.util.QuerySaveSupport;import io.onedev.server.web.util.VisibleVisitor;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.javaindex 019edff344..21cefeffbe 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java@@ -26,7 +26,7 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.model.support.inputspec.InputContext;import io.onedev.server.model.support.inputspec.InputSpec;import io.onedev.server.search.entity.issue.IssueCriteria;@@ -138,7 +138,7 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implementthrow new UnsupportedOperationException();}- private GlobalIssueSetting getIssueSetting() {+ private IssueSetting getIssueSetting() {return OneDev.getInstance(SettingManager.class).getIssueSetting();}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.javaindex 14472a8ca1..994a8b6be0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java@@ -24,9 +24,8 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.entitymanager.UserManager;import io.onedev.server.model.Build;import io.onedev.server.model.Issue;-import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.model.support.inputspec.SecretInput;import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;import io.onedev.server.model.support.issue.fieldspec.ChoiceField;@@ -38,7 +37,6 @@ import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.component.user.ident.UserIdentPanel;import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;import io.onedev.server.web.editable.EditableUtils;-import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;@@ -50,7 +48,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {super(id);}- private GlobalIssueSetting getIssueSetting() {+ private IssueSetting getIssueSetting() {return OneDev.getInstance(SettingManager.class).getIssueSetting();}@@ -58,8 +56,6 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {protected void onInitialize() {super.onInitialize();- Project project = ((ProjectPage) getPage()).getProject();-if (getField() != null && !getField().getValues().isEmpty()) {Fragment fragment = new Fragment("content", "nonEmptyValuesFrag", this);fragment.add(new ListView<String>("values", getField().getValues()) {@@ -71,7 +67,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {UserIdent userIdent = UserIdent.of(OneDev.getInstance(UserManager.class).findByName(value), value);item.add(new UserIdentPanel("value", userIdent, Mode.AVATAR_AND_NAME));} else if (getField().getType().equals(FieldSpec.ISSUE)) {- Issue issue = OneDev.getInstance(IssueManager.class).find(project, Long.valueOf(value));+ Issue issue = OneDev.getInstance(IssueManager.class).find(getIssue().getProject(), Long.valueOf(value));if (issue != null) {Fragment linkFrag = new Fragment("value", "linkFrag", FieldValuesPanel.this);Link<Void> link = new BookmarkablePageLink<Void>("link", IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue, null));@@ -94,7 +90,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {item.add(new Label("value", "#" + value));}} else if (getField().getType().equals(FieldSpec.PULLREQUEST)) {- PullRequest request = OneDev.getInstance(PullRequestManager.class).find(project, Long.valueOf(value));+ PullRequest request = OneDev.getInstance(PullRequestManager.class).find(getIssue().getProject(), Long.valueOf(value));if (request != null) {Fragment linkFrag = new Fragment("value", "linkFrag", FieldValuesPanel.this);Link<Void> link = new BookmarkablePageLink<Void>("link", PullRequestActivitiesPage.class, PullRequestActivitiesPage.paramsOf(request, null));diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.javaindex f06700188d..1ddb3cd98e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java@@ -36,7 +36,7 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.model.support.inputspec.InputContext;import io.onedev.server.model.support.inputspec.InputSpec;import io.onedev.server.model.support.issue.fieldspec.FieldSpec;@@ -307,7 +307,7 @@ abstract class BatchEditPanel extends Panel implements InputContext {add(form);}- private GlobalIssueSetting getIssueSetting() {+ private IssueSetting getIssueSetting() {return OneDev.getInstance(SettingManager.class).getIssueSetting();}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BuiltInFieldsBean.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BuiltInFieldsBean.javaindex c3063dd4cf..1a91172c2e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/BuiltInFieldsBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/BuiltInFieldsBean.java@@ -9,7 +9,7 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Project;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;@@ -47,7 +47,7 @@ public class BuiltInFieldsBean implements Serializable {@SuppressWarnings("unused")private static List<String> getStateChoices() {- GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();+ IssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();return issueSetting.getStateSpecs().stream().map(it->it.getName()).collect(Collectors.toList());}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.htmlindex 2cbb1de18f..0838743fa4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html@@ -9,7 +9,7 @@</span></div></form>- <a wicket:id="newIssue" class="open-new btn btn-success"><i class="fa fa-plus"></i> Create</a>+ <a wicket:id="newIssue" class="open-new btn btn-success"><i class="fa fa-plus"></i> New Issue</a><div wicket:id="others" class="others clearfix"><a wicket:id="showSavedQueries" class="show-saved-queries pull-left"><i class="fa fa-eye"></i> Show Saved Queries</a><a wicket:id="saveQuery" class="pull-left save-query"><i class="fa fa-save"></i> Save Query</a>@@ -42,6 +42,9 @@</div></div></wicket:fragment>+ <wicket:fragment wicket:id="projectFrag">+ <a wicket:id="link"><span wicket:id="label"></span></a>+ </wicket:fragment><wicket:fragment wicket:id="listFieldsFrag"><div class="issue-list-fields"><form wicket:id="form">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.javaindex 53edbf6822..ca97278292 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@@ -7,7 +7,6 @@ import java.util.Iterator;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;-import java.util.Set;import javax.annotation.Nullable;@@ -53,7 +52,7 @@ import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.util.DateUtils;import io.onedev.server.util.Input;@@ -69,14 +68,15 @@ import io.onedev.server.web.component.issue.IssueStateLabel;import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.component.savedquery.SavedQueriesClosed;+import io.onedev.server.web.component.savedquery.SavedQueriesOpened;import io.onedev.server.web.component.stringchoice.StringMultiChoice;import io.onedev.server.web.component.user.ident.UserIdentPanel;import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;import io.onedev.server.web.model.EntityModel;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;import io.onedev.server.web.page.project.issues.create.NewIssuePage;import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;-import io.onedev.server.web.page.project.savedquery.SavedQueriesClosed;-import io.onedev.server.web.page.project.savedquery.SavedQueriesOpened;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.server.web.util.QueryPosition;import io.onedev.server.web.util.QuerySaveSupport;@@ -122,9 +122,9 @@ public abstract class IssueListPanel extends Panel {private SortableDataProvider<Issue, Void> dataProvider;- public IssueListPanel(String id, Project project, @Nullable String query) {+ public IssueListPanel(String id, @Nullable Project project, @Nullable String query) {super(id);- projectModel = new EntityModel<Project>(project);+ projectModel = project!=null?new EntityModel<Project>(project):Model.of((Project)null);this.query = query;}@@ -139,6 +139,7 @@ public abstract class IssueListPanel extends Panel {super.onDetach();}+ @Nullableprivate Project getProject() {return projectModel.getObject();}@@ -160,7 +161,7 @@ public abstract class IssueListPanel extends Panel {return null;}- private GlobalIssueSetting getGlobalIssueSetting() {+ private IssueSetting getIssueSetting() {return OneDev.getInstance(SettingManager.class).getIssueSetting();}@@ -268,13 +269,13 @@ public abstract class IssueListPanel extends Panel {others.add(new ModalLink("listFields") {- private Set<String> fieldSet;+ private Collection<String> fieldSet;@Overrideprotected Component newContent(String id, ModalPanel modal) {Fragment fragment = new Fragment(id, "listFieldsFrag", IssueListPanel.this);Form<?> form = new Form<Void>("form");- fieldSet = getProject().getIssueSetting().getListFields(true);+ fieldSet = getListFields();form.add(new StringMultiChoice("fields", new IModel<Collection<String>>() {@Override@@ -296,7 +297,7 @@ public abstract class IssueListPanel extends Panel {@Overrideprotected Map<String, String> load() {Map<String, String> choices = new LinkedHashMap<>();- for (String fieldName: getGlobalIssueSetting().getFieldNames())+ for (String fieldName: getIssueSetting().getFieldNames())choices.put(fieldName, fieldName);return choices;}@@ -318,8 +319,13 @@ public abstract class IssueListPanel extends Panel {protected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);modal.close();- getProject().getIssueSetting().setListFields(fieldSet);- OneDev.getInstance(ProjectManager.class).save(getProject());+ if (getProject() != null) {+ getProject().getIssueSetting().setListFields(fieldSet);+ OneDev.getInstance(ProjectManager.class).save(getProject());+ } else {+ getIssueSetting().setListFields(fieldSet);+ OneDev.getInstance(SettingManager.class).saveIssueSetting(getIssueSetting());+ }onQueryUpdated(target, query);}@@ -335,7 +341,7 @@ public abstract class IssueListPanel extends Panel {onQueryUpdated(target, query);}- }.setVisible(getProject().getIssueSetting().getListFields(false) != null));+ }.setVisible(getProject() != null && getProject().getIssueSetting().getListFields(false) != null));form.add(new AjaxLink<Void>("cancel") {@@ -354,7 +360,7 @@ public abstract class IssueListPanel extends Panel {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canManageIssues(getProject()));+ setVisible(SecurityUtils.isAdministrator() || getProject() != null && SecurityUtils.canManageIssues(getProject()));}});@@ -364,7 +370,11 @@ public abstract class IssueListPanel extends Panel {query = parsedQueryModel.getObject().toString();elsequery = null;- add(new BookmarkablePageLink<Void>("newIssue", NewIssuePage.class, NewIssuePage.paramsOf(getProject(), query)));++ if (getProject() != null)+ add(new BookmarkablePageLink<Void>("newIssue", NewIssuePage.class, NewIssuePage.paramsOf(getProject(), query)));+ else+ add(new WebMarkupContainer("newIssue").setVisible(false));others.add(batchEditSelected = new ModalLink("batchEditSelected") {@@ -412,7 +422,9 @@ public abstract class IssueListPanel extends Panel {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(selectionColumn != null && !selectionColumn.getSelections().isEmpty());+ setVisible(getProject() != null+ && selectionColumn != null+ && !selectionColumn.getSelections().isEmpty());}});@@ -462,7 +474,9 @@ public abstract class IssueListPanel extends Panel {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canWriteCode(getProject()) && issuesTable.getItemCount() != 0);+ setVisible(getProject() != null+ && SecurityUtils.canWriteCode(getProject())+ && issuesTable.getItemCount() != 0);}});@@ -515,7 +529,7 @@ public abstract class IssueListPanel extends Panel {}});- if (SecurityUtils.canWriteCode(getProject())) {+ if (getProject() != null && SecurityUtils.canWriteCode(getProject())) {columns.add(selectionColumn = new SelectionColumn<Issue, Void>() {@Override@@ -535,11 +549,17 @@ public abstract class IssueListPanel extends Panel {Fragment fragment = new Fragment(componentId, "summaryFrag", IssueListPanel.this);fragment.add(new Label("number", "#" + issue.getNumber()));OddEvenItem<?> row = cellItem.findParent(OddEvenItem.class);- QueryPosition position = new QueryPosition(parsedQueryModel.getObject().toString(), (int)issuesTable.getItemCount(),+ QueryPosition position;+ if (getProject() != null) {+ position = new QueryPosition(parsedQueryModel.getObject().toString(), (int)issuesTable.getItemCount(),(int)issuesTable.getCurrentPage() * WebConstants.PAGE_SIZE + row.getIndex());+ } else {+ position = null;+ }Link<Void> link = new BookmarkablePageLink<Void>("title", IssueActivitiesPage.class,IssueActivitiesPage.paramsOf(issue, position));link.add(new Label("label", issue.getTitle()));+fragment.add(link);fragment.add(new WebMarkupContainer("copy").add(new CopyClipboardBehavior(Model.of("#" + issue.getNumber() + ": " + issue.getTitle()))));@@ -561,7 +581,31 @@ public abstract class IssueListPanel extends Panel {}});- for (String field: getGlobalIssueSetting().sortFieldNames(getProject().getIssueSetting().getListFields(true))) {++ if (getProject() == null) {+ columns.add(new AbstractColumn<Issue, Void>(Model.of("Project")) {++ @Override+ public void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,+ IModel<Issue> rowModel) {+ Issue issue = rowModel.getObject();+ Fragment fragment = new Fragment(componentId, "projectFrag", IssueListPanel.this);+ Link<Void> link = new BookmarkablePageLink<Void>("link", ProjectDashboardPage.class,+ ProjectDashboardPage.paramsOf(issue.getProject()));+ link.add(new Label("label", issue.getProject()));+ fragment.add(link);+ cellItem.add(fragment);+ }++ @Override+ public String getCssClass() {+ return "project";+ }++ });+ }++ for (String field: getIssueSetting().sortFieldNames(getListFields())) {columns.add(new AbstractColumn<Issue, Void>(Model.of(field)) {@Override@@ -608,6 +652,13 @@ public abstract class IssueListPanel extends Panel {});}+ private Collection<String> getListFields() {+ if (getProject() != null)+ return getProject().getIssueSetting().getListFields(true);+ else+ return getIssueSetting().getListFields();+ }+@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css b/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.cssindex d50e6c8c6f..cf9dfc8c1c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css@@ -13,7 +13,7 @@margin-bottom: 20px;}.issue-list>.head>form {- margin-right: 100px;+ margin-right: 120px;}.issue-list>.head>.open-new {position: absolute;diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.javaindex 81cfe28dc2..cd0ec651c0 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java@@ -35,7 +35,7 @@ import io.onedev.server.entitymanager.IssueChangeManager;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.model.support.issue.TransitionSpec;import io.onedev.server.model.support.issue.fieldspec.ChoiceField;import io.onedev.server.model.support.issue.fieldspec.DateField;@@ -91,7 +91,7 @@ public abstract class IssueOperationsPanel extends Panel {RepeatingView transitionsView = new RepeatingView("transitions");- GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();+ IssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();List<TransitionSpec> transitions = getIssue().getProject().getIssueSetting().getTransitionSpecs(true);for (TransitionSpec transition: transitions) {if (transition.canTransite(getIssue()) && transition.getTrigger() instanceof PressButtonTrigger) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.javaindex 61d50f6e4c..1f600ed487 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.java@@ -13,7 +13,7 @@ import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.model.support.inputspec.InputContext;import io.onedev.server.model.support.inputspec.InputSpec;import io.onedev.server.model.support.issue.TransitionSpec;@@ -105,7 +105,7 @@ abstract class TransitionEditPanel extends Panel implements InputContext {add(form);}- private GlobalIssueSetting getIssueSetting() {+ private IssueSetting getIssueSetting() {return OneDev.getInstance(SettingManager.class).getIssueSetting();}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldResolution.java b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldResolution.javasimilarity index 88%rename from server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldResolution.javarename to server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldResolution.javaindex 04b7b6ba12..6bc77d5718 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldResolution.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldResolution.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.issueworkflowreconcile;+package io.onedev.server.web.component.issue.workflowreconcile;import java.io.Serializable;import java.util.ArrayList;@@ -16,8 +16,6 @@ import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;import io.onedev.server.web.editable.annotation.ShowCondition;-import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.util.WicketUtils;@Editablepublic class UndefinedFieldResolution implements Serializable {@@ -61,7 +59,6 @@ public class UndefinedFieldResolution implements Serializable {@SuppressWarnings("unused")private static List<String> getFieldChoices() {- ProjectPage page = (ProjectPage) WicketUtils.getPage();List<String> fields = new ArrayList<>();for (FieldSpec field: OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldSpecs())fields.add(field.getName());diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldValue.java b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldValue.javasimilarity index 94%rename from server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldValue.javarename to server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldValue.javaindex 9c9328322e..05177a0256 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldValue.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldValue.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.issueworkflowreconcile;+package io.onedev.server.web.component.issue.workflowreconcile;import java.io.Serializable;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldValueResolution.java b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldValueResolution.javasimilarity index 86%rename from server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldValueResolution.javarename to server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldValueResolution.javaindex 4b523328e6..f732dad90c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldValueResolution.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedFieldValueResolution.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.issueworkflowreconcile;+package io.onedev.server.web.component.issue.workflowreconcile;import java.io.Serializable;import java.util.ArrayList;@@ -12,16 +12,16 @@ import com.google.common.base.Preconditions;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.model.support.issue.fieldspec.ChoiceField;import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.util.ComponentContext;import io.onedev.server.util.EditContext;+import io.onedev.server.web.component.issue.workflowreconcile.WorkflowReconcilePanel.UndefinedFieldValueContainer;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;import io.onedev.server.web.editable.annotation.ShowCondition;-import io.onedev.server.web.page.project.issueworkflowreconcile.WorkflowReconcilePanel.UndefinedFieldValueContainer;@Editablepublic class UndefinedFieldValueResolution implements Serializable {@@ -67,7 +67,7 @@ public class UndefinedFieldValueResolution implements Serializable {private static List<String> getValueChoices() {UndefinedFieldValueContainer container = ComponentContext.get().getComponent().findParent(UndefinedFieldValueContainer.class);- GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();+ IssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();FieldSpec fieldSpec = Preconditions.checkNotNull(issueSetting.getFieldSpec(container.getFieldName()));ComponentContext.push(new ComponentContext(container));try {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedStateResolution.java b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedStateResolution.javasimilarity index 80%rename from server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedStateResolution.javarename to server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedStateResolution.javaindex ecdb6e5d0d..986d9e3dfd 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedStateResolution.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/UndefinedStateResolution.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.issueworkflowreconcile;+package io.onedev.server.web.component.issue.workflowreconcile;import java.io.Serializable;import java.util.List;@@ -8,7 +8,7 @@ import org.hibernate.validator.constraints.NotEmpty;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;@@ -34,7 +34,7 @@ public class UndefinedStateResolution implements Serializable {@SuppressWarnings("unused")private static List<String> getNewStateChoices() {- GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();+ IssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();return issueSetting.getStateSpecs().stream().map(each->each.getName()).collect(Collectors.toList());}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowChangeAlertPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChangeAlertPanel.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowChangeAlertPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChangeAlertPanel.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowChangeAlertPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChangeAlertPanel.javasimilarity index 96%rename from server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowChangeAlertPanel.javarename to server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChangeAlertPanel.javaindex 8a5cc153b0..23705237a5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowChangeAlertPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowChangeAlertPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.issueworkflowreconcile;+package io.onedev.server.web.component.issue.workflowreconcile;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowReconcilePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowReconcilePanel.htmlrename to server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowReconcilePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.javasimilarity index 97%rename from server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowReconcilePanel.javarename to server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.javaindex bab47546f5..42450338a9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowReconcilePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcilePanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.issueworkflowreconcile;+package io.onedev.server.web.component.issue.workflowreconcile;import java.util.Collection;import java.util.HashMap;@@ -25,13 +25,13 @@ import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueManager;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.util.ValueSetEdit;import io.onedev.server.web.ajaxlistener.ChangeTextListener;import io.onedev.server.web.ajaxlistener.DisableGlobalLoadingIndicatorListener;import io.onedev.server.web.ajaxlistener.SelfDisableListener;+import io.onedev.server.web.component.issue.workflowreconcile.UndefinedFieldValueResolution.FixType;import io.onedev.server.web.editable.BeanContext;-import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValueResolution.FixType;@SuppressWarnings("serial")public abstract class WorkflowReconcilePanel extends Panel {@@ -360,7 +360,7 @@ public abstract class WorkflowReconcilePanel extends Panel {getIssueManager().fixFieldValueOrders();SettingManager settingManager = OneDev.getInstance(SettingManager.class);- GlobalIssueSetting issueSetting = settingManager.getIssueSetting();+ IssueSetting issueSetting = settingManager.getIssueSetting();issueSetting.setReconciled(true);settingManager.saveIssueSetting(issueSetting);diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowReconcileResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcileResourceReference.javasimilarity index 84%rename from server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowReconcileResourceReference.javarename to server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcileResourceReference.javaindex 92e6c9dfc5..fcd5a2eac6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/WorkflowReconcileResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/WorkflowReconcileResourceReference.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.issueworkflowreconcile;+package io.onedev.server.web.component.issue.workflowreconcile;import io.onedev.server.web.page.base.BaseDependentCssResourceReference;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/workflow-reconcile.css b/server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/workflow-reconcile.csssimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/workflow-reconcile.cssrename to server-core/src/main/java/io/onedev/server/web/component/issue/workflowreconcile/workflow-reconcile.cssdiff --git a/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/NamedQueriesBean.java b/server-core/src/main/java/io/onedev/server/web/component/savedquery/NamedQueriesBean.javasimilarity index 88%rename from server-core/src/main/java/io/onedev/server/web/page/project/savedquery/NamedQueriesBean.javarename to server-core/src/main/java/io/onedev/server/web/component/savedquery/NamedQueriesBean.javaindex 342f04aaff..cb44556e29 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/NamedQueriesBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/NamedQueriesBean.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.savedquery;+package io.onedev.server.web.component.savedquery;import java.io.Serializable;import java.util.ArrayList;diff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/ProjectQuerySupport.java b/server-core/src/main/java/io/onedev/server/web/component/savedquery/ProjectQuerySupport.javanew file mode 100644index 0000000000..01c60b580a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/ProjectQuerySupport.java@@ -0,0 +1,16 @@+package io.onedev.server.web.component.savedquery;++import java.util.ArrayList;++import javax.annotation.Nullable;++import io.onedev.server.model.support.NamedQuery;++public interface ProjectQuerySupport<T extends NamedQuery> {++ @Nullable+ ArrayList<T> getQueries();++ void onSaveQueries(ArrayList<T> queries);++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryBean.java b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryBean.javasimilarity index 90%rename from server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryBean.javarename to server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryBean.javaindex 86d7015d4c..0cb97c9fe6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryBean.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.savedquery;+package io.onedev.server.web.component.savedquery;import java.io.Serializable;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryPanel.html b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryPanel.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryPanel.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryPanel.java b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryPanel.javasimilarity index 88%rename from server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryPanel.javarename to server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryPanel.javaindex fffe4e997a..3ec9ba9b93 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.savedquery;+package io.onedev.server.web.component.savedquery;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;@@ -7,7 +7,6 @@ import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.panel.Panel;import org.apache.wicket.request.cycle.RequestCycle;-import io.onedev.server.model.Project;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;@@ -20,11 +19,6 @@ public abstract class SaveQueryPanel extends Panel {super(id);}- private Project getProject() {- ProjectPage page = (ProjectPage) getPage();- return page.getProject();- }-@Overrideprotected void onInitialize() {super.onInitialize();@@ -61,7 +55,11 @@ public abstract class SaveQueryPanel extends Panel {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(SecurityUtils.canManage(getProject()));++ if (getPage() instanceof ProjectPage)+ setVisible(SecurityUtils.canManage(((ProjectPage)getPage()).getProject()));+ else+ setVisible(SecurityUtils.isAdministrator());}});diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesClosed.java b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesClosed.javasimilarity index 80%rename from server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesClosed.javarename to server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesClosed.javaindex adc052741b..91e7384556 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesClosed.java+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesClosed.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.savedquery;+package io.onedev.server.web.component.savedquery;import org.apache.wicket.ajax.AjaxRequestTarget;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesCssResourceReference.javasimilarity index 86%rename from server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesCssResourceReference.javarename to server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesCssResourceReference.javaindex 29c6e014e7..f3792b12e4 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesCssResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesCssResourceReference.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.savedquery;+package io.onedev.server.web.component.savedquery;import io.onedev.server.web.page.base.BaseDependentCssResourceReference;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesOpened.java b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesOpened.javasimilarity index 80%rename from server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesOpened.javarename to server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesOpened.javaindex bf61765177..17d5f9ad5f 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesOpened.java+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesOpened.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.savedquery;+package io.onedev.server.web.component.savedquery;import org.apache.wicket.ajax.AjaxRequestTarget;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.htmlsimilarity index 97%rename from server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.htmlindex c186ad31fc..f1234f5abf 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.html@@ -17,7 +17,7 @@</div><hr/></wicket:enclosure>- <div wicket:id="projectQueries">+ <div wicket:id="queries"><span class="btn-group"><a wicket:id="link" class="btn btn-sm btn-default"><span wicket:id="label"></span></a><a wicket:id="subscriptionStatus" class="subscription-status btn btn-default btn-sm"></a><a wicket:id="watchStatus" class="watch-status btn btn-default btn-sm"></a></span>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.javasimilarity index 88%rename from server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.javarename to server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.javaindex a84bb308c9..ee6c45ded2 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SavedQueriesPanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.savedquery;+package io.onedev.server.web.component.savedquery;import java.util.ArrayList;import java.util.HashSet;@@ -48,7 +48,6 @@ import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.component.watchstatus.WatchStatusLink;import io.onedev.server.web.editable.BeanContext;-import io.onedev.server.web.page.project.ProjectPage;@SuppressWarnings("serial")public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {@@ -73,10 +72,10 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {return new ArrayList<>();}- private WatchStatus getProjectWatchStatus(T namedQuery) {+ private WatchStatus getWatchStatus(T namedQuery) {QuerySetting<T> querySetting = getQuerySetting();if (querySetting != null)- return querySetting.getQueryWatchSupport().getProjectWatchStatus(namedQuery);+ return querySetting.getQueryWatchSupport().getWatchStatus(namedQuery);elsereturn WatchStatus.DEFAULT;}@@ -89,10 +88,10 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {return WatchStatus.DEFAULT;}- private boolean getProjectSubscriptionStatus(T namedQuery) {+ private boolean getSubscriptionStatus(T namedQuery) {QuerySetting<T> querySetting = getQuerySetting();if (querySetting != null)- return querySetting.getQuerySubscriptionSupport().getProjectQuerySubscriptions().contains(namedQuery.getName());+ return querySetting.getQuerySubscriptionSupport().getQuerySubscriptions().contains(namedQuery.getName());elsereturn false;}@@ -105,11 +104,6 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {return false;}- private Project getProject() {- ProjectPage page = (ProjectPage) getPage();- return page.getProject();- }-@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);@@ -196,15 +190,15 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {};}- private Component newProjectQueriesEditor(String componentId, ModalPanel modal, ArrayList<T> projectQueries,+ private Component newQueriesEditor(String componentId, ModalPanel modal, ArrayList<T> queries,@Nullable UseDefaultListener useDefaultListener) {- return new NamedQueriesEditor(componentId, projectQueries, useDefaultListener) {+ return new NamedQueriesEditor(componentId, queries, useDefaultListener) {@Overrideprotected void onSave(AjaxRequestTarget target, ArrayList<T> queries) {target.add(SavedQueriesPanel.this);modal.close();- onSaveProjectQueries(queries);+ onSaveQueries(queries);}@Override@@ -239,7 +233,7 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {});fragment.add(newUserQueriesEditor(TAB_PANEL_ID, modal, userQueries));- if (SecurityUtils.canManage(getProject())) {+ if (SecurityUtils.isAdministrator() || Project.get() != null && SecurityUtils.canManage(Project.get())) {tabs.add(new AjaxActionTab(Model.of("For All Users")) {@Override@@ -250,26 +244,26 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {@Overrideprotected void onSelect(AjaxRequestTarget target, Component tabLink) {- ArrayList<T> projectQueries = getProjectQueries();+ ArrayList<T> queries = getQueries();UseDefaultListener useDefaultListener;- if (projectQueries == null) {- projectQueries = new ArrayList<>(getDefaultProjectQueries());+ if (queries == null) {+ queries = new ArrayList<>(getDefaultQueries());useDefaultListener = null;- } else if (getDefaultProjectQueries() != null) {+ } else if (getDefaultQueries() != null) {useDefaultListener = new UseDefaultListener() {@Overridepublic void onUseDefault(AjaxRequestTarget target) {target.add(SavedQueriesPanel.this);modal.close();- onSaveProjectQueries(null);+ onSaveQueries(null);}};} else {useDefaultListener = null;}- Component editor = newProjectQueriesEditor(TAB_PANEL_ID, modal, projectQueries, useDefaultListener);+ Component editor = newQueriesEditor(TAB_PANEL_ID, modal, queries, useDefaultListener);fragment.replace(editor);target.add(editor);}@@ -376,12 +370,12 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {});- add(new ListView<T>("projectQueries", new LoadableDetachableModel<List<T>>() {+ add(new ListView<T>("queries", new LoadableDetachableModel<List<T>>() {@Overrideprotected List<T> load() {List<T> namedQueries = new ArrayList<>();- for (T namedQuery: getProjectQueries()!=null?getProjectQueries():getDefaultProjectQueries()) {+ for (T namedQuery: getQueries()!=null?getQueries():getDefaultQueries()) {try {if (SecurityUtils.getUser() != null || !needsLogin(namedQuery))namedQueries.add(namedQuery);@@ -408,13 +402,13 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {target.add(this);QuerySetting<T> querySetting = getQuerySetting();- querySetting.getQueryWatchSupport().setProjectWatchStatus(namedQuery, watchStatus);+ querySetting.getQueryWatchSupport().setWatchStatus(namedQuery, watchStatus);onSaveQuerySetting(querySetting);}@Overrideprotected WatchStatus getWatchStatus() {- return getProjectWatchStatus(namedQuery);+ return SavedQueriesPanel.this.getWatchStatus(namedQuery);}@Override@@ -433,15 +427,15 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {QuerySetting<T> querySetting = getQuerySetting();if (subscriptionStatus)- querySetting.getQuerySubscriptionSupport().getProjectQuerySubscriptions().add(namedQuery.getName());+ querySetting.getQuerySubscriptionSupport().getQuerySubscriptions().add(namedQuery.getName());else- querySetting.getQuerySubscriptionSupport().getProjectQuerySubscriptions().remove(namedQuery.getName());+ querySetting.getQuerySubscriptionSupport().getQuerySubscriptions().remove(namedQuery.getName());onSaveQuerySetting(querySetting);}@Overrideprotected boolean isSubscribed() {- return getProjectSubscriptionStatus(namedQuery);+ return getSubscriptionStatus(namedQuery);}@Override@@ -571,14 +565,14 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {protected abstract QuerySetting<T> getQuerySetting();@Nullable- protected abstract ArrayList<T> getProjectQueries();+ protected abstract ArrayList<T> getQueries();- protected abstract void onSaveProjectQueries(ArrayList<T> projectQueries);+ protected abstract void onSaveQueries(ArrayList<T> queries);protected abstract void onSaveQuerySetting(QuerySetting<T> querySetting);@Nullable- protected ArrayList<T> getDefaultProjectQueries() {+ protected ArrayList<T> getDefaultQueries() {return null;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/UseDefaultListener.java b/server-core/src/main/java/io/onedev/server/web/component/savedquery/UseDefaultListener.javasimilarity index 77%rename from server-core/src/main/java/io/onedev/server/web/page/project/savedquery/UseDefaultListener.javarename to server-core/src/main/java/io/onedev/server/web/component/savedquery/UseDefaultListener.javaindex 7ecf6bcb80..7f915cf115 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/UseDefaultListener.java+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/UseDefaultListener.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.savedquery;+package io.onedev.server.web.component.savedquery;import java.io.Serializable;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/savedquery/saved-queries.css b/server-core/src/main/java/io/onedev/server/web/component/savedquery/saved-queries.csssimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/page/project/savedquery/saved-queries.cssrename to server-core/src/main/java/io/onedev/server/web/component/savedquery/saved-queries.cssdiff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.javaindex 587f77e9dc..3952f09d61 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/group/GroupAuthorizationsPage.java@@ -31,7 +31,7 @@ public class GroupAuthorizationsPage extends GroupPage {super.onInitialize();AuthorizationsBean authorizationsBean = new AuthorizationsBean();- for (GroupAuthorization authorization: getGroup().getAuthorizations()) {+ for (GroupAuthorization authorization: getGroup().getProjectAuthorizations()) {AuthorizationBean authorizationBean = new AuthorizationBean();authorizationBean.setProjectName(authorization.getProject().getName());authorizationBean.setRoleName(authorization.getRole().getName());diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.javaindex 72ee47fe5f..8b4adc6396 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.java@@ -31,7 +31,7 @@ import com.google.common.collect.Sets;import io.onedev.commons.utils.StringUtils;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.model.support.issue.BoardSpec;import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.web.ajaxlistener.ConfirmListener;@@ -44,7 +44,7 @@ import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.layout.SideFloating;@SuppressWarnings("serial")-public class DefaultBoardListPage extends GlobalIssueSettingPage {+public class DefaultBoardListPage extends IssueSettingPage {private DataTable<BoardSpec, Void> boardsTable;@@ -131,7 +131,7 @@ public class DefaultBoardListPage extends GlobalIssueSettingPage {List<String> columnsForDisplay = new ArrayList<>();for (String column: rowModel.getObject().getColumns()) {if (column == null) {- GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();+ IssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();FieldSpec field = issueSetting.getFieldSpec(board.getIdentifyField());if (field != null)columnsForDisplay.add("<i>" + HtmlEscape.escapeHtml5(field.getNameOfEmptyValue()) + "</i>");diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultQueryListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultQueryListPage.htmldeleted file mode 100644index 59eb181231..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultQueryListPage.html+++ /dev/null@@ -1,10 +0,0 @@-<wicket:extend>- <form wicket:id="form" class="leave-confirm default-queries">- <div wicket:id="editor"></div>- <div class="help-block"><i class="fa fa-info-circle"></i> Define default issue queries for all projects here.- A certain project can override this setting to define its own issue queries.</div>- <div class="actions">- <input type="submit" class="btn btn-primary dirty-aware" value="Save">- </div>- </form>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultQueryListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultQueryListPage.javadeleted file mode 100644index 3b1daadb42..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultQueryListPage.java+++ /dev/null@@ -1,38 +0,0 @@-package io.onedev.server.web.page.admin.issuesetting;--import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.request.mapper.parameter.PageParameters;--import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.web.editable.PropertyContext;--@SuppressWarnings("serial")-public class DefaultQueryListPage extends GlobalIssueSettingPage {-- public DefaultQueryListPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- Form<?> form = new Form<Void>("form") {-- @Override- protected void onSubmit() {- super.onSubmit();- OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());- getSession().success("Default queries have been updated");-- setResponsePage(DefaultQueryListPage.class);- }-- };- form.add(PropertyContext.edit("editor", getSetting(), "defaultQueries"));-- add(form);- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultStateTransitionsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultStateTransitionsPage.javaindex dc0f9c76b7..3aeb75ca33 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultStateTransitionsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultStateTransitionsPage.java@@ -9,7 +9,7 @@ import io.onedev.server.web.component.issue.statetransition.StateTransitionListPimport io.onedev.server.web.component.issue.statetransition.UseDefaultListener;@SuppressWarnings("serial")-public class DefaultStateTransitionsPage extends GlobalIssueSettingPage {+public class DefaultStateTransitionsPage extends IssueSettingPage {public DefaultStateTransitionsPage(PageParameters params) {super(params);diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldBean.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldBean.javaindex 1398eb0aa8..3dff50f804 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldBean.java@@ -15,8 +15,6 @@ public class FieldBean implements Serializable {private FieldSpec field;private boolean promptUponIssueOpen = true;-- private boolean displayInIssueList = true;@Editable(name="Type", order=100)@NotNull(message="may not be empty")@@ -37,13 +35,4 @@ public class FieldBean implements Serializable {this.promptUponIssueOpen = promptUponIssueOpen;}- @Editable(order=300, description="If checked, this field will be displayed in issue list by default")- public boolean isDisplayInIssueList() {- return displayInIssueList;- }-- public void setDisplayInIssueList(boolean displayInIssueList) {- this.displayInIssueList = displayInIssueList;- }-}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.javaindex 3742ffec68..3e59814841 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.java@@ -18,13 +18,13 @@ import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.model.support.inputspec.InputContext;import io.onedev.server.model.support.inputspec.InputSpec;-import io.onedev.server.model.support.issue.fieldspec.ChoiceField;-import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.Choice;import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.SpecifiedChoices;+import io.onedev.server.model.support.issue.fieldspec.ChoiceField;+import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.util.ValueSetEdit;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;@@ -51,7 +51,6 @@ abstract class FieldEditPanel extends Panel implements InputContext {if (fieldIndex != -1) {bean.setField(SerializationUtils.clone(getSetting().getFieldSpecs().get(fieldIndex)));bean.setPromptUponIssueOpen(getSetting().getDefaultPromptFieldsUponIssueOpen().contains(bean.getField().getName()));- bean.setDisplayInIssueList(getSetting().getDefaultListFields().contains(bean.getField().getName()));}Form<?> form = new Form<Void>("form") {@@ -104,7 +103,7 @@ abstract class FieldEditPanel extends Panel implements InputContext {FieldSpec oldField = getSetting().getFieldSpecs().get(fieldIndex);getSetting().getFieldSpecs().set(fieldIndex, field);getSetting().getDefaultPromptFieldsUponIssueOpen().remove(oldField.getName());- getSetting().getDefaultListFields().remove(oldField.getName());+ getSetting().getListFields().remove(oldField.getName());if (!field.getName().equals(oldField.getName())) {getSetting().onRenameField(oldField.getName(), field.getName());getSetting().setReconciled(false);@@ -151,8 +150,6 @@ abstract class FieldEditPanel extends Panel implements InputContext {}if (bean.isPromptUponIssueOpen())getSetting().getDefaultPromptFieldsUponIssueOpen().add(field.getName());- if (bean.isDisplayInIssueList())- getSetting().getDefaultListFields().add(field.getName());OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());onSave(target);} else {@@ -181,7 +178,7 @@ abstract class FieldEditPanel extends Panel implements InputContext {add(form);}- protected abstract GlobalIssueSetting getSetting();+ protected abstract IssueSetting getSetting();protected abstract void onSave(AjaxRequestTarget target);diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/GlobalIssueSettingResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/GlobalIssueSettingResourceReference.javadeleted file mode 100644index eeb6407458..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/GlobalIssueSettingResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.page.admin.issuesetting;--import org.apache.wicket.request.resource.CssResourceReference;--public class GlobalIssueSettingResourceReference extends CssResourceReference {-- private static final long serialVersionUID = 1L;-- public GlobalIssueSettingResourceReference() {- super(GlobalIssueSettingResourceReference.class, "issue-setting.css");- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.javaindex 6277ebecfd..d20e5060bd 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java@@ -32,7 +32,7 @@ import com.google.common.collect.Sets;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.model.support.issue.fieldspec.FieldSpec;import io.onedev.server.web.ajaxlistener.ConfirmListener;import io.onedev.server.web.asset.inputspec.InputSpecCssResourceReference;@@ -46,7 +46,7 @@ import io.onedev.server.web.page.layout.SideFloating;import io.onedev.server.web.util.TextUtils;@SuppressWarnings("serial")-public class IssueFieldListPage extends GlobalIssueSettingPage {+public class IssueFieldListPage extends IssueSettingPage {public IssueFieldListPage(PageParameters params) {super(params);@@ -76,7 +76,7 @@ public class IssueFieldListPage extends GlobalIssueSettingPage {}@Override- protected GlobalIssueSetting getSetting() {+ protected IssueSetting getSetting() {return IssueFieldListPage.this.getSetting();}@@ -129,7 +129,7 @@ public class IssueFieldListPage extends GlobalIssueSettingPage {@Overrideprotected Component newLabel(String componentId) {- return new Label(componentId, TextUtils.describe(getSetting().getDefaultListFields().contains(field.getName())));+ return new Label(componentId, TextUtils.describe(getSetting().getListFields().contains(field.getName())));}});@@ -254,7 +254,6 @@ public class IssueFieldListPage extends GlobalIssueSettingPage {fragment.add(BeanContext.view("viewer1", field, Sets.newHashSet("name"), true));FieldBean bean = new FieldBean();bean.setPromptUponIssueOpen(getSetting().getDefaultPromptFieldsUponIssueOpen().contains(field.getName()));- bean.setDisplayInIssueList(getSetting().getDefaultListFields().contains(field.getName()));fragment.add(BeanContext.view("viewer2", bean, Sets.newHashSet("field"), true));fragment.add(new ModalLink("edit") {@@ -275,7 +274,7 @@ public class IssueFieldListPage extends GlobalIssueSettingPage {}@Override- protected GlobalIssueSetting getSetting() {+ protected IssueSetting getSetting() {return IssueFieldListPage.this.getSetting();}@@ -295,7 +294,7 @@ public class IssueFieldListPage extends GlobalIssueSettingPage {public void onClick(AjaxRequestTarget target) {getSetting().getFieldSpecs().remove(index);getSetting().getDefaultPromptFieldsUponIssueOpen().remove(field.getName());- getSetting().getDefaultListFields().remove(field.getName());+ getSetting().getListFields().remove(field.getName());getSetting().onDeleteField(field.getName());getSetting().setReconciled(false);OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/GlobalIssueSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueSettingPage.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/GlobalIssueSettingPage.htmlrename to server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueSettingPage.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/GlobalIssueSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueSettingPage.javasimilarity index 75%rename from server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/GlobalIssueSettingPage.javarename to server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueSettingPage.javaindex 50bbc416cf..aed0a0d797 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/GlobalIssueSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueSettingPage.java@@ -10,18 +10,18 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.page.admin.AdministrationPage;@SuppressWarnings("serial")-public class GlobalIssueSettingPage extends AdministrationPage {+public class IssueSettingPage extends AdministrationPage {- private final GlobalIssueSetting setting;+ private final IssueSetting setting;- public GlobalIssueSettingPage(PageParameters params) {+ public IssueSettingPage(PageParameters params) {super(params);setting = OneDev.getInstance(SettingManager.class).getIssueSetting();}@@ -34,18 +34,17 @@ public class GlobalIssueSettingPage extends AdministrationPage {tabs.add(new PageTab(Model.of("States"), IssueStateListPage.class));tabs.add(new PageTab(Model.of("Default State Transitions"), DefaultStateTransitionsPage.class));tabs.add(new PageTab(Model.of("Default Boards"), DefaultBoardListPage.class));- tabs.add(new PageTab(Model.of("Default Queries"), DefaultQueryListPage.class));add(new Tabbable("issueSettingTabs", tabs));}- public GlobalIssueSetting getSetting() {+ public IssueSetting getSetting() {return setting;}@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new GlobalIssueSettingResourceReference()));+ response.render(CssHeaderItem.forReference(new IssueSettingResourceReference()));}}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueSettingResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueSettingResourceReference.javanew file mode 100644index 0000000000..fe07642b7a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueSettingResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.page.admin.issuesetting;++import org.apache.wicket.request.resource.CssResourceReference;++public class IssueSettingResourceReference extends CssResourceReference {++ private static final long serialVersionUID = 1L;++ public IssueSettingResourceReference() {+ super(IssueSettingResourceReference.class, "issue-setting.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.javaindex 0f690e59c1..5eaad85193 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.java@@ -32,7 +32,7 @@ import com.google.common.collect.Sets;import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.model.support.issue.StateSpec;import io.onedev.server.web.ajaxlistener.ConfirmListener;import io.onedev.server.web.behavior.sortable.SortBehavior;@@ -43,7 +43,7 @@ import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.layout.SideFloating;@SuppressWarnings("serial")-public class IssueStateListPage extends GlobalIssueSettingPage {+public class IssueStateListPage extends IssueSettingPage {public IssueStateListPage(PageParameters params) {super(params);@@ -81,7 +81,7 @@ public class IssueStateListPage extends GlobalIssueSettingPage {}@Override- protected GlobalIssueSetting getSetting() {+ protected IssueSetting getSetting() {return IssueStateListPage.this.getSetting();}@@ -262,7 +262,7 @@ public class IssueStateListPage extends GlobalIssueSettingPage {}@Override- protected GlobalIssueSetting getSetting() {+ protected IssueSetting getSetting() {return IssueStateListPage.this.getSetting();}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.javaindex 3904bb24b8..04b8ee9cec 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.java@@ -11,7 +11,7 @@ import org.apache.wicket.request.cycle.RequestCycle;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.model.support.issue.StateSpec;import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.editable.BeanContext;@@ -123,7 +123,7 @@ abstract class StateEditPanel extends Panel {add(form);}- protected abstract GlobalIssueSetting getSetting();+ protected abstract IssueSetting getSetting();protected abstract void onSave(AjaxRequestTarget target);diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.javaindex 584d3477cb..8c89f35f81 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/user/UserAuthorizationsPage.java@@ -31,7 +31,7 @@ public class UserAuthorizationsPage extends UserPage {super.onInitialize();AuthorizationsBean authorizationsBean = new AuthorizationsBean();- for (UserAuthorization authorization: getUser().getAuthorizations()) {+ for (UserAuthorization authorization: getUser().getProjectAuthorizations()) {AuthorizationBean authorizationBean = new AuthorizationBean();authorizationBean.setProjectName(authorization.getProject().getName());authorizationBean.setRoleName(authorization.getRole().getName());diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.css b/server-core/src/main/java/io/onedev/server/web/page/base/base.cssindex ce4a8c9ac3..9a5ff68961 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.css+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.css@@ -502,7 +502,7 @@ a.input-clear {text-align: center;}a.input-clear.input-group-clear {- right: 42px;+ right: 45px;}.message-box>.content, .confirm-box>.content {font-size: 18px;diff --git a/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListCssResourceReference.javanew file mode 100644index 0000000000..57ba97a659--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.page.issue;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class IssueListCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public IssueListCssResourceReference() {+ super(IssueListCssResourceReference.class, "issue-list.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListPage.html b/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListPage.htmlnew file mode 100644index 0000000000..06e8e18d0c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListPage.html@@ -0,0 +1,9 @@+<wicket:extend>+ <div id="issue-list">+ <div wicket:id="workflowChangeAlert"></div>+ <div class="query-save-support">+ <div wicket:id="side" class="side"></div>+ <div wicket:id="main" class="main"></div>+ </div>+ </div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListPage.javanew file mode 100644index 0000000000..3565126269--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/issue/IssueListPage.java@@ -0,0 +1,242 @@+package io.onedev.server.web.page.issue;++import java.util.ArrayList;+import java.util.List;++import javax.annotation.Nullable;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.User;+import io.onedev.server.model.support.NamedQuery;+import io.onedev.server.model.support.QuerySetting;+import io.onedev.server.model.support.administration.IssueSetting;+import io.onedev.server.model.support.issue.NamedIssueQuery;+import io.onedev.server.search.entity.issue.IssueQuery;+import io.onedev.server.util.SecurityUtils;+import io.onedev.server.web.component.issue.list.IssueListPanel;+import io.onedev.server.web.component.issue.workflowreconcile.WorkflowChangeAlertPanel;+import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.component.savedquery.NamedQueriesBean;+import io.onedev.server.web.component.savedquery.SaveQueryPanel;+import io.onedev.server.web.component.savedquery.SavedQueriesPanel;+import io.onedev.server.web.page.layout.LayoutPage;+import io.onedev.server.web.util.NamedIssueQueriesBean;+import io.onedev.server.web.util.PagingHistorySupport;+import io.onedev.server.web.util.QuerySaveSupport;++@SuppressWarnings("serial")+public class IssueListPage extends LayoutPage {++ private static final String PARAM_CURRENT_PAGE = "currentPage";++ private static final String PARAM_QUERY = "query";++ private String query;++ public IssueListPage(PageParameters params) {+ super(params);+ query = params.get(PARAM_QUERY).toOptionalString();+ if (query != null && query.length() == 0) {+ query = null;+ List<String> queries = new ArrayList<>();+ if (getLoginUser() != null) {+ for (NamedIssueQuery namedQuery: getLoginUser().getIssueQuerySetting().getUserQueries())+ queries.add(namedQuery.getQuery());+ }+ for (NamedIssueQuery namedQuery: getIssueSetting().getNamedQueries())+ queries.add(namedQuery.getQuery());+ for (String each: queries) {+ try {+ if (SecurityUtils.getUser() != null || !IssueQuery.parse(null, each, true).needsLogin()) {+ query = each;+ break;+ }+ } catch (Exception e) {+ }+ }+ }+ }++ protected IssueSetting getIssueSetting() {+ return OneDev.getInstance(SettingManager.class).getIssueSetting();+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new WorkflowChangeAlertPanel("workflowChangeAlert") {++ @Override+ protected void onCompleted(AjaxRequestTarget target) {+ setResponsePage(getPageClass(), getPageParameters());+ }++ });++ SavedQueriesPanel<NamedIssueQuery> savedQueries;+ add(savedQueries = new SavedQueriesPanel<NamedIssueQuery>("side") {++ @Override+ protected NamedQueriesBean<NamedIssueQuery> newNamedQueriesBean() {+ return new NamedIssueQueriesBean();+ }++ @Override+ protected boolean needsLogin(NamedIssueQuery namedQuery) {+ return IssueQuery.parse(null, namedQuery.getQuery(), true).needsLogin();+ }++ @Override+ protected Link<Void> newQueryLink(String componentId, NamedIssueQuery namedQuery) {+ return new BookmarkablePageLink<Void>(componentId, IssueListPage.class,+ IssueListPage.paramsOf(namedQuery.getQuery(), 0));+ }++ @Override+ protected QuerySetting<NamedIssueQuery> getQuerySetting() {+ return getLoginUser().getIssueQuerySetting();+ }++ @Override+ protected void onSaveQuerySetting(QuerySetting<NamedIssueQuery> querySetting) {+ OneDev.getInstance(UserManager.class).save((User) querySetting);+ }++ @Override+ protected void onSaveQueries(ArrayList<NamedIssueQuery> queries) {+ getIssueSetting().setNamedQueries(queries);+ OneDev.getInstance(SettingManager.class).saveIssueSetting(getIssueSetting());+ }++ @Override+ protected ArrayList<NamedIssueQuery> getQueries() {+ return (ArrayList<NamedIssueQuery>) getIssueSetting().getNamedQueries();+ }++ });++ PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {++ @Override+ public PageParameters newPageParameters(int currentPage) {+ PageParameters params = paramsOf(query, 0);+ params.add(PARAM_CURRENT_PAGE, currentPage+1);+ return params;+ }++ @Override+ public int getCurrentPage() {+ return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;+ }++ };++ add(new IssueListPanel("main", null, query) {++ @Override+ protected PagingHistorySupport getPagingHistorySupport() {+ return pagingHistorySupport;+ }++ @Override+ protected void onQueryUpdated(AjaxRequestTarget target, String query) {+ setResponsePage(IssueListPage.class, paramsOf(query, 0));+ }++ @Override+ protected QuerySaveSupport getQuerySaveSupport() {+ return new QuerySaveSupport() {++ @Override+ public void onSaveQuery(AjaxRequestTarget target, String query) {+ new ModalPanel(target) {++ @Override+ protected Component newContent(String id) {+ return new SaveQueryPanel(id) {++ @Override+ protected void onSaveForMine(AjaxRequestTarget target, String name) {+ NamedIssueQuery namedQuery = NamedQuery.find(getLoginUser().getIssueQuerySetting().getUserQueries(), name);+ if (namedQuery == null) {+ namedQuery = new NamedIssueQuery(name, query);+ getLoginUser().getIssueQuerySetting().getUserQueries().add(namedQuery);+ } else {+ namedQuery.setQuery(query);+ }+ OneDev.getInstance(UserManager.class).save(getLoginUser());+ target.add(savedQueries);+ close();+ }++ @Override+ protected void onSaveForAll(AjaxRequestTarget target, String name) {+ IssueSetting issueSetting = getIssueSetting();+ NamedIssueQuery namedQuery = null;+ for (NamedIssueQuery each: issueSetting.getNamedQueries()) {+ if (each.getName().equals(name)) {+ namedQuery = each;+ break;+ }+ }+ if (namedQuery == null) {+ namedQuery = new NamedIssueQuery(name, query);+ issueSetting.getNamedQueries().add(namedQuery);+ } else {+ namedQuery.setQuery(query);+ }+ OneDev.getInstance(SettingManager.class).saveIssueSetting(getIssueSetting());+ target.add(savedQueries);+ close();+ }++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ close();+ }++ };+ }++ };+ }++ @Override+ public boolean isSavedQueriesVisible() {+ savedQueries.configure();+ return savedQueries.isVisible();+ }++ };+ }++ });+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new IssueListCssResourceReference()));+ }++ public static PageParameters paramsOf(@Nullable String query, int page) {+ PageParameters params = new PageParameters();+ if (query != null)+ params.add(PARAM_QUERY, query);+ if (page != 0)+ params.add(PARAM_CURRENT_PAGE, page);+ return params;+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/page/issue/issue-list.css b/server-core/src/main/java/io/onedev/server/web/page/issue/issue-list.cssnew file mode 100644index 0000000000..2395be3c4d--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/issue/issue-list.css@@ -0,0 +1,3 @@+#layout>.body>#issue-list .issue-list>.head>form {+ margin-right: 0;+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.htmlindex 313a2a4ce4..d380a115f7 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html@@ -18,6 +18,7 @@<div class="collapse navbar-collapse" id="navbar-collapse"><ul class="nav navbar-nav tabs"><li wicket:id="navProjects"><a wicket:id="link">Projects</a></li>+ <li wicket:id="navIssues"><a wicket:id="link">Issues</a></li><li wicket:id="navContributions"><a wicket:id="link"><span wicket:id="label"></span></a></li><li wicket:id="navAdministration" class="dropdown"><a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Administration <i class="fa fa-angle-down"></i></a>diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.javaindex df6d9792b7..705a7f7dd5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java@@ -33,8 +33,8 @@ import io.onedev.server.web.page.admin.groovyscript.GroovyScriptListPage;import io.onedev.server.web.page.admin.group.GroupListPage;import io.onedev.server.web.page.admin.group.GroupPage;import io.onedev.server.web.page.admin.group.NewGroupPage;-import io.onedev.server.web.page.admin.issuesetting.GlobalIssueSettingPage;import io.onedev.server.web.page.admin.issuesetting.IssueFieldListPage;+import io.onedev.server.web.page.admin.issuesetting.IssueSettingPage;import io.onedev.server.web.page.admin.jobexecutor.JobExecutorPage;import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;import io.onedev.server.web.page.admin.role.NewRolePage;@@ -48,6 +48,7 @@ import io.onedev.server.web.page.admin.user.NewUserPage;import io.onedev.server.web.page.admin.user.UserListPage;import io.onedev.server.web.page.admin.user.UserPage;import io.onedev.server.web.page.base.BasePage;+import io.onedev.server.web.page.issue.IssueListPage;import io.onedev.server.web.page.my.MyAvatarPage;import io.onedev.server.web.page.my.MyPage;import io.onedev.server.web.page.my.MyPasswordPage;@@ -81,6 +82,13 @@ public abstract class LayoutPage extends BasePage {projectsContainer.add(AttributeAppender.append("class", "active"));add(projectsContainer);+ WebMarkupContainer issuesContainer = new WebMarkupContainer("navIssues");+ issuesContainer.add(new ViewStateAwarePageLink<Void>("link", IssueListPage.class, IssueListPage.paramsOf("", 0)));++ if (getPage() instanceof IssueListPage)+ issuesContainer.add(AttributeAppender.append("class", "active"));+ add(issuesContainer);+RepeatingView contributionsView = new RepeatingView("navContributions");List<MainNavContribution> contributions = new ArrayList<>();for (MainNavContribution contribution: OneDev.getExtensions(MainNavContribution.class)) {@@ -151,7 +159,7 @@ public abstract class LayoutPage extends BasePage {administrationContainer.add(item = new WebMarkupContainer("issueSetting"));item.add(new ViewStateAwarePageLink<Void>("link", IssueFieldListPage.class));- if (getPage() instanceof GlobalIssueSettingPage)+ if (getPage() instanceof IssueSettingPage)item.add(AttributeAppender.append("class", "active"));administrationContainer.add(item = new WebMarkupContainer("mailSetting"));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.htmlindex 590d431bfa..0264852629 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectListPage.html@@ -6,7 +6,7 @@<input wicket:id="filterProjects" class="form-control search" placeholder="Filter projects"></div><div class="pull-left">- <a wicket:id="createProject" class="btn btn-default"><i class="fa fa-plus"></i> Create</a>+ <a wicket:id="createProject" class="btn btn-success"><i class="fa fa-plus"></i> New Project</a></div><div class="pull-left"><a wicket:id="showOrphanProjects" class="btn btn-default"><i class="fa fa-ext fa-repo"></i> Orphan Projects</a>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.javaindex 8340af90a2..edd39e2827 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@@ -53,7 +53,7 @@ import io.onedev.server.web.page.project.info.ProjectInfoPanel;import io.onedev.server.web.page.project.issues.ProjectIssuesPage;import io.onedev.server.web.page.project.issues.create.NewIssuePage;import io.onedev.server.web.page.project.issues.detail.IssueDetailPage;-import io.onedev.server.web.page.project.issues.list.IssueListPage;+import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;import io.onedev.server.web.page.project.pullrequests.InvalidPullRequestPage;import io.onedev.server.web.page.project.pullrequests.ProjectPullRequestsPage;import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;@@ -238,7 +238,7 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {});}- tabs.add(new ProjectTab(Model.of("Issues"), "fa fa-fw fa-bug", 0, IssueListPage.class, ProjectIssuesPage.class,+ tabs.add(new ProjectTab(Model.of("Issues"), "fa fa-fw fa-bug", 0, ProjectIssueListPage.class, ProjectIssuesPage.class,IssueDetailPage.class, NewIssuePage.class) {@Override@@ -247,8 +247,8 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {@Overrideprotected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new ViewStateAwarePageLink<Void>(linkId, IssueListPage.class,- IssueListPage.paramsOf(getProject(), "", 0));+ return new ViewStateAwarePageLink<Void>(linkId, ProjectIssueListPage.class,+ ProjectIssueListPage.paramsOf(getProject(), "", 0));}};}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.htmlindex ce590c0827..52b9354803 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.html@@ -12,7 +12,7 @@<input wicket:id="searchBranches" class="form-control search" placeholder="Search branches"></div><div class="pull-left">- <a wicket:id="createBranch" class="btn btn-success"><i class="fa fa-plus"></i> Create</a>+ <a wicket:id="createBranch" class="btn btn-success"><i class="fa fa-plus"></i> New Branch</a></div></div><table wicket:id="branches" class="table table-hover">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/NamedBuildQueriesBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/NamedBuildQueriesBean.javaindex d5db3feb5e..8d311b3acb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/NamedBuildQueriesBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/NamedBuildQueriesBean.java@@ -6,9 +6,9 @@ import java.util.List;import javax.validation.constraints.NotNull;import io.onedev.server.model.support.NamedBuildQuery;+import io.onedev.server.web.component.savedquery.NamedQueriesBean;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;-import io.onedev.server.web.page.project.savedquery.NamedQueriesBean;@Editablepublic class NamedBuildQueriesBean extends NamedQueriesBean<NamedBuildQuery> {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.javaindex 9a14db22be..8668524cd7 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@@ -17,15 +17,16 @@ import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.BuildQuerySetting;import io.onedev.server.model.Project;import io.onedev.server.model.support.NamedBuildQuery;+import io.onedev.server.model.support.NamedQuery;import io.onedev.server.model.support.QuerySetting;import io.onedev.server.search.entity.build.BuildQuery;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.component.build.list.BuildListPanel;import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.component.savedquery.NamedQueriesBean;+import io.onedev.server.web.component.savedquery.SaveQueryPanel;+import io.onedev.server.web.component.savedquery.SavedQueriesPanel;import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.page.project.savedquery.NamedQueriesBean;-import io.onedev.server.web.page.project.savedquery.SaveQueryPanel;-import io.onedev.server.web.page.project.savedquery.SavedQueriesPanel;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.server.web.util.QuerySaveSupport;@@ -47,7 +48,7 @@ public class ProjectBuildsPage extends ProjectPage {for (NamedBuildQuery namedQuery: getProject().getBuildQuerySettingOfCurrentUser().getUserQueries())queries.add(namedQuery.getQuery());}- for (NamedBuildQuery namedQuery: getProject().getSavedBuildQueries())+ for (NamedBuildQuery namedQuery: getProject().getNamedBuildQueries())queries.add(namedQuery.getQuery());query = null;for (String each: queries) {@@ -95,8 +96,8 @@ public class ProjectBuildsPage extends ProjectPage {}@Override- protected ArrayList<NamedBuildQuery> getProjectQueries() {- return getProject().getSavedBuildQueries();+ protected ArrayList<NamedBuildQuery> getQueries() {+ return getProject().getNamedBuildQueries();}@Override@@ -105,8 +106,8 @@ public class ProjectBuildsPage extends ProjectPage {}@Override- protected void onSaveProjectQueries(ArrayList<NamedBuildQuery> projectQueries) {- getProject().setSavedBuildQueries(projectQueries);+ protected void onSaveQueries(ArrayList<NamedBuildQuery> projectQueries) {+ getProject().setNamedBuildQueries(projectQueries);OneDev.getInstance(ProjectManager.class).save(getProject());}@@ -155,7 +156,7 @@ public class ProjectBuildsPage extends ProjectPage {@Overrideprotected void onSaveForMine(AjaxRequestTarget target, String name) {BuildQuerySetting setting = getProject().getBuildQuerySettingOfCurrentUser();- NamedBuildQuery namedQuery = setting.getUserQuery(name);+ NamedBuildQuery namedQuery = NamedQuery.find(setting.getUserQueries(), name);if (namedQuery == null) {namedQuery = new NamedBuildQuery(name, query);setting.getUserQueries().add(namedQuery);@@ -169,10 +170,10 @@ public class ProjectBuildsPage extends ProjectPage {@Overrideprotected void onSaveForAll(AjaxRequestTarget target, String name) {- NamedBuildQuery namedQuery = getProject().getSavedBuildQuery(name);+ NamedBuildQuery namedQuery = NamedQuery.find(getProject().getNamedBuildQueries(), name);if (namedQuery == null) {namedQuery = new NamedBuildQuery(name, query);- getProject().getSavedBuildQueries().add(namedQuery);+ getProject().getNamedBuildQueries().add(namedQuery);} else {namedQuery.setQuery(query);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/NamedCodeCommentQueriesBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/NamedCodeCommentQueriesBean.javaindex 90f7162410..cee4c83f2d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/NamedCodeCommentQueriesBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/codecomments/NamedCodeCommentQueriesBean.java@@ -6,9 +6,9 @@ import java.util.List;import javax.validation.constraints.NotNull;import io.onedev.server.model.support.NamedCodeCommentQuery;+import io.onedev.server.web.component.savedquery.NamedQueriesBean;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;-import io.onedev.server.web.page.project.savedquery.NamedQueriesBean;@Editablepublic class NamedCodeCommentQueriesBean extends NamedQueriesBean<NamedCodeCommentQuery> {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.javaindex 9b0ab259b9..17beb3ca85 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@@ -17,15 +17,16 @@ import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.CodeCommentQuerySetting;import io.onedev.server.model.Project;import io.onedev.server.model.support.NamedCodeCommentQuery;+import io.onedev.server.model.support.NamedQuery;import io.onedev.server.model.support.QuerySetting;import io.onedev.server.search.entity.codecomment.CodeCommentQuery;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.component.codecomment.CodeCommentListPanel;import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.component.savedquery.NamedQueriesBean;+import io.onedev.server.web.component.savedquery.SaveQueryPanel;+import io.onedev.server.web.component.savedquery.SavedQueriesPanel;import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.page.project.savedquery.NamedQueriesBean;-import io.onedev.server.web.page.project.savedquery.SaveQueryPanel;-import io.onedev.server.web.page.project.savedquery.SavedQueriesPanel;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.server.web.util.QuerySaveSupport;@@ -48,7 +49,7 @@ public class ProjectCodeCommentsPage extends ProjectPage {for (NamedCodeCommentQuery namedQuery: getProject().getCodeCommentQuerySettingOfCurrentUser().getUserQueries())queries.add(namedQuery.getQuery());}- for (NamedCodeCommentQuery namedQuery: getProject().getSavedCodeCommentQueries())+ for (NamedCodeCommentQuery namedQuery: getProject().getNamedCodeCommentQueries())queries.add(namedQuery.getQuery());for (String each: queries) {try {@@ -94,8 +95,8 @@ public class ProjectCodeCommentsPage extends ProjectPage {}@Override- protected ArrayList<NamedCodeCommentQuery> getProjectQueries() {- return getProject().getSavedCodeCommentQueries();+ protected ArrayList<NamedCodeCommentQuery> getQueries() {+ return getProject().getNamedCodeCommentQueries();}@Override@@ -104,8 +105,8 @@ public class ProjectCodeCommentsPage extends ProjectPage {}@Override- protected void onSaveProjectQueries(ArrayList<NamedCodeCommentQuery> projectQueries) {- getProject().setSavedCodeCommentQueries(projectQueries);+ protected void onSaveQueries(ArrayList<NamedCodeCommentQuery> projectQueries) {+ getProject().setNamedCodeCommentQueries(projectQueries);OneDev.getInstance(ProjectManager.class).save(getProject());}@@ -160,7 +161,7 @@ public class ProjectCodeCommentsPage extends ProjectPage {@Overrideprotected void onSaveForMine(AjaxRequestTarget target, String name) {CodeCommentQuerySetting setting = getProject().getCodeCommentQuerySettingOfCurrentUser();- NamedCodeCommentQuery namedQuery = setting.getUserQuery(name);+ NamedCodeCommentQuery namedQuery = NamedQuery.find(setting.getUserQueries(), name);if (namedQuery == null) {namedQuery = new NamedCodeCommentQuery(name, query);setting.getUserQueries().add(namedQuery);@@ -174,10 +175,10 @@ public class ProjectCodeCommentsPage extends ProjectPage {@Overrideprotected void onSaveForAll(AjaxRequestTarget target, String name) {- NamedCodeCommentQuery namedQuery = getProject().getSavedCodeCommentQuery(name);+ NamedCodeCommentQuery namedQuery = NamedQuery.find(getProject().getNamedCodeCommentQueries(), name);if (namedQuery == null) {namedQuery = new NamedCodeCommentQuery(name, query);- getProject().getSavedCodeCommentQueries().add(namedQuery);+ getProject().getNamedCodeCommentQueries().add(namedQuery);} else {namedQuery.setQuery(query);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/NamedCommitQueriesBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/NamedCommitQueriesBean.javaindex ea7529e1c1..84d525922a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/NamedCommitQueriesBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/NamedCommitQueriesBean.java@@ -6,9 +6,9 @@ import java.util.List;import javax.validation.constraints.NotNull;import io.onedev.server.model.support.NamedCommitQuery;+import io.onedev.server.web.component.savedquery.NamedQueriesBean;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;-import io.onedev.server.web.page.project.savedquery.NamedQueriesBean;@Editablepublic class NamedCommitQueriesBean extends NamedQueriesBean<NamedCommitQuery> {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.javaindex 7de7d0baeb..3ff1e19d69 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@@ -17,15 +17,16 @@ import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.CommitQuerySetting;import io.onedev.server.model.Project;import io.onedev.server.model.support.NamedCommitQuery;+import io.onedev.server.model.support.NamedQuery;import io.onedev.server.model.support.QuerySetting;import io.onedev.server.search.commit.CommitQuery;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.component.commit.list.CommitListPanel;import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.component.savedquery.NamedQueriesBean;+import io.onedev.server.web.component.savedquery.SaveQueryPanel;+import io.onedev.server.web.component.savedquery.SavedQueriesPanel;import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.page.project.savedquery.NamedQueriesBean;-import io.onedev.server.web.page.project.savedquery.SaveQueryPanel;-import io.onedev.server.web.page.project.savedquery.SavedQueriesPanel;import io.onedev.server.web.util.QuerySaveSupport;@SuppressWarnings("serial")@@ -52,7 +53,7 @@ public class ProjectCommitsPage extends ProjectPage {for (NamedCommitQuery namedQuery: getProject().getCommitQuerySettingOfCurrentUser().getUserQueries())queries.add(namedQuery.getQuery());}- for (NamedCommitQuery namedQuery: getProject().getSavedCommitQueries())+ for (NamedCommitQuery namedQuery: getProject().getNamedCommitQueries())queries.add(namedQuery.getQuery());for (String each: queries) {try {@@ -100,8 +101,8 @@ public class ProjectCommitsPage extends ProjectPage {}@Override- protected ArrayList<NamedCommitQuery> getProjectQueries() {- return getProject().getSavedCommitQueries();+ protected ArrayList<NamedCommitQuery> getQueries() {+ return getProject().getNamedCommitQueries();}@Override@@ -110,8 +111,8 @@ public class ProjectCommitsPage extends ProjectPage {}@Override- protected void onSaveProjectQueries(ArrayList<NamedCommitQuery> projectQueries) {- getProject().setSavedCommitQueries(projectQueries);+ protected void onSaveQueries(ArrayList<NamedCommitQuery> projectQueries) {+ getProject().setNamedCommitQueries(projectQueries);OneDev.getInstance(ProjectManager.class).save(getProject());}@@ -139,7 +140,7 @@ public class ProjectCommitsPage extends ProjectPage {@Overrideprotected void onSaveForMine(AjaxRequestTarget target, String name) {CommitQuerySetting setting = getProject().getCommitQuerySettingOfCurrentUser();- NamedCommitQuery namedQuery = setting.getUserQuery(name);+ NamedCommitQuery namedQuery = NamedQuery.find(setting.getUserQueries(), name);if (namedQuery == null) {namedQuery = new NamedCommitQuery(name, query);setting.getUserQueries().add(namedQuery);@@ -153,10 +154,10 @@ public class ProjectCommitsPage extends ProjectPage {@Overrideprotected void onSaveForAll(AjaxRequestTarget target, String name) {- NamedCommitQuery namedQuery = getProject().getSavedCommitQuery(name);+ NamedCommitQuery namedQuery = NamedQuery.find(getProject().getNamedCommitQueries(), name);if (namedQuery == null) {namedQuery = new NamedCommitQuery(name, query);- getProject().getSavedCommitQueries().add(namedQuery);+ getProject().getNamedCommitQueries().add(namedQuery);} else {namedQuery.setQuery(query);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/dashboard/ProjectDashboardPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/dashboard/ProjectDashboardPage.javaindex 9661f97ad8..9fa303b30b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/dashboard/ProjectDashboardPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/dashboard/ProjectDashboardPage.java@@ -6,7 +6,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;-import io.onedev.server.web.page.project.issues.list.IssueListPage;+import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;@SuppressWarnings("serial")public class ProjectDashboardPage extends ProjectPage {@@ -17,7 +17,7 @@ public class ProjectDashboardPage extends ProjectPage {if (SecurityUtils.canReadCode(getProject()))throw new RestartResponseException(ProjectBlobPage.class, ProjectBlobPage.paramsOf(getProject()));else- throw new RestartResponseException(IssueListPage.class, IssueListPage.paramsOf(getProject(), "", 0));+ throw new RestartResponseException(ProjectIssueListPage.class, ProjectIssueListPage.paramsOf(getProject(), "", 0));}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesPage.javaindex fc2cfb8777..421d2ca31e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/ProjectIssuesPage.java@@ -14,10 +14,11 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.util.scriptidentity.ScriptIdentity;import io.onedev.server.util.scriptidentity.ScriptIdentityAware;import io.onedev.server.util.scriptidentity.SiteAdministrator;+import io.onedev.server.web.component.issue.workflowreconcile.WorkflowChangeAlertPanel;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.PageTabLink;@@ -25,12 +26,11 @@ import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.issues.boards.IssueBoardsPage;-import io.onedev.server.web.page.project.issues.list.IssueListPage;+import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;import io.onedev.server.web.page.project.issues.milestones.MilestoneEditPage;import io.onedev.server.web.page.project.issues.milestones.MilestoneListPage;import io.onedev.server.web.page.project.issues.milestones.NewMilestonePage;-import io.onedev.server.web.page.project.issueworkflowreconcile.WorkflowChangeAlertPanel;@SuppressWarnings("serial")public abstract class ProjectIssuesPage extends ProjectPage implements ScriptIdentityAware {@@ -39,7 +39,7 @@ public abstract class ProjectIssuesPage extends ProjectPage implements ScriptIdesuper(params);}- protected GlobalIssueSetting getGlobalIssueSetting() {+ protected IssueSetting getIssueSetting() {return OneDev.getInstance(SettingManager.class).getIssueSetting();}@@ -57,7 +57,7 @@ public abstract class ProjectIssuesPage extends ProjectPage implements ScriptIde});List<Tab> tabs = new ArrayList<>();- tabs.add(new IssuesTab("Issue List", IssueListPage.class) {+ tabs.add(new IssuesTab("Issue List", ProjectIssueListPage.class) {@Overridepublic Component render(String componentId) {@@ -65,11 +65,10 @@ public abstract class ProjectIssuesPage extends ProjectPage implements ScriptIde@Overrideprotected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new ViewStateAwarePageLink<Void>(linkId, IssueListPage.class,- IssueListPage.paramsOf(getProject(), "", 0));+ return new ViewStateAwarePageLink<Void>(linkId, ProjectIssueListPage.class,+ ProjectIssueListPage.paramsOf(getProject(), "", 0));}};-}});diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.javaindex 2970441d63..bd8cffd6a6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java@@ -34,7 +34,7 @@ import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;-import io.onedev.server.web.page.project.issues.list.IssueListPage;+import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;@SuppressWarnings("serial")abstract class BacklogColumnPanel extends Panel {@@ -112,8 +112,8 @@ abstract class BacklogColumnPanel extends Panel {});if (getQuery() != null) {- PageParameters params = IssueListPage.paramsOf(getProject(), getQuery().toString(), 1);- add(new BookmarkablePageLink<Void>("viewAsList", IssueListPage.class, params));+ PageParameters params = ProjectIssueListPage.paramsOf(getProject(), getQuery().toString(), 1);+ add(new BookmarkablePageLink<Void>("viewAsList", ProjectIssueListPage.class, params));} else {add(new WebMarkupContainer("viewAsList").setVisible(false));}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.javaindex 5d5fdbefd3..42d4cf48ed 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java@@ -39,10 +39,10 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.model.support.inputspec.choiceinput.choiceprovider.ChoiceProvider;import io.onedev.server.model.support.issue.BoardSpec;-import io.onedev.server.model.support.issue.IssueSetting;+import io.onedev.server.model.support.issue.ProjectIssueSetting;import io.onedev.server.model.support.issue.StateSpec;import io.onedev.server.model.support.issue.TransitionSpec;import io.onedev.server.model.support.issue.fieldspec.ChoiceField;@@ -66,7 +66,7 @@ import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.user.ident.UserIdentPanel;import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;-import io.onedev.server.web.page.project.issues.list.IssueListPage;+import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;@SuppressWarnings("serial")abstract class BoardColumnPanel extends Panel implements EditContext {@@ -128,7 +128,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {return queryModel.getObject();}- private GlobalIssueSetting getIssueSetting() {+ private IssueSetting getIssueSetting() {return OneDev.getInstance(SettingManager.class).getIssueSetting();}@@ -150,7 +150,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {Issue issue = issueDragging.getIssue();if (Objects.equals(issue.getMilestone(), getMilestone())) {// move issue between board columns- IssueSetting workflow = getProject().getIssueSetting();+ ProjectIssueSetting workflow = getProject().getIssueSetting();String identifyField = getBoard().getIdentifyField();if (identifyField.equals(IssueConstants.FIELD_STATE)) {issue = SerializationUtils.clone(issue);@@ -264,8 +264,8 @@ abstract class BoardColumnPanel extends Panel implements EditContext {}if (getQuery() != null) {- PageParameters params = IssueListPage.paramsOf(getProject(), getQuery().toString(), 1);- head.add(new BookmarkablePageLink<Void>("viewAsList", IssueListPage.class, params));+ PageParameters params = ProjectIssueListPage.paramsOf(getProject(), getQuery().toString(), 1);+ head.add(new BookmarkablePageLink<Void>("viewAsList", ProjectIssueListPage.class, params));} else {head.add(new WebMarkupContainer("viewAsList").setVisible(false));}@@ -340,7 +340,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {OneDev.getInstance(IssueChangeManager.class).changeMilestone(issue, getMilestone(), SecurityUtils.getUser());markAccepted(target, issue, true);} else if (fieldName.equals(IssueConstants.FIELD_STATE)) {- IssueSetting workflow = getProject().getIssueSetting();+ ProjectIssueSetting workflow = getProject().getIssueSetting();AtomicReference<TransitionSpec> transitionRef = new AtomicReference<>(null);for (TransitionSpec transition: workflow.getTransitionSpecs(true)) {if (transition.canTransite(issue)diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.javaindex 9885dbc5e9..7b32bcd600 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java@@ -15,7 +15,7 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.model.support.inputspec.InputContext;import io.onedev.server.model.support.inputspec.InputSpec;import io.onedev.server.search.entity.issue.IssueCriteria;@@ -24,9 +24,9 @@ import io.onedev.server.util.scriptidentity.ScriptIdentity;import io.onedev.server.util.scriptidentity.ScriptIdentityAware;import io.onedev.server.util.scriptidentity.SiteAdministrator;import io.onedev.server.web.component.issue.create.NewIssueEditor;+import io.onedev.server.web.component.issue.workflowreconcile.WorkflowChangeAlertPanel;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;-import io.onedev.server.web.page.project.issueworkflowreconcile.WorkflowChangeAlertPanel;import io.onedev.server.web.page.security.LoginPage;@SuppressWarnings("serial")@@ -107,7 +107,7 @@ public class NewIssuePage extends ProjectPage implements InputContext, ScriptIdeadd(form);}- private GlobalIssueSetting getIssueSetting() {+ private IssueSetting getIssueSetting() {return OneDev.getInstance(SettingManager.class).getIssueSetting();}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.javaindex b3c9dbff3f..580dc9c4d3 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java@@ -41,6 +41,7 @@ import io.onedev.server.web.component.issue.operation.IssueOperationsPanel;import io.onedev.server.web.component.issue.pullrequests.IssuePullRequestsPanel;import io.onedev.server.web.component.issue.side.IssueSidePanel;import io.onedev.server.web.component.issue.title.IssueTitlePanel;+import io.onedev.server.web.component.issue.workflowreconcile.WorkflowChangeAlertPanel;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.sideinfo.SideInfoPanel;import io.onedev.server.web.component.tabbable.PageTab;@@ -49,8 +50,7 @@ import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.issues.create.NewIssuePage;-import io.onedev.server.web.page.project.issues.list.IssueListPage;-import io.onedev.server.web.page.project.issueworkflowreconcile.WorkflowChangeAlertPanel;+import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;import io.onedev.server.web.util.ConfirmOnClick;import io.onedev.server.web.util.QueryPosition;import io.onedev.server.web.util.QueryPositionSupport;@@ -187,11 +187,11 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex@Overridepublic void onClick() {OneDev.getInstance(IssueManager.class).delete(getIssue());- PageParameters params = IssueListPage.paramsOf(+ PageParameters params = ProjectIssueListPage.paramsOf(getProject(),QueryPosition.getQuery(position),QueryPosition.getPage(position) + 1);- setResponsePage(IssueListPage.class, params);+ setResponsePage(ProjectIssueListPage.class, params);}};diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/IssueListPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/page/project/issues/list/IssueListPage.htmlrename to server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/IssueListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.javasimilarity index 79%rename from server-core/src/main/java/io/onedev/server/web/page/project/issues/list/IssueListPage.javarename to server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.javaindex 5b3af7a90d..d7adf0e21b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/IssueListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.java@@ -16,22 +16,24 @@ import io.onedev.server.entitymanager.IssueQuerySettingManager;import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.model.IssueQuerySetting;import io.onedev.server.model.Project;+import io.onedev.server.model.support.NamedQuery;import io.onedev.server.model.support.QuerySetting;-import io.onedev.server.model.support.issue.IssueSetting;import io.onedev.server.model.support.issue.NamedIssueQuery;+import io.onedev.server.model.support.issue.ProjectIssueSetting;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.component.issue.list.IssueListPanel;import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.component.savedquery.NamedQueriesBean;+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;-import io.onedev.server.web.page.project.savedquery.NamedQueriesBean;-import io.onedev.server.web.page.project.savedquery.SaveQueryPanel;-import io.onedev.server.web.page.project.savedquery.SavedQueriesPanel;+import io.onedev.server.web.util.NamedIssueQueriesBean;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.server.web.util.QuerySaveSupport;@SuppressWarnings("serial")-public class IssueListPage extends ProjectIssuesPage {+public class ProjectIssueListPage extends ProjectIssuesPage {private static final String PARAM_CURRENT_PAGE = "currentPage";@@ -39,7 +41,7 @@ public class IssueListPage extends ProjectIssuesPage {private String query;- public IssueListPage(PageParameters params) {+ public ProjectIssueListPage(PageParameters params) {super(params);query = params.get(PARAM_QUERY).toOptionalString();if (query != null && query.length() == 0) {@@ -49,7 +51,7 @@ public class IssueListPage extends ProjectIssuesPage {for (NamedIssueQuery namedQuery: getProject().getIssueQuerySettingOfCurrentUser().getUserQueries())queries.add(namedQuery.getQuery());}- for (NamedIssueQuery namedQuery: getProject().getIssueSetting().getSavedQueries(true))+ for (NamedIssueQuery namedQuery: getProject().getIssueSetting().getNamedQueries(true))queries.add(namedQuery.getQuery());for (String each: queries) {try {@@ -86,8 +88,8 @@ public class IssueListPage extends ProjectIssuesPage {@Overrideprotected Link<Void> newQueryLink(String componentId, NamedIssueQuery namedQuery) {- return new BookmarkablePageLink<Void>(componentId, IssueListPage.class,- IssueListPage.paramsOf(getProject(), namedQuery.getQuery(), 0));+ return new BookmarkablePageLink<Void>(componentId, ProjectIssueListPage.class,+ ProjectIssueListPage.paramsOf(getProject(), namedQuery.getQuery(), 0));}@Override@@ -96,8 +98,8 @@ public class IssueListPage extends ProjectIssuesPage {}@Override- protected ArrayList<NamedIssueQuery> getProjectQueries() {- return (ArrayList<NamedIssueQuery>) getProject().getIssueSetting().getSavedQueries(false);+ protected ArrayList<NamedIssueQuery> getQueries() {+ return (ArrayList<NamedIssueQuery>) getProject().getIssueSetting().getNamedQueries(false);}@Override@@ -106,14 +108,14 @@ public class IssueListPage extends ProjectIssuesPage {}@Override- protected void onSaveProjectQueries(ArrayList<NamedIssueQuery> projectQueries) {- getProject().getIssueSetting().setSavedQueries(projectQueries);+ protected void onSaveQueries(ArrayList<NamedIssueQuery> projectQueries) {+ getProject().getIssueSetting().setNamedQueries(projectQueries);OneDev.getInstance(ProjectManager.class).save(getProject());}@Override- protected ArrayList<NamedIssueQuery> getDefaultProjectQueries() {- return (ArrayList<NamedIssueQuery>) getGlobalIssueSetting().getDefaultQueries();+ protected ArrayList<NamedIssueQuery> getDefaultQueries() {+ return (ArrayList<NamedIssueQuery>) getIssueSetting().getNamedQueries();}});@@ -143,7 +145,7 @@ public class IssueListPage extends ProjectIssuesPage {@Overrideprotected void onQueryUpdated(AjaxRequestTarget target, String query) {- setResponsePage(IssueListPage.class, paramsOf(getProject(), query, 0));+ setResponsePage(ProjectIssueListPage.class, paramsOf(getProject(), query, 0));}@Override@@ -161,7 +163,7 @@ public class IssueListPage extends ProjectIssuesPage {@Overrideprotected void onSaveForMine(AjaxRequestTarget target, String name) {IssueQuerySetting setting = getProject().getIssueQuerySettingOfCurrentUser();- NamedIssueQuery namedQuery = setting.getUserQuery(name);+ NamedIssueQuery namedQuery = NamedQuery.find(setting.getUserQueries(), name);if (namedQuery == null) {namedQuery = new NamedIssueQuery(name, query);setting.getUserQueries().add(namedQuery);@@ -175,14 +177,14 @@ public class IssueListPage extends ProjectIssuesPage {@Overrideprotected void onSaveForAll(AjaxRequestTarget target, String name) {- IssueSetting setting = getProject().getIssueSetting();- if (setting.getSavedQueries(false) == null) {- setting.setSavedQueries(new ArrayList<>(getGlobalIssueSetting().getDefaultQueries()));+ ProjectIssueSetting setting = getProject().getIssueSetting();+ if (setting.getNamedQueries(false) == null) {+ setting.setNamedQueries(new ArrayList<>(getIssueSetting().getNamedQueries()));}- NamedIssueQuery namedQuery = getProject().getIssueSetting().getSavedQuery(name);+ NamedIssueQuery namedQuery = getProject().getIssueSetting().getNamedQuery(name);if (namedQuery == null) {namedQuery = new NamedIssueQuery(name, query);- getProject().getIssueSetting().getSavedQueries(true).add(namedQuery);+ getProject().getIssueSetting().getNamedQueries(true).add(namedQuery);} else {namedQuery.setQuery(query);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.javaindex 3db4a95bce..86cfd29d11 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.java@@ -9,7 +9,7 @@ import org.apache.wicket.model.IModel;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.model.Milestone;-import io.onedev.server.model.support.administration.GlobalIssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;import io.onedev.server.model.support.issue.StateSpec;import io.onedev.server.search.entity.issue.IssueCriteria;import io.onedev.server.web.component.milestone.progress.MilestoneProgressBar;@@ -31,7 +31,7 @@ class IssueStatsPanel extends GenericPanel<Milestone> {add(new MilestoneProgressBar("progress", getModel()));- GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();+ IssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();IssueCriteria openCriteria = issueSetting.getCategoryCriteria(StateSpec.Category.OPEN);Link<Void> link = new BookmarkablePageLink<Void>("open", MilestoneDetailPage.class,MilestoneDetailPage.paramsOf(getMilestone(), openCriteria.toString()));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.htmlindex 691659c0e0..a1210664b5 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneListPage.html@@ -11,7 +11,7 @@<a wicket:id="sort" class="btn btn-default">Sort <i class="fa fa-caret-down"></i></a></div><div class="pull-right">- <a wicket:id="newMilestone" class="btn btn-success"><i class="fa fa-plus"></i> Create</a>+ <a wicket:id="newMilestone" class="btn btn-success"><i class="fa fa-plus"></i> New Milestone</a></div></div><div class="body">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/NamedPullRequestQueriesBean.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/NamedPullRequestQueriesBean.javaindex 39da28fdb8..fb507d3dfa 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/NamedPullRequestQueriesBean.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/NamedPullRequestQueriesBean.java@@ -6,9 +6,9 @@ import java.util.List;import javax.validation.constraints.NotNull;import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;+import io.onedev.server.web.component.savedquery.NamedQueriesBean;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;-import io.onedev.server.web.page.project.savedquery.NamedQueriesBean;@Editablepublic class NamedPullRequestQueriesBean extends NamedQueriesBean<NamedPullRequestQuery> {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.htmlindex 98cbfaf9bb..e083e3dc20 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/ProjectPullRequestsPage.html@@ -12,7 +12,7 @@</span></div></form>- <a wicket:id="newRequest" class="open-new btn btn-success"><i class="fa fa-plus"></i> Create</a>+ <a wicket:id="newRequest" class="open-new btn btn-success"><i class="fa fa-plus"></i> New Pull Request</a><div wicket:id="others" class="others clearfix"><a wicket:id="showSavedQueries" class="show-saved-queries pull-left"><i class="fa fa-eye"></i> Show Saved Queries</a><a wicket:id="saveQuery" class="pull-left save-query"><i class="fa fa-save"></i> Save Query</a>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.javaindex e5c44f3013..79fc3ed7b9 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@@ -49,6 +49,7 @@ import io.onedev.server.entitymanager.PullRequestQuerySettingManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestQuerySetting;+import io.onedev.server.model.support.NamedQuery;import io.onedev.server.model.support.QuerySetting;import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;import io.onedev.server.search.entity.pullrequest.PullRequestQuery;@@ -60,13 +61,13 @@ import io.onedev.server.web.component.branch.BranchLink;import io.onedev.server.web.component.datatable.HistoryAwareDataTable;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.pullrequest.summary.PullRequestSummaryPanel;+import io.onedev.server.web.component.savedquery.NamedQueriesBean;+import io.onedev.server.web.component.savedquery.SaveQueryPanel;+import io.onedev.server.web.component.savedquery.SavedQueriesClosed;+import io.onedev.server.web.component.savedquery.SavedQueriesOpened;+import io.onedev.server.web.component.savedquery.SavedQueriesPanel;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;-import io.onedev.server.web.page.project.savedquery.NamedQueriesBean;-import io.onedev.server.web.page.project.savedquery.SaveQueryPanel;-import io.onedev.server.web.page.project.savedquery.SavedQueriesClosed;-import io.onedev.server.web.page.project.savedquery.SavedQueriesOpened;-import io.onedev.server.web.page.project.savedquery.SavedQueriesPanel;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.server.web.util.QueryPosition;import io.onedev.server.web.util.VisibleVisitor;@@ -113,7 +114,7 @@ public class ProjectPullRequestsPage extends ProjectPage {for (NamedPullRequestQuery namedQuery: getProject().getPullRequestQuerySettingOfCurrentUser().getUserQueries())queries.add(namedQuery.getQuery());}- for (NamedPullRequestQuery namedQuery: getProject().getSavedPullRequestQueries())+ for (NamedPullRequestQuery namedQuery: getProject().getNamedPullRequestQueries())queries.add(namedQuery.getQuery());for (String each: queries) {try {@@ -170,8 +171,8 @@ public class ProjectPullRequestsPage extends ProjectPage {}@Override- protected ArrayList<NamedPullRequestQuery> getProjectQueries() {- return getProject().getSavedPullRequestQueries();+ protected ArrayList<NamedPullRequestQuery> getQueries() {+ return getProject().getNamedPullRequestQueries();}@Override@@ -180,8 +181,8 @@ public class ProjectPullRequestsPage extends ProjectPage {}@Override- protected void onSaveProjectQueries(ArrayList<NamedPullRequestQuery> projectQueries) {- getProject().setSavedPullRequestQueries(projectQueries);+ protected void onSaveQueries(ArrayList<NamedPullRequestQuery> projectQueries) {+ getProject().setNamedPullRequestQueries(projectQueries);OneDev.getInstance(ProjectManager.class).save(getProject());}@@ -255,7 +256,7 @@ public class ProjectPullRequestsPage extends ProjectPage {@Overrideprotected void onSaveForMine(AjaxRequestTarget target, String name) {PullRequestQuerySetting setting = getProject().getPullRequestQuerySettingOfCurrentUser();- NamedPullRequestQuery namedQuery = setting.getUserQuery(name);+ NamedPullRequestQuery namedQuery = NamedQuery.find(setting.getUserQueries(), name);if (namedQuery == null) {namedQuery = new NamedPullRequestQuery(name, query);setting.getUserQueries().add(namedQuery);@@ -269,10 +270,10 @@ public class ProjectPullRequestsPage extends ProjectPage {@Overrideprotected void onSaveForAll(AjaxRequestTarget target, String name) {- NamedPullRequestQuery namedQuery = getProject().getSavedPullRequestQuery(name);+ NamedPullRequestQuery namedQuery = NamedQuery.find(getProject().getNamedPullRequestQueries(), name);if (namedQuery == null) {namedQuery = new NamedPullRequestQuery(name, query);- getProject().getSavedPullRequestQueries().add(namedQuery);+ getProject().getNamedPullRequestQueries().add(namedQuery);} else {namedQuery.setQuery(query);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/project-pullrequests.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/project-pullrequests.cssindex a395839086..5fac00085c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/project-pullrequests.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/project-pullrequests.css@@ -8,7 +8,7 @@margin-bottom: 20px;}#project-pullrequests>.main>.head>form {- margin-right: 100px;+ margin-right: 170px;}#project-pullrequests>.main>.head>.open-new {position: absolute;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/IssueSettingPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/ProjectIssueSettingPage.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/IssueSettingPage.htmlrename to server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/ProjectIssueSettingPage.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/IssueSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/ProjectIssueSettingPage.javasimilarity index 84%rename from server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/IssueSettingPage.javarename to server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/ProjectIssueSettingPage.javaindex 198c7d3eaa..9851e99bda 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/IssueSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/ProjectIssueSettingPage.java@@ -13,20 +13,20 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.entitymanager.SettingManager;-import io.onedev.server.model.support.administration.GlobalIssueSetting;-import io.onedev.server.model.support.issue.IssueSetting;+import io.onedev.server.model.support.administration.IssueSetting;+import io.onedev.server.model.support.issue.ProjectIssueSetting;+import io.onedev.server.web.component.issue.workflowreconcile.WorkflowChangeAlertPanel;import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.PageTabLink;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.page.project.ProjectPage;-import io.onedev.server.web.page.project.issueworkflowreconcile.WorkflowChangeAlertPanel;import io.onedev.server.web.page.project.setting.ProjectSettingPage;@SuppressWarnings("serial")-public abstract class IssueSettingPage extends ProjectSettingPage {+public abstract class ProjectIssueSettingPage extends ProjectSettingPage {- public IssueSettingPage(PageParameters params) {+ public ProjectIssueSettingPage(PageParameters params) {super(params);}@@ -64,11 +64,11 @@ public abstract class IssueSettingPage extends ProjectSettingPage {add(new Tabbable("issueSettingTabs", tabs));}- protected IssueSetting getSetting() {+ protected ProjectIssueSetting getProjectSetting() {return getProject().getIssueSetting();}- protected GlobalIssueSetting getGlobalSetting() {+ protected IssueSetting getSetting() {return OneDev.getInstance(SettingManager.class).getIssueSetting();}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/PromptFieldsUponIssueOpenSettingPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/PromptFieldsUponIssueOpenSettingPage.javaindex 24626d66e6..651483be21 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/PromptFieldsUponIssueOpenSettingPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/PromptFieldsUponIssueOpenSettingPage.java@@ -4,7 +4,6 @@ import java.util.Collection;import java.util.HashSet;import java.util.LinkedHashMap;import java.util.Map;-import java.util.Set;import org.apache.wicket.Session;import org.apache.wicket.markup.html.form.Form;@@ -18,13 +17,13 @@ import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.web.component.stringchoice.StringMultiChoice;@SuppressWarnings("serial")-public class PromptFieldsUponIssueOpenSettingPage extends IssueSettingPage {+public class PromptFieldsUponIssueOpenSettingPage extends ProjectIssueSettingPage {- private Set<String> fieldSet;+ private Collection<String> fieldSet;public PromptFieldsUponIssueOpenSettingPage(PageParameters params) {super(params);- fieldSet = getSetting().getPromptFieldsUponIssueOpen(true);+ fieldSet = getProjectSetting().getPromptFieldsUponIssueOpen(true);}@Override@@ -36,7 +35,7 @@ public class PromptFieldsUponIssueOpenSettingPage extends IssueSettingPage {@Overrideprotected void onSubmit() {super.onSubmit();- getSetting().setPromptFieldsUponIssueOpen(fieldSet);+ getProjectSetting().setPromptFieldsUponIssueOpen(fieldSet);OneDev.getInstance(ProjectManager.class).save(getProject());setResponsePage(PromptFieldsUponIssueOpenSettingPage.class, PromptFieldsUponIssueOpenSettingPage.paramsOf(getProject()));Session.get().success("Setting saved");@@ -65,7 +64,7 @@ public class PromptFieldsUponIssueOpenSettingPage extends IssueSettingPage {@Overrideprotected Map<String, String> load() {Map<String, String> choices = new LinkedHashMap<>();- for (String fieldName: getGlobalSetting().getFieldNames())+ for (String fieldName: getSetting().getFieldNames())choices.put(fieldName, fieldName);return choices;}@@ -76,7 +75,7 @@ public class PromptFieldsUponIssueOpenSettingPage extends IssueSettingPage {@Overridepublic void onClick() {- getSetting().setPromptFieldsUponIssueOpen(null);+ getProjectSetting().setPromptFieldsUponIssueOpen(null);OneDev.getInstance(ProjectManager.class).save(getProject());setResponsePage(PromptFieldsUponIssueOpenSettingPage.class, PromptFieldsUponIssueOpenSettingPage.paramsOf(getProject()));Session.get().success("Reset to default setting");@@ -85,7 +84,7 @@ public class PromptFieldsUponIssueOpenSettingPage extends IssueSettingPage {@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(getSetting().getPromptFieldsUponIssueOpen(false) != null);+ setVisible(getProjectSetting().getPromptFieldsUponIssueOpen(false) != null);}});diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/StateTransitionsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/StateTransitionsPage.javaindex 7602f9f939..98cc66e7dd 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/StateTransitionsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/issue/StateTransitionsPage.java@@ -12,13 +12,13 @@ import io.onedev.server.web.component.issue.statetransition.StateTransitionListPimport io.onedev.server.web.component.issue.statetransition.UseDefaultListener;@SuppressWarnings("serial")-public class StateTransitionsPage extends IssueSettingPage {+public class StateTransitionsPage extends ProjectIssueSettingPage {private List<TransitionSpec> transitions;public StateTransitionsPage(PageParameters params) {super(params);- transitions = getSetting().getTransitionSpecs(true);+ transitions = getProjectSetting().getTransitionSpecs(true);}@Override@@ -29,18 +29,18 @@ public class StateTransitionsPage extends IssueSettingPage {@Overrideprotected void onChanged(AjaxRequestTarget target) {- getSetting().setTransitionSpecs(transitions);+ getProjectSetting().setTransitionSpecs(transitions);OneDev.getInstance(ProjectManager.class).save(getProject());}@Overrideprotected UseDefaultListener getUseDefaultListener() {- if (getSetting().getTransitionSpecs(false) != null) {+ if (getProjectSetting().getTransitionSpecs(false) != null) {return new UseDefaultListener() {@Overridepublic void onUseDefault() {- getSetting().setTransitionSpecs(null);+ getProjectSetting().setTransitionSpecs(null);OneDev.getInstance(ProjectManager.class).save(getProject());setResponsePage(StateTransitionsPage.class, StateTransitionsPage.paramsOf(getProject()));}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.htmlindex 08dbb4e39a..33cfc85c28 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/tags/ProjectTagsPage.html@@ -8,7 +8,7 @@<input wicket:id="searchTags" class="form-control search" placeholder="Search tags"></div><div class="pull-left">- <a wicket:id="createTag" class="btn btn-success"><i class="fa fa-plus"></i> Create</a>+ <a wicket:id="createTag" class="btn btn-success"><i class="fa fa-plus"></i> New Tag</a></div></div><div wicket:id="tagsContainer">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/NamedIssueQueriesBean.java b/server-core/src/main/java/io/onedev/server/web/util/NamedIssueQueriesBean.javasimilarity index 84%rename from server-core/src/main/java/io/onedev/server/web/page/project/issues/list/NamedIssueQueriesBean.javarename to server-core/src/main/java/io/onedev/server/web/util/NamedIssueQueriesBean.javaindex 1481832e6b..7b3f028412 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/NamedIssueQueriesBean.java+++ b/server-core/src/main/java/io/onedev/server/web/util/NamedIssueQueriesBean.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.issues.list;+package io.onedev.server.web.util;import java.util.ArrayList;import java.util.List;@@ -6,9 +6,9 @@ import java.util.List;import javax.validation.constraints.NotNull;import io.onedev.server.model.support.issue.NamedIssueQuery;+import io.onedev.server.web.component.savedquery.NamedQueriesBean;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;-import io.onedev.server.web.page.project.savedquery.NamedQueriesBean;@Editablepublic class NamedIssueQueriesBean extends NamedQueriesBean<NamedIssueQuery> {