Skip to content

The Unified and Autonomous Development Platform

Define issue fields and states in global setting

Robin Shen0a9e45f60c14
diff --git a/core/src/main/java/io/onedev/server/manager/IssueManager.java b/core/src/main/java/io/onedev/server/manager/IssueManager.java
index 61fb80711f..827de2d3ac 100644
--- a/core/src/main/java/io/onedev/server/manager/IssueManager.java
+++ b/core/src/main/java/io/onedev/server/manager/IssueManager.java
@@ -10,13 +10,13 @@ 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.issue.workflow.StateSpec;
+import io.onedev.server.model.support.issue.StateSpec;
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.issues.workflowreconcile.UndefinedFieldResolution;
import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;
-import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValueResolution;
import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedStateResolution;
public interface IssueManager extends EntityManager<Issue> {
@@ -34,19 +34,19 @@ public interface IssueManager extends EntityManager<Issue> {
int count(Milestone milestone, User user, @Nullable StateSpec.Category category);
- Collection<String> getUndefinedStates(Project project);
+ Collection<String> getUndefinedStates();
- void fixUndefinedStates(Project project, Map<String, UndefinedStateResolution> resolutions);
+ void fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions);
- Collection<String> getUndefinedFields(Project project);
+ Collection<String> getUndefinedFields();
- void fixUndefinedFields(Project project, Map<String, UndefinedFieldResolution> resolutions);
+ void fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions);
- Collection<UndefinedFieldValue> getUndefinedFieldValues(Project project);
+ Collection<UndefinedFieldValue> getUndefinedFieldValues();
- void fixUndefinedFieldValues(Project project, Map<UndefinedFieldValue, UndefinedFieldValueResolution> resolutions);
+ void fixUndefinedFieldValues(Map<String, ValueSetEdit> valueSetEdits);
- void fixFieldValueOrders(Project project);
+ void fixFieldValueOrders();
void delete(User user, Issue issue);
}
diff --git a/core/src/main/java/io/onedev/server/manager/SettingManager.java b/core/src/main/java/io/onedev/server/manager/SettingManager.java
index 92cc102f3e..9e223b175a 100644
--- a/core/src/main/java/io/onedev/server/manager/SettingManager.java
+++ b/core/src/main/java/io/onedev/server/manager/SettingManager.java
@@ -5,6 +5,7 @@ import javax.annotation.Nullable;
import io.onedev.server.model.Setting;
import io.onedev.server.model.support.authenticator.Authenticator;
import io.onedev.server.model.support.setting.BackupSetting;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.model.support.setting.MailSetting;
import io.onedev.server.model.support.setting.SecuritySetting;
import io.onedev.server.model.support.setting.SystemSetting;
@@ -89,6 +90,10 @@ public interface SettingManager extends EntityManager<Setting> {
void saveSecuritySetting(SecuritySetting securitySetting);
+ GlobalIssueSetting getIssueSetting();
+
+ void saveIssueSetting(GlobalIssueSetting issueSetting);
+
@Nullable
Authenticator getAuthenticator();
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultConfigurationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultConfigurationManager.java
index 51a39aa455..e2a8b06edc 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultConfigurationManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultConfigurationManager.java
@@ -45,7 +45,7 @@ public class DefaultConfigurationManager extends AbstractEntityManager<Configura
for (Project project: projectManager.query()) {
for (BranchProtection protection: project.getBranchProtections())
protection.onRenameConfiguration(oldName, configuration.getName());
- project.getIssueWorkflow().onRenameConfiguration(oldName, configuration.getName());
+ project.getIssueSetting().onRenameConfiguration(oldName, configuration.getName());
}
}
}
@@ -57,7 +57,7 @@ public class DefaultConfigurationManager extends AbstractEntityManager<Configura
for (Project project: projectManager.query()) {
for (BranchProtection protection: project.getBranchProtections())
protection.onDeleteConfiguration(configuration.getName());
- project.getIssueWorkflow().onDeleteConfiguration(configuration.getName());
+ project.getIssueSetting().onDeleteConfiguration(configuration.getName());
}
}
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultDataManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultDataManager.java
index 20f849fe42..4f4a9bbb30 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultDataManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultDataManager.java
@@ -34,6 +34,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.setting.BackupSetting;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.model.support.setting.MailSetting;
import io.onedev.server.model.support.setting.SecuritySetting;
import io.onedev.server.model.support.setting.SystemSetting;
@@ -56,7 +57,7 @@ public class DefaultDataManager implements DataManager, Serializable {
private final UserManager userManager;
- private final SettingManager configManager;
+ private final SettingManager settingManager;
private final IdManager idManager;
@@ -74,11 +75,11 @@ public class DefaultDataManager implements DataManager, Serializable {
@Inject
public DefaultDataManager(IdManager idManager, UserManager userManager,
- SettingManager configManager, PersistManager persistManager,
+ SettingManager settingManager, PersistManager persistManager,
MailManager mailManager, Validator validator, TaskScheduler taskScheduler,
PasswordService passwordService) {
this.userManager = userManager;
- this.configManager = configManager;
+ this.settingManager = settingManager;
this.validator = validator;
this.taskScheduler = taskScheduler;
this.idManager = idManager;
@@ -115,15 +116,15 @@ public class DefaultDataManager implements DataManager, Serializable {
});
}
- Setting systemConfig = configManager.getSetting(Key.SYSTEM);
+ Setting setting = settingManager.getSetting(Key.SYSTEM);
SystemSetting systemSetting = null;
- if (systemConfig == null || systemConfig.getValue() == null) {
+ if (setting == null || setting.getValue() == null) {
systemSetting = new SystemSetting();
systemSetting.setServerUrl(OneDev.getInstance().guessServerUrl());
} else {
- if (!validator.validate(systemConfig.getValue()).isEmpty())
- systemSetting = (SystemSetting) systemConfig.getValue();
+ if (!validator.validate(setting.getValue()).isEmpty())
+ systemSetting = (SystemSetting) setting.getValue();
}
if (systemSetting != null) {
manualConfigs.add(new ManualConfig("Specify System Setting", systemSetting) {
@@ -135,26 +136,30 @@ public class DefaultDataManager implements DataManager, Serializable {
@Override
public void complete() {
- configManager.saveSystemSetting((SystemSetting) getSetting());
+ settingManager.saveSystemSetting((SystemSetting) getSetting());
}
});
}
- Setting securityConfig = configManager.getSetting(Key.SECURITY);
- if (securityConfig == null) {
- configManager.saveSecuritySetting(new SecuritySetting());
+ setting = settingManager.getSetting(Key.SECURITY);
+ if (setting == null) {
+ settingManager.saveSecuritySetting(new SecuritySetting());
}
- Setting authenticatorConfig = configManager.getSetting(Key.AUTHENTICATOR);
- if (authenticatorConfig == null) {
- configManager.saveAuthenticator(null);
+ setting = settingManager.getSetting(Key.ISSUE);
+ if (setting == null) {
+ settingManager.saveIssueSetting(new GlobalIssueSetting());
+ }
+ setting = settingManager.getSetting(Key.AUTHENTICATOR);
+ if (setting == null) {
+ settingManager.saveAuthenticator(null);
}
- Setting mailConfig = configManager.getSetting(Key.MAIL);
- if (mailConfig == null) {
- configManager.saveMailSetting(null);
- } else if (mailConfig.getValue() != null && !validator.validate(mailConfig.getValue()).isEmpty()) {
- manualConfigs.add(new ManualConfig("Specify Mail Setting", mailConfig.getValue()) {
+ setting = settingManager.getSetting(Key.MAIL);
+ if (setting == null) {
+ settingManager.saveMailSetting(null);
+ } else if (setting.getValue() != null && !validator.validate(setting.getValue()).isEmpty()) {
+ manualConfigs.add(new ManualConfig("Specify Mail Setting", setting.getValue()) {
@Override
public Skippable getSkippable() {
@@ -163,17 +168,17 @@ public class DefaultDataManager implements DataManager, Serializable {
@Override
public void complete() {
- configManager.saveMailSetting((MailSetting) getSetting());
+ settingManager.saveMailSetting((MailSetting) getSetting());
}
});
}
- Setting backupConfig = configManager.getSetting(Key.BACKUP);
- if (backupConfig == null) {
- configManager.saveBackupSetting(null);
- } else if (backupConfig.getValue() != null && !validator.validate(backupConfig.getValue()).isEmpty()) {
- Serializable backupSetting = backupConfig.getValue();
+ setting = settingManager.getSetting(Key.BACKUP);
+ if (setting == null) {
+ settingManager.saveBackupSetting(null);
+ } else if (setting.getValue() != null && !validator.validate(setting.getValue()).isEmpty()) {
+ Serializable backupSetting = setting.getValue();
manualConfigs.add(new ManualConfig("Specify Backup Setting", backupSetting) {
@Override
@@ -183,15 +188,15 @@ public class DefaultDataManager implements DataManager, Serializable {
@Override
public void complete() {
- configManager.saveBackupSetting((BackupSetting) getSetting());
+ settingManager.saveBackupSetting((BackupSetting) getSetting());
}
});
}
- Setting licenseKeyConfig = configManager.getSetting(Key.LICENSE);
- if (licenseKeyConfig == null) {
- configManager.saveLicense(null);
+ setting = settingManager.getSetting(Key.LICENSE);
+ if (setting== null) {
+ settingManager.saveLicense(null);
}
return manualConfigs;
@@ -237,13 +242,13 @@ public class DefaultDataManager implements DataManager, Serializable {
@Listen
public void on(SystemStarting event) {
- scheduleBackup(configManager.getBackupSetting());
+ scheduleBackup(settingManager.getBackupSetting());
}
@Sessional
protected void notifyBackupError(Exception e) {
User root = userManager.getRoot();
- String url = configManager.getSystemSetting().getServerUrl();
+ String url = settingManager.getSystemSetting().getServerUrl();
String body = String.format(""
+ "OneDev url: <a href='%s'>%s</a>"
+ "<p style='margin: 16px 0;'>"
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultGroupManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultGroupManager.java
index 39457077df..a840b28600 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultGroupManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultGroupManager.java
@@ -25,20 +25,20 @@ public class DefaultGroupManager extends AbstractEntityManager<Group> implements
private final ProjectManager projectManager;
- private final SettingManager configManager;
+ private final SettingManager settingManager;
- private final CacheManager cacheManager;
+ private final IssueFieldUnaryManager issueFieldUnaryManager;
- private final IssueFieldUnaryManager issueFieldManager;
+ private final CacheManager cacheManager;
@Inject
- public DefaultGroupManager(Dao dao, ProjectManager projectManager, SettingManager configManager,
- CacheManager cacheManager, IssueFieldUnaryManager issueFieldManager) {
+ public DefaultGroupManager(Dao dao, ProjectManager projectManager, SettingManager settingManager,
+ IssueFieldUnaryManager issueFieldUnaryManager, CacheManager cacheManager) {
super(dao);
this.projectManager = projectManager;
- this.configManager = configManager;
+ this.settingManager = settingManager;
+ this.issueFieldUnaryManager = issueFieldUnaryManager;
this.cacheManager = cacheManager;
- this.issueFieldManager = issueFieldManager;
}
@Transactional
@@ -50,16 +50,17 @@ public class DefaultGroupManager extends AbstractEntityManager<Group> implements
protection.onRenameGroup(oldName, group.getName());
for (TagProtection protection: project.getTagProtections())
protection.onRenameGroup(oldName, group.getName());
- project.getIssueWorkflow().onRenameGroup(oldName, group.getName());
+ project.getIssueSetting().onRenameGroup(oldName, group.getName());
}
- Authenticator authenticator = configManager.getAuthenticator();
+ Authenticator authenticator = settingManager.getAuthenticator();
if (authenticator != null) {
- authenticator.onRenameGroup(oldName, group.getName() );
- configManager.saveAuthenticator(authenticator);
+ authenticator.onRenameGroup(oldName, group.getName());
+ settingManager.saveAuthenticator(authenticator);
}
- issueFieldManager.onRenameGroup(oldName, group.getName());
+ issueFieldUnaryManager.onRenameGroup(oldName, group.getName());
+ settingManager.getIssueSetting().onRenameGroup(oldName, group.getName());
}
dao.persist(group);
}
@@ -76,13 +77,14 @@ public class DefaultGroupManager extends AbstractEntityManager<Group> implements
if (it.next().onDeleteGroup(group.getName()))
it.remove();
}
- project.getIssueWorkflow().onDeleteGroup(group.getName());
+ project.getIssueSetting().onDeleteGroup(group.getName());
}
- Authenticator authenticator = configManager.getAuthenticator();
+ Authenticator authenticator = settingManager.getAuthenticator();
if (authenticator != null) {
authenticator.onDeleteGroup(group.getName());
- configManager.saveAuthenticator(authenticator);
+ settingManager.saveAuthenticator(authenticator);
}
+ settingManager.getIssueSetting().onDeleteGroup(group.getName());
dao.remove(group);
}
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java
index f01c002387..f3c0bdcd64 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java
@@ -33,19 +33,19 @@ import io.onedev.server.model.IssueChange;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
+import io.onedev.server.model.support.issue.TransitionSpec;
import io.onedev.server.model.support.issue.changedata.IssueBatchUpdateData;
import io.onedev.server.model.support.issue.changedata.IssueDescriptionChangeData;
import io.onedev.server.model.support.issue.changedata.IssueFieldChangeData;
import io.onedev.server.model.support.issue.changedata.IssueMilestoneChangeData;
import io.onedev.server.model.support.issue.changedata.IssueStateChangeData;
import io.onedev.server.model.support.issue.changedata.IssueTitleChangeData;
-import io.onedev.server.model.support.issue.workflow.TransitionSpec;
-import io.onedev.server.model.support.issue.workflow.transitiontrigger.BuildSuccessfulTrigger;
-import io.onedev.server.model.support.issue.workflow.transitiontrigger.CommitTrigger;
-import io.onedev.server.model.support.issue.workflow.transitiontrigger.DiscardPullRequest;
-import io.onedev.server.model.support.issue.workflow.transitiontrigger.MergePullRequest;
-import io.onedev.server.model.support.issue.workflow.transitiontrigger.OpenPullRequest;
-import io.onedev.server.model.support.issue.workflow.transitiontrigger.PullRequestTrigger;
+import io.onedev.server.model.support.issue.transitiontrigger.BuildSuccessfulTrigger;
+import io.onedev.server.model.support.issue.transitiontrigger.CommitTrigger;
+import io.onedev.server.model.support.issue.transitiontrigger.DiscardPullRequest;
+import io.onedev.server.model.support.issue.transitiontrigger.MergePullRequest;
+import io.onedev.server.model.support.issue.transitiontrigger.OpenPullRequest;
+import io.onedev.server.model.support.issue.transitiontrigger.PullRequestTrigger;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestDiscardData;
import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeData;
import io.onedev.server.persistence.UnitOfWork;
@@ -207,7 +207,7 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange
@Transactional
@Listen
public void on(BuildEvent event) {
- for (TransitionSpec transition: event.getBuild().getConfiguration().getProject().getIssueWorkflow().getTransitionSpecs()) {
+ for (TransitionSpec transition: event.getBuild().getConfiguration().getProject().getIssueSetting().getTransitionSpecs(true)) {
if (transition.getTrigger() instanceof BuildSuccessfulTrigger) {
BuildSuccessfulTrigger trigger = (BuildSuccessfulTrigger) transition.getTrigger();
if (trigger.getConfiguration().equals(event.getBuild().getConfiguration().getName())
@@ -261,7 +261,7 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange
}
private void on(PullRequest request, Class<? extends PullRequestTrigger> triggerClass) {
- for (TransitionSpec transition: request.getTargetProject().getIssueWorkflow().getTransitionSpecs()) {
+ for (TransitionSpec transition: request.getTargetProject().getIssueSetting().getTransitionSpecs(true)) {
if (transition.getTrigger().getClass() == triggerClass) {
PullRequestTrigger trigger = (PullRequestTrigger) transition.getTrigger();
if (trigger.getBranch().equals(request.getTargetBranch())) {
@@ -295,7 +295,7 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange
@Listen
public void on(IssueCommitted event) {
Issue issue = event.getIssue();
- for (TransitionSpec transition: issue.getProject().getIssueWorkflow().getTransitionSpecs()) {
+ for (TransitionSpec transition: issue.getProject().getIssueSetting().getTransitionSpecs(true)) {
if (transition.getTrigger() instanceof CommitTrigger && transition.getFromStates().contains(issue.getState())) {
issue.removeFields(transition.getRemoveFields());
changeState(issue, transition.getToState(), new HashMap<>(), null, null);
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java
index 55ae6f513c..80c33e1c0c 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java
@@ -35,15 +35,17 @@ import io.onedev.server.event.issue.IssueOpened;
import io.onedev.server.manager.IssueFieldUnaryManager;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.manager.IssueQuerySettingManager;
+import io.onedev.server.manager.ProjectManager;
+import io.onedev.server.manager.SettingManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueFieldUnary;
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.issue.IssueBoard;
import io.onedev.server.model.support.issue.NamedIssueQuery;
-import io.onedev.server.model.support.issue.workflow.StateSpec;
+import io.onedev.server.model.support.issue.StateSpec;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.AbstractEntityManager;
@@ -58,15 +60,12 @@ import io.onedev.server.search.entity.issue.IssueCriteria;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.search.entity.issue.IssueQueryBuildContext;
import io.onedev.server.search.entity.issue.MilestoneCriteria;
-import io.onedev.server.util.EditContext;
import io.onedev.server.util.IssueConstants;
-import io.onedev.server.util.OneContext;
-import io.onedev.server.util.inputspec.InputContext;
+import io.onedev.server.util.ValueSetEdit;
import io.onedev.server.util.inputspec.InputSpec;
-import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;
+import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldResolution;
import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;
-import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValueResolution;
import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedStateResolution;
@Singleton
@@ -77,14 +76,21 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
private final ListenerRegistry listenerRegistry;
private final IssueQuerySettingManager issueQuerySettingManager;
+
+ private final SettingManager settingManager;
+
+ private final ProjectManager projectManager;
@Inject
public DefaultIssueManager(Dao dao, IssueFieldUnaryManager issueFieldUnaryManager,
- IssueQuerySettingManager issueQuerySettingManager, ListenerRegistry listenerRegistry) {
+ IssueQuerySettingManager issueQuerySettingManager, SettingManager settingManager,
+ ListenerRegistry listenerRegistry, ProjectManager projectManager) {
super(dao);
this.issueFieldUnaryManager = issueFieldUnaryManager;
this.issueQuerySettingManager = issueQuerySettingManager;
this.listenerRegistry = listenerRegistry;
+ this.settingManager = settingManager;
+ this.projectManager = projectManager;
}
@Sessional
@@ -149,6 +155,10 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
return query;
}
+
+ private GlobalIssueSetting getGlobalIssueSetting() {
+ return settingManager.getIssueSetting();
+ }
@Sessional
@Override
@@ -188,7 +198,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
@Override
public int count(Milestone milestone, User user, @Nullable StateSpec.Category category) {
if (category != null) {
- IssueCriteria criteria = milestone.getProject().getIssueWorkflow().getCategoryCriteria(category);
+ IssueCriteria criteria = getGlobalIssueSetting().getCategoryCriteria(category);
if (criteria != null) {
List<IssueCriteria> criterias = new ArrayList<>();
criterias.add(new MilestoneCriteria(milestone.getName()));
@@ -206,63 +216,49 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
@SuppressWarnings("unchecked")
@Sessional
@Override
- public Collection<String> getUndefinedStates(Project project) {
- Query<String> query = getSession().createQuery("select distinct state from Issue where project=:project");
- query.setParameter("project", project);
+ public Collection<String> getUndefinedStates() {
+ Query<String> query = getSession().createQuery("select distinct state from Issue");
- Set<String> states = new HashSet<>(query.getResultList());
- for (Iterator<String> it = states.iterator(); it.hasNext();) {
- if (project.getIssueWorkflow().getStateSpec(it.next()) != null)
+ Set<String> undefinedStates = new HashSet<>(query.getResultList());
+ for (Iterator<String> it = undefinedStates.iterator(); it.hasNext();) {
+ if (getGlobalIssueSetting().getStateSpec(it.next()) != null)
it.remove();
}
- for (NamedIssueQuery namedQuery: project.getSavedIssueQueries()) {
- try {
- states.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false).getUndefinedStates(project));
- } catch (Exception e) {
- }
+ for (Project project: projectManager.query()) {
+ undefinedStates.addAll(project.getIssueSetting().getUndefinedStates(project));
}
- for (IssueQuerySetting setting: project.getIssueQuerySettings()) {
+ for (IssueQuerySetting setting: issueQuerySettingManager.query()) {
for (NamedIssueQuery namedQuery: setting.getUserQueries()) {
try {
- states.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false).getUndefinedStates(project));
+ undefinedStates.addAll(IssueQuery.parse(setting.getProject(), namedQuery.getQuery(), false).getUndefinedStates());
} catch (Exception e) {
}
}
}
-
- for (IssueBoard board: project.getIssueBoards())
- states.addAll(board.getUndefinedStates(project));
- return states;
+ return undefinedStates;
}
@Transactional
@Override
- public void fixUndefinedStates(Project project, Map<String, UndefinedStateResolution> resolutions) {
+ public void fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {
for (Map.Entry<String, UndefinedStateResolution> entry: resolutions.entrySet()) {
- Query<?> query = getSession().createQuery("update Issue set state=:newState where state=:oldState and project=:project");
- query.setParameter("project", project);
+ Query<?> query = getSession().createQuery("update Issue set state=:newState where state=:oldState");
query.setParameter("oldState", entry.getKey());
query.setParameter("newState", entry.getValue().getNewState());
query.executeUpdate();
}
- for (NamedIssueQuery namedQuery: project.getSavedIssueQueries()) {
- 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) {
- }
+ for (Project project: projectManager.query()) {
+ project.getIssueSetting().fixUndefinedStates(project, resolutions);
}
- for (IssueQuerySetting setting: project.getIssueQuerySettings()) {
+ for (IssueQuerySetting setting: issueQuerySettingManager.query()) {
for (NamedIssueQuery namedQuery: setting.getUserQueries()) {
try {
- IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), false);
+ 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());
@@ -272,8 +268,6 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
issueQuerySettingManager.save(setting);
}
- for (IssueBoard board: project.getIssueBoards())
- board.fixUndefinedStates(project, resolutions);
}
@Sessional
@@ -321,96 +315,62 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
return issues;
}
-
- @SuppressWarnings({ "unchecked", "rawtypes" })
+ @SuppressWarnings("unchecked")
@Sessional
@Override
- public Collection<String> getUndefinedFields(Project project) {
- Query query = getSession().createQuery("select distinct name from IssueFieldUnary where issue.project=:project");
- query.setParameter("project", project);
+ public Collection<String> getUndefinedFields() {
+ Query<?> query = getSession().createQuery("select distinct name from IssueFieldUnary");
Set<String> undefinedFields = new HashSet<>();
- for (String name: (List<String>)query.getResultList()) {
- if (project.getIssueWorkflow().getFieldSpec(name) == null)
- undefinedFields.add(name);
- }
- for (String fieldName: project.getIssueListFields()) {
- if (!IssueConstants.DISPLAY_FIELDS.contains(fieldName) && project.getIssueWorkflow().getFieldSpec(fieldName) == null)
+ for (String fieldName: (List<String>)query.getResultList()) {
+ InputSpec field = getGlobalIssueSetting().getFieldSpec(fieldName);
+ if (field == null)
undefinedFields.add(fieldName);
}
- for (NamedIssueQuery namedQuery: project.getSavedIssueQueries()) {
- try {
- undefinedFields.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false).getUndefinedFields(project));
- } catch (Exception e) {
- }
+ for (Project project: projectManager.query()) {
+ undefinedFields.addAll(project.getIssueSetting().getUndefinedFields(project));
}
- for (IssueQuerySetting setting: project.getIssueQuerySettings()) {
+ for (IssueQuerySetting setting: issueQuerySettingManager.query()) {
for (NamedIssueQuery namedQuery: setting.getUserQueries()) {
try {
- undefinedFields.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false).getUndefinedFields(project));
+ undefinedFields.addAll(IssueQuery.parse(setting.getProject(), namedQuery.getQuery(), false).getUndefinedFields());
} catch (Exception e) {
}
}
}
- for (IssueBoard board: project.getIssueBoards())
- undefinedFields.addAll(board.getUndefinedFields(project));
return undefinedFields;
}
- @SuppressWarnings("rawtypes")
@Transactional
@Override
- public void fixUndefinedFields(Project project, Map<String, UndefinedFieldResolution> resolutions) {
+ public void fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {
for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {
- Query query;
+ Query<?> query;
if (entry.getValue().getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD) {
- query = getSession().createQuery("update IssueFieldUnary set name=:newName where name=:oldName and issue.id in (select id from Issue where project=:project)");
+ query = getSession().createQuery("update IssueFieldUnary set name=:newName where name=:oldName");
query.setParameter("oldName", entry.getKey());
query.setParameter("newName", entry.getValue().getNewField());
-
- int index = project.getIssueListFields().indexOf(entry.getKey());
- if (index != -1)
- project.getIssueListFields().set(index, entry.getValue().getNewField());
} else {
- query = getSession().createQuery("delete from IssueFieldUnary where name=:fieldName and issue.id in (select id from Issue where project=:project)");
+ query = getSession().createQuery("delete from IssueFieldUnary where name=:fieldName");
query.setParameter("fieldName", entry.getKey());
- project.getIssueListFields().remove(entry.getKey());
- }
- query.setParameter("project", project);
+ }
query.executeUpdate();
}
- for (Iterator<NamedIssueQuery> it = project.getSavedIssueQueries().iterator(); it.hasNext();) {
- NamedIssueQuery namedQuery = it.next();
- try {
- IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), false);
- boolean remove = false;
- for (Map.Entry<String, UndefinedFieldResolution> resolutionEntry: resolutions.entrySet()) {
- UndefinedFieldResolution resolution = resolutionEntry.getValue();
- if (resolution.getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD) {
- query.onRenameField(resolutionEntry.getKey(), resolution.getNewField());
- } else if (query.onDeleteField(resolutionEntry.getKey())) {
- remove = true;
- break;
- }
- }
- if (remove)
- it.remove();
- else
- namedQuery.setQuery(query.toString());
- } catch (Exception e) {
- }
+ for (Project project: projectManager.query()) {
+ project.getIssueSetting().fixUndefinedFields(project, resolutions);
}
- for (IssueQuerySetting setting: project.getIssueQuerySettings()) {
+
+ for (IssueQuerySetting setting: issueQuerySettingManager.query()) {
for (Iterator<NamedIssueQuery> it = setting.getUserQueries().iterator(); it.hasNext();) {
NamedIssueQuery namedQuery = it.next();
try {
- IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), false);
+ IssueQuery query = IssueQuery.parse(setting.getProject(), namedQuery.getQuery(), false);
boolean remove = false;
- for (Map.Entry<String, UndefinedFieldResolution> resolutionEntry: resolutions.entrySet()) {
- UndefinedFieldResolution resolution = resolutionEntry.getValue();
+ for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {
+ UndefinedFieldResolution resolution = entry.getValue();
if (resolution.getFixType() == UndefinedFieldResolution.FixType.CHANGE_TO_ANOTHER_FIELD) {
- query.onRenameField(resolutionEntry.getKey(), resolution.getNewField());
- } else if (query.onDeleteField(resolutionEntry.getKey())) {
+ query.onRenameField(entry.getKey(), resolution.getNewField());
+ } else if (query.onDeleteField(entry.getKey())) {
remove = true;
break;
}
@@ -422,143 +382,72 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
} catch (Exception e) {
}
}
- issueQuerySettingManager.save(setting);
}
- for (Iterator<IssueBoard> it = project.getIssueBoards().iterator(); it.hasNext();) {
- IssueBoard board = it.next();
- if (board.fixUndefinedFields(project, resolutions))
- it.remove();
- }
}
@SuppressWarnings({ "unchecked", "rawtypes" })
@Sessional
@Override
- public Collection<UndefinedFieldValue> getUndefinedFieldValues(Project project) {
- Query query = getSession().createQuery("select distinct name, value from IssueFieldUnary where issue.project=:project and type=:choice");
- query.setParameter("project", project);
+ public Collection<UndefinedFieldValue> getUndefinedFieldValues() {
+ Query query = getSession().createQuery("select distinct name, value from IssueFieldUnary where type=:choice");
query.setParameter("choice", InputSpec.ENUMERATION);
Set<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();
- OneContext.push(new OneContext() {
-
- @Override
- public Project getProject() {
- return project;
- }
-
- @Override
- public EditContext getEditContext(int level) {
- return new EditContext() {
-
- @Override
- public Object getInputValue(String name) {
- return null;
- }
-
- };
+ for (Object[] row: (List<Object[]>)query.getResultList()) {
+ String fieldName = (String) row[0];
+ String fieldValue = (String) row[1];
+ SpecifiedChoices specifiedChoices = SpecifiedChoices.of(getGlobalIssueSetting().getFieldSpec(fieldName));
+ if (specifiedChoices != null && !specifiedChoices.getChoiceValues().contains(fieldValue)) {
+ undefinedFieldValues.add(new UndefinedFieldValue(fieldName, fieldValue));
}
+ }
- @Override
- public InputContext getInputContext() {
- throw new UnsupportedOperationException();
- }
-
- });
- try {
- for (Object[] row: (List<Object[]>)query.getResultList()) {
- String name = (String) row[0];
- String value = (String) row[1];
- InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(name);
- if (fieldSpec != null && value != null) {
- List<String> choices = new ArrayList<>(((ChoiceInput)fieldSpec).getChoiceProvider().getChoices(true).keySet());
- if (!choices.contains(value))
- undefinedFieldValues.add(new UndefinedFieldValue(name, value));
- }
- }
-
- for (NamedIssueQuery namedQuery: project.getSavedIssueQueries()) {
+ for (Project project: projectManager.query()) {
+ undefinedFieldValues.addAll(project.getIssueSetting().getUndefinedFieldValues(project));
+ }
+
+ for (IssueQuerySetting setting: issueQuerySettingManager.query()) {
+ for (NamedIssueQuery namedQuery: setting.getUserQueries()) {
try {
- undefinedFieldValues.addAll(IssueQuery.parse(project, namedQuery.getQuery(), true).getUndefinedFieldValues(project));
+ undefinedFieldValues.addAll(IssueQuery.parse(setting.getProject(), namedQuery.getQuery(), false).getUndefinedFieldValues());
} catch (Exception e) {
}
}
- for (IssueQuerySetting setting: project.getIssueQuerySettings()) {
- for (NamedIssueQuery namedQuery: setting.getUserQueries()) {
- try {
- undefinedFieldValues.addAll(IssueQuery.parse(project, namedQuery.getQuery(), true).getUndefinedFieldValues(project));
- } catch (Exception e) {
- }
- }
- }
- for (IssueBoard board: project.getIssueBoards())
- undefinedFieldValues.addAll(board.getUndefinedFieldValues(project));
-
- return undefinedFieldValues;
- } finally {
- OneContext.pop();
}
+
+ return undefinedFieldValues;
}
@SuppressWarnings("rawtypes")
@Transactional
@Override
- public void fixUndefinedFieldValues(Project project, Map<UndefinedFieldValue, UndefinedFieldValueResolution> resolutions) {
- for (Map.Entry<UndefinedFieldValue, UndefinedFieldValueResolution> entry: resolutions.entrySet()) {
- Query query;
- if (entry.getValue().getFixType() == UndefinedFieldValueResolution.FixType.CHANGE_TO_ANOTHER_VALUE) {
- query = getSession().createQuery("update IssueFieldUnary set value=:newValue where name=:fieldName and value=:oldValue and issue.id in (select id from Issue where project=:project)");
- query.setParameter("fieldName", entry.getKey().getFieldName());
- query.setParameter("oldValue", entry.getKey().getFieldValue());
- query.setParameter("newValue", entry.getValue().getNewValue());
- } else {
- query = getSession().createQuery("delete from IssueFieldUnary where name=:fieldName and value=:fieldValue and issue.id in (select id from Issue where project=:project)");
- query.setParameter("fieldName", entry.getKey().getFieldName());
- query.setParameter("fieldValue", entry.getKey().getFieldValue());
+ public void fixUndefinedFieldValues(Map<String, ValueSetEdit> valueSetEdits) {
+ for (Map.Entry<String, ValueSetEdit> entry: valueSetEdits.entrySet()) {
+ for (String deletion: entry.getValue().getDeletions()) {
+ Query query = getSession().createQuery("delete from IssueFieldUnary where name=:fieldName and value=:fieldValue");
+ query.setParameter("fieldName", entry.getKey());
+ query.setParameter("fieldValue", deletion);
+ query.executeUpdate();
+ }
+ for (Map.Entry<String, String> renameEntry: entry.getValue().getRenames().entrySet()) {
+ Query query = getSession().createQuery("update IssueFieldUnary set value=:newValue where name=:fieldName and value=:oldValue");
+ query.setParameter("fieldName", entry.getKey());
+ query.setParameter("oldValue", renameEntry.getKey());
+ query.setParameter("newValue", renameEntry.getValue());
+ query.executeUpdate();
}
- query.setParameter("project", project);
- query.executeUpdate();
}
- for (Iterator<NamedIssueQuery> it = project.getSavedIssueQueries().iterator(); it.hasNext();) {
- NamedIssueQuery namedQuery = it.next();
- try {
- IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), true);
- boolean remove = false;
- for (Map.Entry<UndefinedFieldValue, UndefinedFieldValueResolution> resolutionEntry: resolutions.entrySet()) {
- UndefinedFieldValueResolution resolution = resolutionEntry.getValue();
- if (resolution.getFixType() == UndefinedFieldValueResolution.FixType.CHANGE_TO_ANOTHER_VALUE) {
- query.onRenameFieldValue(resolutionEntry.getKey().getFieldName(), resolutionEntry.getKey().getFieldValue(),
- resolutionEntry.getValue().getNewValue());
- } else if (query.onDeleteFieldValue(resolutionEntry.getKey().getFieldName(), resolutionEntry.getKey().getFieldValue())) {
- remove = true;
- break;
- }
- }
- if (remove)
- it.remove();
- else
- namedQuery.setQuery(query.toString());
- } catch (Exception e) {
- }
+ for (Project project: projectManager.query()) {
+ project.getIssueSetting().fixUndefinedFieldValues(project, valueSetEdits);
}
- for (IssueQuerySetting setting: project.getIssueQuerySettings()) {
+
+ for (IssueQuerySetting setting: issueQuerySettingManager.query()) {
for (Iterator<NamedIssueQuery> it = setting.getUserQueries().iterator(); it.hasNext();) {
NamedIssueQuery namedQuery = it.next();
try {
- IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), true);
- boolean remove = false;
- for (Map.Entry<UndefinedFieldValue, UndefinedFieldValueResolution> resolutionEntry: resolutions.entrySet()) {
- UndefinedFieldValueResolution resolution = resolutionEntry.getValue();
- if (resolution.getFixType() == UndefinedFieldValueResolution.FixType.CHANGE_TO_ANOTHER_VALUE) {
- query.onRenameFieldValue(resolutionEntry.getKey().getFieldName(), resolutionEntry.getKey().getFieldValue(),
- resolutionEntry.getValue().getNewValue());
- } else if (query.onDeleteFieldValue(resolutionEntry.getKey().getFieldName(), resolutionEntry.getKey().getFieldValue())) {
- remove = true;
- break;
- }
- }
- if (remove)
+ IssueQuery query = IssueQuery.parse(setting.getProject(), namedQuery.getQuery(), false);
+ if (query.fixUndefinedFieldValues(valueSetEdits))
it.remove();
else
namedQuery.setQuery(query.toString());
@@ -567,71 +456,33 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
}
issueQuerySettingManager.save(setting);
}
-
- for (Iterator<IssueBoard> it = project.getIssueBoards().iterator(); it.hasNext();) {
- if (it.next().fixUndefinedFieldValues(project, resolutions))
- it.remove();
- }
}
@SuppressWarnings({"unchecked", "rawtypes"})
@Transactional
@Override
- public void fixFieldValueOrders(Project project) {
- OneContext.push(new OneContext() {
-
- @Override
- public Project getProject() {
- return project;
- }
-
- @Override
- public EditContext getEditContext(int level) {
- return new EditContext() {
-
- @Override
- public Object getInputValue(String name) {
- return null;
- }
-
- };
- }
-
- @Override
- public InputContext getInputContext() {
- throw new UnsupportedOperationException();
- }
-
- });
- try {
- Query query = getSession().createQuery("select distinct name, value, ordinal from IssueFieldUnary where issue.project=:project and type=:choice");
- query.setParameter("project", project);
- query.setParameter("choice", InputSpec.ENUMERATION);
+ public void fixFieldValueOrders() {
+ Query query = getSession().createQuery("select distinct name, value, ordinal from IssueFieldUnary where type=:choice");
+ query.setParameter("choice", InputSpec.ENUMERATION);
- for (Object[] row: (List<Object[]>)query.getResultList()) {
- String name = (String) row[0];
- String value = (String) row[1];
- long ordinal = (long) row[2];
- InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(name);
- if (fieldSpec != null) {
- List<String> choices = new ArrayList<>(((ChoiceInput)fieldSpec).getChoiceProvider().getChoices(true).keySet());
- long newOrdinal = choices.indexOf(value);
- if (ordinal != newOrdinal) {
- query = getSession().createQuery("update IssueFieldUnary set ordinal=:newOrdinal where name=:fieldName and value=:fieldValue and issue.id in (select id from Issue where project=:project)");
- query.setParameter("fieldName", name);
- query.setParameter("fieldValue", value);
- query.setParameter("newOrdinal", newOrdinal);
- query.setParameter("project", project);
- query.executeUpdate();
- }
+ for (Object[] row: (List<Object[]>)query.getResultList()) {
+ String name = (String) row[0];
+ String value = (String) row[1];
+ long ordinal = (long) row[2];
+ SpecifiedChoices specifiedChoices = SpecifiedChoices.of(getGlobalIssueSetting().getFieldSpec(name));
+ if (specifiedChoices != null) {
+ long newOrdinal = specifiedChoices.getChoiceValues().indexOf(value);
+ if (ordinal != newOrdinal) {
+ query = getSession().createQuery("update IssueFieldUnary set ordinal=:newOrdinal where name=:fieldName and value=:fieldValue");
+ query.setParameter("fieldName", name);
+ query.setParameter("fieldValue", value);
+ query.setParameter("newOrdinal", newOrdinal);
+ query.executeUpdate();
}
}
- } finally {
- OneContext.pop();
}
-
}
-
+
@Override
public void delete(User user, Issue issue) {
super.delete(issue);
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java
index 8eff6e1014..136d62ffcf 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java
@@ -84,7 +84,7 @@ public class DefaultIssueNotificationManager {
@Override
protected NamedQuery getSavedProjectQuery(String name) {
- return issue.getProject().getSavedIssueQuery(name);
+ return issue.getProject().getIssueSetting().getSavedQuery(name);
}
}.getWatches().entrySet()) {
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueQuerySettingManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueQuerySettingManager.java
index 6f7081e378..55e313ebb4 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueQuerySettingManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueQuerySettingManager.java
@@ -40,7 +40,7 @@ public class DefaultIssueQuerySettingManager extends AbstractEntityManager<Issue
setting.getQueryWatchSupport().getUserQueryWatches().keySet().retainAll(
setting.getUserQueries().stream().map(it->it.getName()).collect(Collectors.toSet()));
setting.getQueryWatchSupport().getProjectQueryWatches().keySet().retainAll(
- setting.getProject().getSavedIssueQueries().stream().map(it->it.getName()).collect(Collectors.toSet()));
+ setting.getProject().getIssueSetting().getSavedQueries(true).stream().map(it->it.getName()).collect(Collectors.toSet()));
if (setting.getQueryWatchSupport().getProjectQueryWatches().isEmpty() && setting.getUserQueries().isEmpty()) {
if (!setting.isNew())
delete(setting);
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultMilestoneManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultMilestoneManager.java
index aacccf46cf..1692a2aedb 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultMilestoneManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultMilestoneManager.java
@@ -17,13 +17,15 @@ import io.onedev.server.event.entity.EntityRemoved;
import io.onedev.server.event.issue.IssueChangeEvent;
import io.onedev.server.event.issue.IssueOpened;
import io.onedev.server.manager.MilestoneManager;
+import io.onedev.server.manager.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.issue.StateSpec;
import io.onedev.server.model.support.issue.changedata.IssueBatchUpdateData;
import io.onedev.server.model.support.issue.changedata.IssueMilestoneChangeData;
import io.onedev.server.model.support.issue.changedata.IssueStateChangeData;
-import io.onedev.server.model.support.issue.workflow.StateSpec;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.persistence.annotation.Sessional;
import io.onedev.server.persistence.annotation.Transactional;
import io.onedev.server.persistence.dao.AbstractEntityManager;
@@ -34,11 +36,18 @@ import io.onedev.utils.StringUtils;
@Singleton
public class DefaultMilestoneManager extends AbstractEntityManager<Milestone> implements MilestoneManager {
+ private final SettingManager settingManager;
+
@Inject
- public DefaultMilestoneManager(Dao dao) {
+ public DefaultMilestoneManager(Dao dao, SettingManager settingManager) {
super(dao);
+ this.settingManager = settingManager;
}
+ private GlobalIssueSetting getIssueSetting() {
+ return settingManager.getIssueSetting();
+ }
+
@Transactional
@Override
public void delete(Milestone milestone, @Nullable Milestone moveIssuesToMilestone) {
@@ -71,7 +80,7 @@ public class DefaultMilestoneManager extends AbstractEntityManager<Milestone> im
@Override
public void close(Milestone milestone, @Nullable Milestone moveOpenIssuesToMilestone) {
List<String> criterias = new ArrayList<>();
- for (StateSpec state: milestone.getProject().getIssueWorkflow().getStateSpecs()) {
+ for (StateSpec state: getIssueSetting().getStateSpecs()) {
if (state.getCategory() == StateSpec.Category.OPEN)
criterias.add("state='" + state.getName() + "'");
}
@@ -102,7 +111,7 @@ public class DefaultMilestoneManager extends AbstractEntityManager<Milestone> im
Issue issue = event.getIssue();
Milestone milestone = issue.getMilestone();
if (milestone != null) {
- StateSpec state = issue.getProject().getIssueWorkflow().getStateSpec(issue.getState());
+ StateSpec state = getIssueSetting().getStateSpec(issue.getState());
Preconditions.checkNotNull(state);
if (state.getCategory() == StateSpec.Category.CLOSED)
milestone.setNumOfClosedIssues(milestone.getNumOfClosedIssues()+1);
@@ -119,7 +128,7 @@ public class DefaultMilestoneManager extends AbstractEntityManager<Milestone> im
Issue issue = (Issue) event.getEntity();
Milestone milestone = issue.getMilestone();
if (milestone != null) {
- StateSpec state = issue.getProject().getIssueWorkflow().getStateSpec(issue.getState());
+ StateSpec state = getIssueSetting().getStateSpec(issue.getState());
Preconditions.checkNotNull(state);
if (state.getCategory() == StateSpec.Category.CLOSED)
milestone.setNumOfClosedIssues(milestone.getNumOfClosedIssues()-1);
@@ -133,9 +142,9 @@ public class DefaultMilestoneManager extends AbstractEntityManager<Milestone> im
private void onStateChange(Project project, @Nullable String milestoneName, String oldState, String newState) {
Milestone milestone = project.getMilestone(milestoneName);
if (milestone != null) {
- StateSpec oldStateSpec = project.getIssueWorkflow().getStateSpec(oldState);
+ StateSpec oldStateSpec = getIssueSetting().getStateSpec(oldState);
Preconditions.checkNotNull(oldStateSpec);
- StateSpec newStateSpec = project.getIssueWorkflow().getStateSpec(newState);
+ StateSpec newStateSpec = getIssueSetting().getStateSpec(newState);
Preconditions.checkNotNull(oldStateSpec);
if (oldStateSpec.getCategory() != newStateSpec.getCategory()) {
if (oldStateSpec.getCategory() == StateSpec.Category.CLOSED) {
@@ -153,7 +162,7 @@ public class DefaultMilestoneManager extends AbstractEntityManager<Milestone> im
private void onMilestoneChange(Project project, String state, @Nullable String oldMilestoneName, @Nullable String newMilestoneName) {
Milestone oldMilestone = project.getMilestone(oldMilestoneName);
Milestone newMilestone = project.getMilestone(newMilestoneName);
- StateSpec stateSpec = project.getIssueWorkflow().getStateSpec(state);
+ StateSpec stateSpec = getIssueSetting().getStateSpec(state);
Preconditions.checkNotNull(stateSpec);
if (stateSpec.getCategory() == StateSpec.Category.CLOSED) {
if (oldMilestone != null)
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestQuerySettingManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestQuerySettingManager.java
index c5fa3379cf..fb695d725c 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestQuerySettingManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestQuerySettingManager.java
@@ -40,7 +40,7 @@ public class DefaultPullRequestQuerySettingManager extends AbstractEntityManager
setting.getQueryWatchSupport().getUserQueryWatches().keySet().retainAll(
setting.getUserQueries().stream().map(it->it.getName()).collect(Collectors.toSet()));
setting.getQueryWatchSupport().getProjectQueryWatches().keySet().retainAll(
- setting.getProject().getSavedIssueQueries().stream().map(it->it.getName()).collect(Collectors.toSet()));
+ setting.getProject().getIssueSetting().getSavedQueries(true).stream().map(it->it.getName()).collect(Collectors.toSet()));
if (setting.getQueryWatchSupport().getProjectQueryWatches().isEmpty() && setting.getUserQueries().isEmpty()) {
if (!setting.isNew())
delete(setting);
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultSettingManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultSettingManager.java
index 587ee1a280..bd278463bc 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultSettingManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultSettingManager.java
@@ -13,6 +13,7 @@ import io.onedev.server.model.Setting;
import io.onedev.server.model.Setting.Key;
import io.onedev.server.model.support.authenticator.Authenticator;
import io.onedev.server.model.support.setting.BackupSetting;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.model.support.setting.MailSetting;
import io.onedev.server.model.support.setting.SecuritySetting;
import io.onedev.server.model.support.setting.SystemSetting;
@@ -36,6 +37,8 @@ public class DefaultSettingManager extends AbstractEntityManager<Setting> implem
private volatile Long securitySettingId;
+ private volatile Long issueSettingId;
+
private volatile Long authenticatorId;
private volatile Long licenseId;
@@ -149,6 +152,32 @@ public class DefaultSettingManager extends AbstractEntityManager<Setting> implem
return (SecuritySetting) setting.getValue();
}
+ @Transactional
+ @Override
+ public void saveIssueSetting(GlobalIssueSetting issueSetting) {
+ Setting setting = getSetting(Key.ISSUE);
+ if (setting == null) {
+ setting = new Setting();
+ setting.setKey(Key.ISSUE);
+ }
+ setting.setValue(issueSetting);
+ dao.persist(setting);
+ }
+
+ @Sessional
+ @Override
+ public GlobalIssueSetting getIssueSetting() {
+ Setting setting;
+ if (issueSettingId == null) {
+ setting = getSetting(Key.ISSUE);
+ Preconditions.checkNotNull(setting);
+ issueSettingId = setting.getId();
+ } else {
+ setting = load(issueSettingId);
+ }
+ return (GlobalIssueSetting) setting.getValue();
+ }
+
@Transactional
@Override
public void saveSecuritySetting(SecuritySetting securitySetting) {
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java
index 219b050fa4..19565ece17 100644
--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java
+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java
@@ -17,6 +17,7 @@ import io.onedev.server.event.system.SystemStarted;
import io.onedev.server.manager.CacheManager;
import io.onedev.server.manager.IssueFieldUnaryManager;
import io.onedev.server.manager.ProjectManager;
+import io.onedev.server.manager.SettingManager;
import io.onedev.server.manager.UserManager;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
@@ -35,6 +36,8 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements U
private final ProjectManager projectManager;
+ private final SettingManager settingManager;
+
private final IssueFieldUnaryManager issueFieldUnaryManager;
private final CacheManager cacheManager;
@@ -42,13 +45,14 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements U
private final ListenerRegistry listenerRegistry;
@Inject
- public DefaultUserManager(Dao dao, ProjectManager projectManager,
+ public DefaultUserManager(Dao dao, ProjectManager projectManager, SettingManager settingManager,
IssueFieldUnaryManager issueFieldUnaryManager, CacheManager cacheManager,
PasswordService passwordService, ListenerRegistry listenerRegistry) {
super(dao);
this.passwordService = passwordService;
this.projectManager = projectManager;
+ this.settingManager = settingManager;
this.issueFieldUnaryManager = issueFieldUnaryManager;
this.cacheManager = cacheManager;
this.listenerRegistry = listenerRegistry;
@@ -70,10 +74,11 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements U
protection.onRenameUser(project, oldName, user.getName());
for (TagProtection protection: project.getTagProtections())
protection.onRenameUser(oldName, user.getName());
- project.getIssueWorkflow().onRenameUser(oldName, user.getName());
+ project.getIssueSetting().onRenameUser(oldName, user.getName());
}
issueFieldUnaryManager.onRenameUser(oldName, user.getName());
+ settingManager.getIssueSetting().onRenameUser(oldName, user.getName());
}
}
@@ -150,9 +155,10 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements U
if (it.next().onDeleteUser(user.getName()))
it.remove();
}
- project.getIssueWorkflow().onDeleteUser(user.getName());
+ project.getIssueSetting().onDeleteUser(user.getName());
}
-
+
+ settingManager.getIssueSetting().onDeleteUser(user.getName());
}
@Sessional
diff --git a/core/src/main/java/io/onedev/server/model/Issue.java b/core/src/main/java/io/onedev/server/model/Issue.java
index 28be09dc4b..93066bedde 100644
--- a/core/src/main/java/io/onedev/server/model/Issue.java
+++ b/core/src/main/java/io/onedev/server/model/Issue.java
@@ -38,9 +38,10 @@ import com.google.common.collect.Lists;
import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.server.OneDev;
import io.onedev.server.manager.CommitInfoManager;
+import io.onedev.server.manager.SettingManager;
import io.onedev.server.manager.UserInfoManager;
import io.onedev.server.model.support.EntityWatch;
-import io.onedev.server.model.support.issue.workflow.IssueWorkflow;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.IssueField;
import io.onedev.server.util.Referenceable;
@@ -328,8 +329,7 @@ public class Issue extends AbstractEntity implements Referenceable {
}
fieldsOfName.add(unary);
}
-
- for (InputSpec fieldSpec: getProject().getIssueWorkflow().getFieldSpecs()) {
+ for (InputSpec fieldSpec: getIssueSetting().getFieldSpecs()) {
String fieldName = fieldSpec.getName();
List<IssueFieldUnary> unaries = unaryMap.get(fieldName);
if (unaries != null) {
@@ -367,8 +367,13 @@ public class Issue extends AbstractEntity implements Referenceable {
return null;
}
+ private GlobalIssueSetting getIssueSetting() {
+ return OneDev.getInstance(SettingManager.class).getIssueSetting();
+ }
+
public long getFieldOrdinal(String fieldName, Object fieldValue) {
- InputSpec fieldSpec = getProject().getIssueWorkflow().getFieldSpec(fieldName);
+ GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();
+ InputSpec fieldSpec = issueSetting.getFieldSpec(fieldName);
if (fieldSpec != null)
return fieldSpec.getOrdinal(fieldValue);
else
@@ -407,7 +412,7 @@ public class Issue extends AbstractEntity implements Referenceable {
it.remove();
}
- InputSpec fieldSpec = getProject().getIssueWorkflow().getFieldSpec(fieldName);
+ InputSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);
if (fieldSpec != null) {
long ordinal = getFieldOrdinal(fieldName, fieldValue);
@@ -436,8 +441,7 @@ public class Issue extends AbstractEntity implements Referenceable {
}
public boolean isFieldVisible(String fieldName) {
- IssueWorkflow workflow = getProject().getIssueWorkflow();
- InputSpec fieldSpec = workflow.getFieldSpec(fieldName);
+ InputSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);
if (fieldSpec != null) {
if (fieldSpec.getShowCondition() != null) {
IssueField dependentField = getFields().get(fieldSpec.getShowCondition().getInputName());
diff --git a/core/src/main/java/io/onedev/server/model/Project.java b/core/src/main/java/io/onedev/server/model/Project.java
index d6d7e6b8cd..6701558b6b 100644
--- a/core/src/main/java/io/onedev/server/model/Project.java
+++ b/core/src/main/java/io/onedev/server/model/Project.java
@@ -61,7 +61,6 @@ import org.hibernate.validator.constraints.NotEmpty;
import com.fasterxml.jackson.annotation.JsonView;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
-import com.google.common.collect.Lists;
import io.onedev.launcher.loader.ListenerRegistry;
import io.onedev.server.OneDev;
@@ -92,14 +91,11 @@ import io.onedev.server.model.support.NamedCodeCommentQuery;
import io.onedev.server.model.support.NamedCommitQuery;
import io.onedev.server.model.support.TagProtection;
import io.onedev.server.model.support.WebHook;
-import io.onedev.server.model.support.issue.IssueBoard;
-import io.onedev.server.model.support.issue.NamedIssueQuery;
-import io.onedev.server.model.support.issue.workflow.IssueWorkflow;
+import io.onedev.server.model.support.issue.IssueSetting;
import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;
import io.onedev.server.persistence.UnitOfWork;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.DefaultPrivilege;
-import io.onedev.server.util.IssueConstants;
import io.onedev.server.util.facade.ProjectFacade;
import io.onedev.server.util.jackson.DefaultView;
import io.onedev.server.util.validation.annotation.ProjectName;
@@ -212,13 +208,8 @@ public class Project extends AbstractEntity {
@Lob
@Column(length=65535)
@JsonView(DefaultView.class)
- private IssueWorkflow issueWorkflow;
+ private IssueSetting issueSetting;
- @Lob
- @Column(length=65535)
- @JsonView(DefaultView.class)
- private ArrayList<NamedIssueQuery> savedIssueQueries;
-
@Lob
@Column(length=65535)
@JsonView(DefaultView.class)
@@ -239,16 +230,6 @@ public class Project extends AbstractEntity {
@JsonView(DefaultView.class)
private ArrayList<NamedBuildQuery> savedBuildQueries;
- @Lob
- @Column(length=65535)
- @JsonView(DefaultView.class)
- private ArrayList<String> issueListFields;
-
- @Lob
- @Column(length=65535)
- @JsonView(DefaultView.class)
- private ArrayList<IssueBoard> issueBoards;
-
@Lob
@Column(length=65535)
@JsonView(DefaultView.class)
@@ -893,37 +874,16 @@ public class Project extends AbstractEntity {
this.codeComments = codeComments;
}
- public IssueWorkflow getIssueWorkflow() {
- if (issueWorkflow == null)
- issueWorkflow = new IssueWorkflow();
- return issueWorkflow;
- }
-
- public void setIssueWorkflow(IssueWorkflow issueWorkflow) {
- this.issueWorkflow = issueWorkflow;
+ public IssueSetting getIssueSetting() {
+ if (issueSetting == null)
+ issueSetting = new IssueSetting();
+ return issueSetting;
}
- public ArrayList<NamedIssueQuery> getSavedIssueQueries() {
- if (savedIssueQueries == null) {
- savedIssueQueries = new ArrayList<>();
- savedIssueQueries.add(new NamedIssueQuery("Outstanding", "outstanding"));
- savedIssueQueries.add(new NamedIssueQuery("My outstanding", "outstanding and mine"));
- savedIssueQueries.add(new NamedIssueQuery("Submitted recently", "\"Submit Date\" is after \"last week\""));
- savedIssueQueries.add(new NamedIssueQuery("Updated recently", "\"Update Date\" is after \"last week\""));
- savedIssueQueries.add(new NamedIssueQuery("Submitted by me", "submitted by me"));
- savedIssueQueries.add(new NamedIssueQuery("Assigned to me", "\"Assignee\" is me"));
- savedIssueQueries.add(new NamedIssueQuery("Critical outstanding", "outstanding and \"Priority\" is \"Critical\""));
- savedIssueQueries.add(new NamedIssueQuery("Unassigned outstanding", "outstanding and \"Assignee\" is empty"));
- savedIssueQueries.add(new NamedIssueQuery("Closed", "closed"));
- savedIssueQueries.add(new NamedIssueQuery("All", "all"));
- }
- return savedIssueQueries;
+ public void setIssueSetting(IssueSetting issueSetting) {
+ this.issueSetting = issueSetting;
}
- public void setSavedIssueQueries(ArrayList<NamedIssueQuery> savedIssueQueries) {
- this.savedIssueQueries = savedIssueQueries;
- }
-
public ArrayList<NamedCommitQuery> getSavedCommitQueries() {
if (savedCommitQueries == null) {
savedCommitQueries = new ArrayList<>();
@@ -961,15 +921,6 @@ public class Project extends AbstractEntity {
this.savedPullRequestQueries = savedPullRequestQueries;
}
- @Nullable
- public NamedIssueQuery getSavedIssueQuery(String name) {
- for (NamedIssueQuery namedQuery: getSavedIssueQueries()) {
- if (namedQuery.getName().equals(name))
- return namedQuery;
- }
- return null;
- }
-
@Nullable
public NamedCommitQuery getSavedCommitQuery(String name) {
for (NamedCommitQuery namedQuery: getSavedCommitQueries()) {
@@ -1038,24 +989,6 @@ public class Project extends AbstractEntity {
this.savedBuildQueries = savedBuildQueries;
}
- public ArrayList<String> getIssueListFields() {
- if (issueListFields == null) {
- issueListFields = new ArrayList<>();
- issueListFields.add(IssueConstants.FIELD_NUMBER);
- issueListFields.add(IssueConstants.FIELD_STATE);
- issueListFields.add(IssueConstants.FIELD_TITLE);
- issueListFields.add("Type");
- issueListFields.add("Priority");
- issueListFields.add(IssueConstants.FIELD_SUBMITTER);
- issueListFields.add("Assignee");
- }
- return issueListFields;
- }
-
- public void setIssueListFields(ArrayList<String> issueListFields) {
- this.issueListFields = issueListFields;
- }
-
public Collection<IssueQuerySetting> getIssueQuerySettings() {
return issueQuerySettings;
}
@@ -1158,23 +1091,6 @@ public class Project extends AbstractEntity {
this.milestones = milestones;
}
- public ArrayList<IssueBoard> getIssueBoards() {
- if (issueBoards == null) {
- issueBoards = new ArrayList<>();
- IssueBoard board = new IssueBoard();
- board.setName(IssueConstants.FIELD_STATE);
- board.setIdentifyField(IssueConstants.FIELD_STATE);
- board.setColumns(Lists.newArrayList("Open", "Assigned", "Closed"));
- board.setDisplayFields(Lists.newArrayList(IssueConstants.FIELD_STATE, "Type", "Priority", "Assignee", "Resolution", "Duplicate With"));
- issueBoards.add(board);
- }
- return issueBoards;
- }
-
- public void setIssueBoards(ArrayList<IssueBoard> issueBoards) {
- this.issueBoards = issueBoards;
- }
-
public ArrayList<WebHook> getWebHooks() {
if (webHooks == null)
webHooks = new ArrayList<>();
diff --git a/core/src/main/java/io/onedev/server/model/Setting.java b/core/src/main/java/io/onedev/server/model/Setting.java
index e830eb97af..4f6a9d44e3 100644
--- a/core/src/main/java/io/onedev/server/model/Setting.java
+++ b/core/src/main/java/io/onedev/server/model/Setting.java
@@ -23,7 +23,7 @@ public class Setting extends AbstractEntity {
private static final long serialVersionUID = 1L;
- public enum Key {SYSTEM, MAIL, BACKUP, SECURITY, AUTHENTICATOR, LICENSE};
+ public enum Key {SYSTEM, MAIL, BACKUP, SECURITY, AUTHENTICATOR, ISSUE, LICENSE};
/*
* Optimistic lock is necessary to ensure database integrity when update
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.java b/core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java
similarity index 51%
rename from core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.java
rename to core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java
index cb0bd86417..e74cf352c1 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java
@@ -17,14 +17,16 @@ import org.hibernate.validator.constraints.NotEmpty;
import com.google.common.collect.Lists;
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.SettingManager;
import io.onedev.server.model.Project;
-import io.onedev.server.model.support.issue.workflow.StateSpec;
-import io.onedev.server.util.EditContext;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.util.IssueConstants;
import io.onedev.server.util.OneContext;
-import io.onedev.server.util.inputspec.InputContext;
+import io.onedev.server.util.ValueSetEdit;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;
+import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
import io.onedev.server.util.inputspec.groupchoiceinput.GroupChoiceInput;
import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
@@ -32,11 +34,10 @@ import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.IssueQuery;
import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldResolution;
import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;
-import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValueResolution;
import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedStateResolution;
@Editable
-public class IssueBoard implements Serializable {
+public class BoardSpec implements Serializable {
private static final long serialVersionUID = 1L;
@@ -123,7 +124,7 @@ public class IssueBoard implements Serializable {
List<String> choices = new ArrayList<>();
Project project = OneContext.get().getProject();
choices.add(IssueConstants.FIELD_STATE);
- for (InputSpec fieldSpec: project.getIssueWorkflow().getFieldSpecs()) {
+ for (InputSpec fieldSpec: getGlobalIssueSetting().getFieldSpecs()) {
if (!fieldSpec.isAllowMultiple() && (fieldSpec instanceof ChoiceInput || fieldSpec instanceof UserChoiceInput || fieldSpec instanceof GroupChoiceInput))
choices.add(fieldSpec.getName());
}
@@ -135,7 +136,7 @@ public class IssueBoard implements Serializable {
List<String> choices = new ArrayList<>();
Project project = OneContext.get().getProject();
choices.add(IssueConstants.FIELD_STATE);
- for (InputSpec fieldSpec: project.getIssueWorkflow().getFieldSpecs()) {
+ for (InputSpec fieldSpec: getGlobalIssueSetting().getFieldSpecs()) {
choices.add(fieldSpec.getName());
}
return choices;
@@ -147,10 +148,10 @@ public class IssueBoard implements Serializable {
Project project = OneContext.get().getProject();
String fieldName = (String) OneContext.get().getEditContext().getInputValue("identifyField");
if (IssueConstants.FIELD_STATE.equals(fieldName)) {
- for (StateSpec state: project.getIssueWorkflow().getStateSpecs())
+ for (StateSpec state: getGlobalIssueSetting().getStateSpecs())
choices.put(state.getName(), state.getName());
} else if (fieldName != null) {
- InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(fieldName);
+ InputSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(fieldName);
for (String each: fieldSpec.getPossibleValues())
choices.put(each, each);
if (fieldSpec.isAllowEmpty())
@@ -159,7 +160,11 @@ public class IssueBoard implements Serializable {
return choices;
}
- public static int getBoardIndex(List<IssueBoard> boards, String name) {
+ private static GlobalIssueSetting getGlobalIssueSetting() {
+ return OneDev.getInstance(SettingManager.class).getIssueSetting();
+ }
+
+ public static int getBoardIndex(List<BoardSpec> boards, String name) {
for (int i=0; i<boards.size(); i++) {
if (name.equals(boards.get(i).getName()))
return i;
@@ -171,13 +176,13 @@ public class IssueBoard implements Serializable {
Set<String> undefinedStates = new HashSet<>();
if (getBaseQuery() != null) {
try {
- undefinedStates.addAll(io.onedev.server.search.entity.issue.IssueQuery.parse(project, getBaseQuery(), false).getUndefinedStates(project));
+ undefinedStates.addAll(io.onedev.server.search.entity.issue.IssueQuery.parse(project, getBaseQuery(), false).getUndefinedStates());
} catch (Exception e) {
}
}
if (getIdentifyField().equals(IssueConstants.FIELD_STATE)) {
for (String column: getColumns()) {
- if (project.getIssueWorkflow().getStateSpec(column) == null)
+ if (getGlobalIssueSetting().getStateSpec(column) == null)
undefinedStates.add(column);
}
}
@@ -208,18 +213,18 @@ public class IssueBoard implements Serializable {
Set<String> undefinedFields = new HashSet<>();
if (getBaseQuery() != null) {
try {
- undefinedFields.addAll(io.onedev.server.search.entity.issue.IssueQuery.parse(project, getBaseQuery(), false).getUndefinedFields(project));
+ undefinedFields.addAll(io.onedev.server.search.entity.issue.IssueQuery.parse(project, getBaseQuery(), false).getUndefinedFields());
} catch (Exception e) {
}
}
if (!IssueConstants.FIELD_STATE.equals(getIdentifyField())) {
- InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(getIdentifyField());
+ InputSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(getIdentifyField());
if (fieldSpec == null)
undefinedFields.add(getIdentifyField());
}
for (String displayField: getDisplayFields()) {
if (!IssueConstants.FIELD_STATE.equals(displayField)) {
- InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(displayField);
+ InputSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(displayField);
if (fieldSpec == null)
undefinedFields.add(displayField);
}
@@ -269,112 +274,236 @@ public class IssueBoard implements Serializable {
public Collection<UndefinedFieldValue> getUndefinedFieldValues(Project project) {
Set<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();
- OneContext.push(new OneContext() {
-
- @Override
- public Project getProject() {
- return project;
+ if (getBaseQuery() != null) {
+ try {
+ undefinedFieldValues.addAll(io.onedev.server.search.entity.issue.IssueQuery.parse(project, getBaseQuery(), true).getUndefinedFieldValues());
+ } catch (Exception e) {
}
+ }
+ if (!getIdentifyField().equals(IssueConstants.FIELD_STATE)) {
+ for (String column: getColumns()) {
+ SpecifiedChoices specifiedChoices = SpecifiedChoices.of(getGlobalIssueSetting().getFieldSpec(getIdentifyField()));
+ if (specifiedChoices != null && !specifiedChoices.getChoiceValues().contains(column))
+ undefinedFieldValues.add(new UndefinedFieldValue(getIdentifyField(), column));
+ }
+ }
+
+ return undefinedFieldValues;
+ }
+
+ public boolean fixUndefinedFieldValues(Project project, Map<String, ValueSetEdit> valueSetEdits) {
+ for (Map.Entry<String, ValueSetEdit> entry: valueSetEdits.entrySet()) {
+ if (onEditFieldValues(entry.getKey(), entry.getValue()))
+ return true;
+ }
+ return false;
+ }
+
+ public static String getWebSocketObservable(Long projectId) {
+ return BoardSpec.class.getName() + ":" + projectId;
+ }
- @Override
- public EditContext getEditContext(int level) {
- return new EditContext() {
-
- @Override
- public Object getInputValue(String name) {
- return null;
- }
-
- };
+ public void onRenameUser(GlobalIssueSetting issueSetting, String oldName, String newName) {
+ InputSpec fieldSpec = issueSetting.getFieldSpec(getIdentifyField());
+ if (fieldSpec instanceof UserChoiceInput) {
+ for (int i=0; i<getColumns().size(); i++) {
+ if (getColumns().get(i).equals(oldName))
+ getColumns().set(i, newName);
}
+ }
+ }
- @Override
- public InputContext getInputContext() {
- throw new UnsupportedOperationException();
+ public boolean onDeleteUser(GlobalIssueSetting issueSetting, String userName) {
+ InputSpec fieldSpec = issueSetting.getFieldSpec(getIdentifyField());
+ if (fieldSpec instanceof UserChoiceInput) {
+ for (Iterator<String> it = getColumns().iterator(); it.hasNext();) {
+ if (it.next().equals(userName))
+ it.remove();
}
-
- });
- try {
- if (getBaseQuery() != null) {
- try {
- undefinedFieldValues.addAll(io.onedev.server.search.entity.issue.IssueQuery.parse(project, getBaseQuery(), true).getUndefinedFieldValues(project));
- } catch (Exception e) {
- }
+ }
+ return getColumns().size() < 2;
+ }
+
+ public void onRenameField(GlobalIssueSetting issueSetting, String oldName, String newName) {
+ if (getIdentifyField().equals(oldName))
+ setIdentifyField(newName);
+ if (getDisplayFields().contains(oldName)) {
+ getDisplayFields().remove(oldName);
+ getDisplayFields().add(newName);
+ }
+ if (getBaseQuery() != null) {
+ try {
+ io.onedev.server.search.entity.issue.IssueQuery query =
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false);
+ query.onRenameField(oldName, newName);
+ setBaseQuery(query.toString());
+ } catch (Exception e) {
+ }
+ }
+ if (getBacklogBaseQuery() != null) {
+ try {
+ io.onedev.server.search.entity.issue.IssueQuery query =
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBacklogBaseQuery(), false);
+ query.onRenameField(oldName, newName);
+ setBacklogBaseQuery(query.toString());
+ } catch (Exception e) {
}
+ }
+ }
- if (!getIdentifyField().equals(IssueConstants.FIELD_STATE)) {
- for (String column: getColumns()) {
- InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(getIdentifyField());
- List<String> choices = fieldSpec.getPossibleValues();
- if (!choices.contains(column))
- undefinedFieldValues.add(new UndefinedFieldValue(getIdentifyField(), column));
- }
+ public void onRenameState(String oldName, String newName) {
+ if (getIdentifyField().equals(IssueConstants.FIELD_STATE)) {
+ for (int i=0; i<getColumns().size(); i++) {
+ if (getColumns().get(i).equals(oldName))
+ getColumns().set(i, newName);
+ }
+ }
+
+ if (getBaseQuery() != null) {
+ try {
+ io.onedev.server.search.entity.issue.IssueQuery query =
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false);
+ query.onRenameState(oldName, newName);
+ setBaseQuery(query.toString());
+ } catch (Exception e) {
+ }
+ }
+ if (getBacklogBaseQuery() != null) {
+ try {
+ io.onedev.server.search.entity.issue.IssueQuery query =
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBacklogBaseQuery(), false);
+ query.onRenameState(oldName, newName);
+ setBacklogBaseQuery(query.toString());
+ } catch (Exception e) {
}
-
- return undefinedFieldValues;
- } finally {
- OneContext.pop();
}
+
}
- public boolean fixUndefinedFieldValues(Project project, Map<UndefinedFieldValue, UndefinedFieldValueResolution> resolutions) {
+ public boolean onDeleteField(GlobalIssueSetting issueSetting, String fieldName) {
+ getDisplayFields().remove(fieldName);
if (getBaseQuery() != null) {
try {
io.onedev.server.search.entity.issue.IssueQuery query =
- io.onedev.server.search.entity.issue.IssueQuery.parse(project, getBaseQuery(), true);
- boolean remove = false;
- for (Map.Entry<UndefinedFieldValue, UndefinedFieldValueResolution> entry: resolutions.entrySet()) {
- UndefinedFieldValueResolution resolution = entry.getValue();
- if (resolution.getFixType() == UndefinedFieldValueResolution.FixType.CHANGE_TO_ANOTHER_VALUE) {
- query.onRenameFieldValue(entry.getKey().getFieldName(), entry.getKey().getFieldValue(),
- entry.getValue().getNewValue());
- } else if (query.onDeleteFieldValue(entry.getKey().getFieldName(), entry.getKey().getFieldValue())) {
- remove = true;
- break;
- }
- }
- if (remove)
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false);
+ if (query.onDeleteField(fieldName))
setBaseQuery(null);
else
setBaseQuery(query.toString());
} catch (Exception e) {
}
}
-
- for (Iterator<String> it = getColumns().iterator(); it.hasNext();) {
- String column = it.next();
- for (Map.Entry<UndefinedFieldValue, UndefinedFieldValueResolution> entry: resolutions.entrySet()) {
- UndefinedFieldValueResolution resolution = entry.getValue();
- if (resolution.getFixType() == UndefinedFieldValueResolution.FixType.DELETE_THIS_VALUE) {
- if (entry.getKey().getFieldName().equals(getIdentifyField())
- && entry.getKey().getFieldValue().equals(column)) {
- it.remove();
- }
- }
- }
+ if (getBacklogBaseQuery() != null) {
+ try {
+ io.onedev.server.search.entity.issue.IssueQuery query =
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBacklogBaseQuery(), false);
+ if (query.onDeleteField(fieldName))
+ setBacklogBaseQuery(null);
+ else
+ setBacklogBaseQuery(query.toString());
+ } catch (Exception e) {
+ }
}
- if (getColumns().size() < 2)
- return true;
-
- for (int i=0; i<getColumns().size(); i++) {
- String column = getColumns().get(i);
- for (Map.Entry<UndefinedFieldValue, UndefinedFieldValueResolution> entry: resolutions.entrySet()) {
- UndefinedFieldValueResolution resolution = entry.getValue();
- if (resolution.getFixType() == UndefinedFieldValueResolution.FixType.CHANGE_TO_ANOTHER_VALUE) {
- if (entry.getKey().getFieldName().equals(getIdentifyField())
- && entry.getKey().getFieldValue().equals(column)) {
- getColumns().set(i, resolution.getNewValue());
- }
- }
- }
+ return getIdentifyField().equals(fieldName);
+ }
+
+ public boolean onDeleteState(String stateName) {
+ if (getIdentifyField().equals(IssueConstants.FIELD_STATE)) {
+ for (Iterator<String> it = getColumns().iterator(); it.hasNext();) {
+ if (it.next().equals(stateName))
+ it.remove();
+ }
+ }
+ if (getBaseQuery() != null) {
+ try {
+ io.onedev.server.search.entity.issue.IssueQuery query =
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false);
+ if (query.onDeleteState(stateName))
+ setBaseQuery(null);
+ else
+ setBaseQuery(query.toString());
+ } catch (Exception e) {
+ }
+ }
+ if (getBacklogBaseQuery() != null) {
+ try {
+ io.onedev.server.search.entity.issue.IssueQuery query =
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBacklogBaseQuery(), false);
+ if (query.onDeleteState(stateName))
+ setBacklogBaseQuery(null);
+ else
+ setBacklogBaseQuery(query.toString());
+ } catch (Exception e) {
+ }
}
- return false;
+ return getColumns().size() < 2;
}
-
- public static String getWebSocketObservable(Long projectId) {
- return IssueBoard.class.getName() + ":" + projectId;
+
+ public boolean onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit) {
+ if (fieldName.equals(getIdentifyField())) {
+ getColumns().removeAll(valueSetEdit.getDeletions());
+ for (int i=0; i<getColumns().size(); i++) {
+ String newValue = valueSetEdit.getRenames().get(getColumns().get(i));
+ if (newValue != null)
+ getColumns().set(i, newValue);
+ }
+ }
+ if (getBaseQuery() != null) {
+ try {
+ io.onedev.server.search.entity.issue.IssueQuery query =
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false);
+ if (query.onEditFieldValues(fieldName, valueSetEdit))
+ setBaseQuery(null);
+ else
+ setBaseQuery(query.toString());
+ } catch (Exception e) {
+ }
+ }
+ if (getBacklogBaseQuery() != null) {
+ try {
+ io.onedev.server.search.entity.issue.IssueQuery query =
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBacklogBaseQuery(), false);
+ if (query.onEditFieldValues(fieldName, valueSetEdit))
+ setBacklogBaseQuery(null);
+ else
+ setBacklogBaseQuery(query.toString());
+ } catch (Exception e) {
+ }
+ }
+
+ return getColumns().size() < 2;
}
+ public Collection<UndefinedFieldValue> getUndefinedFieldValues(GlobalIssueSetting globalSetting) {
+ Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();
+ if (!identifyField.equals(IssueConstants.FIELD_STATE)) {
+ SpecifiedChoices specifiedChoices = SpecifiedChoices.of(globalSetting.getFieldSpec(identifyField));
+ if (specifiedChoices != null) {
+ for (String column: columns) {
+ if (!specifiedChoices.getChoiceValues().contains(column))
+ undefinedFieldValues.add(new UndefinedFieldValue(identifyField, column));
+ }
+ }
+ }
+ if (getBaseQuery() != null) {
+ try {
+ io.onedev.server.search.entity.issue.IssueQuery query =
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false);
+ undefinedFieldValues.addAll(query.getUndefinedFieldValues());
+ } catch (Exception e) {
+ }
+ }
+ if (getBacklogBaseQuery() != null) {
+ try {
+ io.onedev.server.search.entity.issue.IssueQuery query =
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBacklogBaseQuery(), false);
+ undefinedFieldValues.addAll(query.getUndefinedFieldValues());
+ } catch (Exception e) {
+ }
+ }
+ return undefinedFieldValues;
+ }
+
}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java b/core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java
new file mode 100644
index 0000000000..b1dd55159e
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java
@@ -0,0 +1,358 @@
+package io.onedev.server.model.support.issue;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.annotation.Nullable;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.SettingManager;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
+import io.onedev.server.search.entity.issue.IssueQuery;
+import io.onedev.server.util.ValueSetEdit;
+import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldResolution;
+import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldResolution.FixType;
+import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;
+import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedStateResolution;
+
+public class IssueSetting implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private List<TransitionSpec> transitionSpecs;
+
+ private Set<String> promptFieldsUponIssueOpen;
+
+ private Set<String> listFields;
+
+ private List<BoardSpec> boardSpecs;
+
+ private List<NamedIssueQuery> savedQueries;
+
+ private transient GlobalIssueSetting globalSetting;
+
+ private GlobalIssueSetting getGlobalSetting() {
+ if (globalSetting == null)
+ globalSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();
+ return globalSetting;
+ }
+
+ @Nullable
+ public List<TransitionSpec> getTransitionSpecs(boolean useDefaultIfNotDefined) {
+ if (useDefaultIfNotDefined && transitionSpecs == null)
+ return new ArrayList<>(getGlobalSetting().getDefaultTransitionSpecs());
+ else
+ return transitionSpecs;
+ }
+
+ public void setTransitionSpecs(List<TransitionSpec> stateTransitions) {
+ this.transitionSpecs = stateTransitions;
+ }
+
+ @Nullable
+ public Set<String> getPromptFieldsUponIssueOpen(boolean useDefaultIfNotDefined) {
+ if (useDefaultIfNotDefined && promptFieldsUponIssueOpen == null)
+ return new HashSet<>(getGlobalSetting().getDefaultPromptFieldsUponIssueOpen());
+ else
+ return promptFieldsUponIssueOpen;
+ }
+
+ public void setPromptFieldsUponIssueOpen(@Nullable Set<String> promptFieldsUponIssueOpen) {
+ this.promptFieldsUponIssueOpen = promptFieldsUponIssueOpen;
+ }
+
+ @Nullable
+ public Set<String> getListFields(boolean useDefaultIfNotDefined) {
+ if (useDefaultIfNotDefined && listFields == null)
+ return new HashSet<>(getGlobalSetting().getDefaultListFields());
+ else
+ return listFields;
+ }
+
+ public void setListFields(@Nullable Set<String> listFields) {
+ this.listFields = listFields;
+ }
+
+ @Nullable
+ public List<BoardSpec> getBoardSpecs(boolean useDefaultIfNotDefined) {
+ if (useDefaultIfNotDefined && boardSpecs == null)
+ return new ArrayList<>(getGlobalSetting().getDefaultBoardSpecs());
+ else
+ return boardSpecs;
+ }
+
+ public void setBoardSpecs(@Nullable List<BoardSpec> boardSpecs) {
+ this.boardSpecs = boardSpecs;
+ }
+
+ @Nullable
+ public List<NamedIssueQuery> getSavedQueries(boolean useDefaultIfNotDefined) {
+ if (useDefaultIfNotDefined && savedQueries == null)
+ return new ArrayList<>(getGlobalSetting().getDefaultQueries());
+ else
+ return savedQueries;
+ }
+
+ public void setSavedQueries(@Nullable List<NamedIssueQuery> savedQueries) {
+ this.savedQueries = savedQueries;
+ }
+
+ @Nullable
+ public NamedIssueQuery getSavedQuery(String name) {
+ for (NamedIssueQuery namedQuery: getSavedQueries(true)) {
+ if (namedQuery.getName().equals(name))
+ return namedQuery;
+ }
+ return null;
+ }
+
+ public void onRenameUser(String oldName, String newName) {
+ if (transitionSpecs != null) {
+ for (TransitionSpec transition: transitionSpecs)
+ transition.onRenameUser(oldName, newName);
+ }
+ if (boardSpecs != null) {
+ for (BoardSpec board: boardSpecs)
+ board.onRenameUser(getGlobalSetting(), oldName, newName);
+ }
+ }
+
+ public void onDeleteUser(String userName) {
+ if (transitionSpecs != null) {
+ for (Iterator<TransitionSpec> it = transitionSpecs.iterator(); it.hasNext();) {
+ if (it.next().onDeleteUser(userName))
+ it.remove();
+ }
+ }
+ if (boardSpecs != null) {
+ for (Iterator<BoardSpec> it = boardSpecs.iterator(); it.hasNext();) {
+ if (it.next().onDeleteUser(getGlobalSetting(), userName))
+ it.remove();
+ }
+ }
+ }
+
+ public void onRenameGroup(String oldName, String newName) {
+ if (transitionSpecs != null) {
+ for (TransitionSpec transition: transitionSpecs)
+ transition.onRenameGroup(oldName, newName);
+ }
+ }
+
+ public void onDeleteGroup(String groupName) {
+ if (transitionSpecs != null) {
+ for (Iterator<TransitionSpec> it = transitionSpecs.iterator(); it.hasNext();) {
+ if (it.next().onDeleteGroup(groupName))
+ it.remove();
+ }
+ }
+ }
+
+ public void onRenameConfiguration(String oldName, String newName) {
+ if (transitionSpecs != null) {
+ for (TransitionSpec transition: transitionSpecs)
+ transition.onRenameConfiguration(oldName, newName);
+ }
+ }
+
+ public void onDeleteConfiguration(String configurationName) {
+ if (transitionSpecs != null) {
+ for (Iterator<TransitionSpec> it = transitionSpecs.iterator(); it.hasNext();) {
+ if (it.next().onDeleteConfiguration(configurationName))
+ it.remove();
+ }
+ }
+ }
+
+ public Collection<String> getUndefinedFields(Project project) {
+ Set<String> undefinedFields = new HashSet<>();
+ if (listFields != null) {
+ for (String fieldName: listFields) {
+ if (getGlobalSetting().getFieldSpec(fieldName) == null)
+ undefinedFields.add(fieldName);
+ }
+ }
+ if (promptFieldsUponIssueOpen != null) {
+ for (String fieldName: promptFieldsUponIssueOpen) {
+ if (getGlobalSetting().getFieldSpec(fieldName) == null)
+ undefinedFields.add(fieldName);
+ }
+ }
+ if (transitionSpecs != null) {
+ for (TransitionSpec transition: transitionSpecs)
+ undefinedFields.addAll(transition.getUndefinedFields(getGlobalSetting()));
+ }
+ if (savedQueries != null) {
+ for (NamedIssueQuery namedQuery: savedQueries) {
+ try {
+ undefinedFields.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false).getUndefinedFields());
+ } catch (Exception e) {
+ }
+ }
+ }
+ if (boardSpecs != null) {
+ for (BoardSpec board: boardSpecs)
+ undefinedFields.addAll(board.getUndefinedFields(project));
+ }
+ return undefinedFields;
+ }
+
+ public void fixUndefinedFields(Project project, Map<String, UndefinedFieldResolution> resolutions) {
+ for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {
+ if (listFields != null) {
+ listFields.remove(entry.getKey());
+ if (entry.getValue().getFixType() == FixType.CHANGE_TO_ANOTHER_FIELD)
+ listFields.add(entry.getValue().getNewField());
+ }
+ if (promptFieldsUponIssueOpen != null) {
+ promptFieldsUponIssueOpen.remove(entry.getKey());
+ if (entry.getValue().getFixType() == FixType.CHANGE_TO_ANOTHER_FIELD)
+ promptFieldsUponIssueOpen.add(entry.getValue().getNewField());
+ }
+ }
+ if (savedQueries != null) {
+ for (Iterator<NamedIssueQuery> it = savedQueries.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) {
+ }
+ }
+ }
+
+ if (transitionSpecs != null) {
+ for (Iterator<TransitionSpec> it = transitionSpecs.iterator(); it.hasNext();) {
+ if (it.next().fixUndefinedFields(resolutions))
+ it.remove();
+ }
+ }
+
+ if (boardSpecs != null) {
+ for (Iterator<BoardSpec> it = boardSpecs.iterator(); it.hasNext();) {
+ if (it.next().fixUndefinedFields(project, resolutions))
+ it.remove();
+ }
+ }
+ }
+
+ public Collection<String> getUndefinedStates(Project project) {
+ Set<String> undefinedStates = new HashSet<>();
+
+ if (savedQueries != null) {
+ for (NamedIssueQuery namedQuery: savedQueries) {
+ try {
+ undefinedStates.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false).getUndefinedStates());
+ } catch (Exception e) {
+ }
+ }
+ }
+
+ if (boardSpecs != null) {
+ for (BoardSpec board: boardSpecs)
+ undefinedStates.addAll(board.getUndefinedStates(project));
+ }
+
+ return undefinedStates;
+ }
+
+ public void fixUndefinedStates(Project project, Map<String, UndefinedStateResolution> resolutions) {
+ if (savedQueries != null) {
+ for (NamedIssueQuery namedQuery: savedQueries) {
+ 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) {
+ }
+ }
+ }
+
+ if (boardSpecs != null) {
+ for (BoardSpec board: boardSpecs)
+ board.fixUndefinedStates(project, resolutions);
+ }
+ }
+
+ public Collection<UndefinedFieldValue> getUndefinedFieldValues(Project project) {
+ Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();
+ if (savedQueries != null) {
+ for (NamedIssueQuery namedQuery: savedQueries) {
+ try {
+ undefinedFieldValues.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false).getUndefinedFieldValues());
+ } catch (Exception e) {
+ }
+ }
+ }
+ if (boardSpecs != null) {
+ for (BoardSpec board: boardSpecs)
+ undefinedFieldValues.addAll(board.getUndefinedFieldValues(project));
+ }
+ if (transitionSpecs != null) {
+ for (TransitionSpec transition: transitionSpecs)
+ undefinedFieldValues.addAll(transition.getUndefinedFieldValues());
+ }
+ return undefinedFieldValues;
+ }
+
+ public void fixUndefinedFieldValues(Project project, Map<String, ValueSetEdit> valueSetEdits) {
+ if (savedQueries != null) {
+ for (Iterator<NamedIssueQuery> it = savedQueries.iterator(); it.hasNext();) {
+ NamedIssueQuery namedQuery = it.next();
+ try {
+ boolean remove = false;
+ IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), false);
+ for (Map.Entry<String, ValueSetEdit> entry: valueSetEdits.entrySet()) {
+ if (query.onEditFieldValues(entry.getKey(), entry.getValue())) {
+ remove = true;
+ break;
+ }
+ }
+ if (remove)
+ it.remove();
+ else
+ namedQuery.setQuery(query.toString());
+ } catch (Exception e) {
+ }
+ }
+ }
+ if (boardSpecs != null) {
+ for (Iterator<BoardSpec> it = boardSpecs.iterator(); it.hasNext();) {
+ if (it.next().fixUndefinedFieldValues(project, valueSetEdits)) {
+ it.remove();
+ break;
+ }
+ }
+ }
+ if (transitionSpecs != null) {
+ for (Iterator<TransitionSpec> it = transitionSpecs.iterator(); it.hasNext();) {
+ if (it.next().fixUndefinedFieldValues(project, valueSetEdits)) {
+ it.remove();
+ break;
+ }
+ }
+ }
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/StateSpec.java b/core/src/main/java/io/onedev/server/model/support/issue/StateSpec.java
similarity index 96%
rename from core/src/main/java/io/onedev/server/model/support/issue/workflow/StateSpec.java
rename to core/src/main/java/io/onedev/server/model/support/issue/StateSpec.java
index 3f69087ee1..23c6ce9ab4 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/StateSpec.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/StateSpec.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.issue.workflow;
+package io.onedev.server.model.support.issue;
import java.io.Serializable;
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/TransitionSpec.java b/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java
similarity index 57%
rename from core/src/main/java/io/onedev/server/model/support/issue/workflow/TransitionSpec.java
rename to core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java
index 17d3454a2f..bd18eb7469 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/TransitionSpec.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java
@@ -1,30 +1,43 @@
-package io.onedev.server.model.support.issue.workflow;
+package io.onedev.server.model.support.issue;
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Size;
import org.hibernate.validator.constraints.NotEmpty;
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.SettingManager;
import io.onedev.server.model.Issue;
-import io.onedev.server.model.support.issue.workflow.transitionprerequisite.TransitionPrerequisite;
-import io.onedev.server.model.support.issue.workflow.transitiontrigger.BuildSuccessfulTrigger;
-import io.onedev.server.model.support.issue.workflow.transitiontrigger.PressButtonTrigger;
-import io.onedev.server.model.support.issue.workflow.transitiontrigger.TransitionTrigger;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.support.issue.transitionprerequisite.TransitionPrerequisite;
+import io.onedev.server.model.support.issue.transitionprerequisite.ValueIsNotAnyOf;
+import io.onedev.server.model.support.issue.transitionprerequisite.ValueIsOneOf;
+import io.onedev.server.model.support.issue.transitionprerequisite.ValueMatcher;
+import io.onedev.server.model.support.issue.transitiontrigger.BuildSuccessfulTrigger;
+import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;
+import io.onedev.server.model.support.issue.transitiontrigger.TransitionTrigger;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.model.support.usermatcher.SpecifiedGroup;
import io.onedev.server.model.support.usermatcher.SpecifiedUser;
import io.onedev.server.util.IssueField;
+import io.onedev.server.util.ValueSetEdit;
import io.onedev.server.util.inputspec.InputSpec;
+import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
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.setting.issueworkflow.IssueWorkflowPage;
-import io.onedev.server.web.util.WicketUtils;
+import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldResolution;
+import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldResolution.FixType;
+import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;
import io.onedev.utils.StringUtils;
@Editable
@@ -112,8 +125,8 @@ public class TransitionSpec implements Serializable {
@SuppressWarnings("unused")
private static List<String> getFieldChoices() {
List<String> fields = new ArrayList<>();
- IssueWorkflowPage page = (IssueWorkflowPage) WicketUtils.getPage();
- for (InputSpec field: page.getWorkflow().getFieldSpecs())
+ GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();
+ for (InputSpec field: issueSetting.getFieldSpecs())
fields.add(field.getName());
return fields;
}
@@ -205,7 +218,7 @@ public class TransitionSpec implements Serializable {
public boolean onDeleteField(String fieldName) {
if (getPrerequisite() != null && getPrerequisite().getInputName().equals(fieldName))
- return true;
+ setPrerequisite(null);
if (getTrigger() instanceof PressButtonTrigger) {
PressButtonTrigger trigger = (PressButtonTrigger) getTrigger();
for (Iterator<String> it = trigger.getPromptFields().iterator(); it.hasNext();) {
@@ -220,12 +233,75 @@ public class TransitionSpec implements Serializable {
return false;
}
+
+ public Collection<String> getUndefinedFields(GlobalIssueSetting globalSetting) {
+ Collection<String> undefinedFields = new HashSet<>();
+ if (getPrerequisite() != null && globalSetting.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)
+ undefinedFields.add(field);
+ }
+ }
+ for (String field: getRemoveFields()) {
+ if (globalSetting.getFieldSpec(field) == null)
+ undefinedFields.add(field);
+ }
+ return undefinedFields;
+ }
+
+ public boolean fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {
+ for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {
+ if (entry.getValue().getFixType() == FixType.CHANGE_TO_ANOTHER_FIELD)
+ onRenameField(entry.getKey(), entry.getValue().getNewField());
+ else if (onDeleteField(entry.getKey()))
+ return true;
+ }
+ return false;
+ }
+
+ public boolean onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit) {
+ if (getPrerequisite() != null && getPrerequisite().getInputName().equals(fieldName)) {
+ if (getPrerequisite().getValueMatcher() instanceof ValueIsOneOf) {
+ ValueIsOneOf valueIsOneOf = (ValueIsOneOf) getPrerequisite().getValueMatcher();
+ valueIsOneOf.getValues().removeAll(valueSetEdit.getDeletions());
+ for (int i=0; i<valueIsOneOf.getValues().size(); i++) {
+ String newValue = valueSetEdit.getRenames().get(valueIsOneOf.getValues().get(i));
+ if (newValue != null)
+ valueIsOneOf.getValues().set(i, newValue);
+ }
+ if (valueIsOneOf.getValues().isEmpty())
+ setPrerequisite(null);
+ } else if (getPrerequisite().getValueMatcher() instanceof ValueIsNotAnyOf) {
+ ValueIsNotAnyOf valueIsNotAnyOf = (ValueIsNotAnyOf) getPrerequisite().getValueMatcher();
+ valueIsNotAnyOf.getValues().removeAll(valueSetEdit.getDeletions());
+ for (int i=0; i<valueIsNotAnyOf.getValues().size(); i++) {
+ String newValue = valueSetEdit.getRenames().get(valueIsNotAnyOf.getValues().get(i));
+ if (newValue != null)
+ valueIsNotAnyOf.getValues().set(i, newValue);
+ }
+ if (valueIsNotAnyOf.getValues().isEmpty())
+ setPrerequisite(null);
+ }
+ }
+ return false;
+ }
+
+ public boolean fixUndefinedFieldValues(Project project, Map<String, ValueSetEdit> valueSetEdits) {
+ for (Map.Entry<String, ValueSetEdit> entry: valueSetEdits.entrySet()) {
+ if (onEditFieldValues(entry.getKey(), entry.getValue()))
+ return true;
+ }
+ return false;
+ }
@SuppressWarnings("unused")
private static List<String> getStateChoices() {
- IssueWorkflowPage page = (IssueWorkflowPage) WicketUtils.getPage();
+ GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();
List<String> stateNames = new ArrayList<>();
- for (StateSpec state: page.getWorkflow().getStateSpecs())
+ for (StateSpec state: issueSetting.getStateSpecs())
stateNames.add(state.getName());
return stateNames;
}
@@ -252,5 +328,30 @@ public class TransitionSpec implements Serializable {
}
return false;
}
+
+ public Collection<UndefinedFieldValue> getUndefinedFieldValues() {
+ Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();
+ if (prerequisite != null) {
+ ValueMatcher valueMatcher = prerequisite.getValueMatcher();
+ GlobalIssueSetting globalIssueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();
+ SpecifiedChoices specifiedChoices = SpecifiedChoices.of(globalIssueSetting.getFieldSpec(prerequisite.getInputName()));
+ if (specifiedChoices != null) {
+ if (valueMatcher instanceof ValueIsOneOf) {
+ ValueIsOneOf valueIsOneOf = (ValueIsOneOf) valueMatcher;
+ for (String value: valueIsOneOf.getValues()) {
+ if (!specifiedChoices.getChoiceValues().contains(value))
+ undefinedFieldValues.add(new UndefinedFieldValue(prerequisite.getInputName(), value));
+ }
+ } else if (valueMatcher instanceof ValueIsNotAnyOf) {
+ ValueIsNotAnyOf valueIsNotAnyOf = (ValueIsNotAnyOf) valueMatcher;
+ for (String value: valueIsNotAnyOf.getValues()) {
+ if (!specifiedChoices.getChoiceValues().contains(value))
+ undefinedFieldValues.add(new UndefinedFieldValue(prerequisite.getInputName(), value));
+ }
+ }
+ }
+ }
+ return undefinedFieldValues;
+ }
}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/TransitionPrerequisite.java b/core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/TransitionPrerequisite.java
similarity index 95%
rename from core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/TransitionPrerequisite.java
rename to core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/TransitionPrerequisite.java
index a854d66b56..9c8d78601f 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/TransitionPrerequisite.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/TransitionPrerequisite.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.issue.workflow.transitionprerequisite;
+package io.onedev.server.model.support.issue.transitionprerequisite;
import java.io.Serializable;
import java.util.ArrayList;
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueIsEmpty.java b/core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsEmpty.java
similarity index 78%
rename from core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueIsEmpty.java
rename to core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsEmpty.java
index 24adf825b1..ed224f7ba8 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueIsEmpty.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsEmpty.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.issue.workflow.transitionprerequisite;
+package io.onedev.server.model.support.issue.transitionprerequisite;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueIsNotAnyOf.java b/core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsNotAnyOf.java
similarity index 95%
rename from core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueIsNotAnyOf.java
rename to core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsNotAnyOf.java
index 19e46e74ab..b0f7e0d2c9 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueIsNotAnyOf.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsNotAnyOf.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.issue.workflow.transitionprerequisite;
+package io.onedev.server.model.support.issue.transitionprerequisite;
import java.util.List;
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueIsNotEmpty.java b/core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsNotEmpty.java
similarity index 78%
rename from core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueIsNotEmpty.java
rename to core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsNotEmpty.java
index 99e4abc0d3..308cee353a 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueIsNotEmpty.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsNotEmpty.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.issue.workflow.transitionprerequisite;
+package io.onedev.server.model.support.issue.transitionprerequisite;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueIsOneOf.java b/core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsOneOf.java
similarity index 95%
rename from core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueIsOneOf.java
rename to core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsOneOf.java
index 8c16ed8a17..2387e1091a 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueIsOneOf.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueIsOneOf.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.issue.workflow.transitionprerequisite;
+package io.onedev.server.model.support.issue.transitionprerequisite;
import java.util.List;
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueMatcher.java b/core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueMatcher.java
similarity index 70%
rename from core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueMatcher.java
rename to core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueMatcher.java
index cf697714f6..10ae9489eb 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitionprerequisite/ValueMatcher.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/transitionprerequisite/ValueMatcher.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.issue.workflow.transitionprerequisite;
+package io.onedev.server.model.support.issue.transitionprerequisite;
import java.io.Serializable;
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/BuildSuccessfulTrigger.java b/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java
similarity index 89%
rename from core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/BuildSuccessfulTrigger.java
rename to core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java
index 1e6c035ea5..2697019732 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/BuildSuccessfulTrigger.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.issue.workflow.transitiontrigger;
+package io.onedev.server.model.support.issue.transitiontrigger;
import org.hibernate.validator.constraints.NotEmpty;
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/CommitTrigger.java b/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/CommitTrigger.java
similarity index 75%
rename from core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/CommitTrigger.java
rename to core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/CommitTrigger.java
index de0e39c219..15c379260d 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/CommitTrigger.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/CommitTrigger.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.issue.workflow.transitiontrigger;
+package io.onedev.server.model.support.issue.transitiontrigger;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/DiscardPullRequest.java b/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/DiscardPullRequest.java
similarity index 75%
rename from core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/DiscardPullRequest.java
rename to core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/DiscardPullRequest.java
index 07a231785b..c7e8742f0d 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/DiscardPullRequest.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/DiscardPullRequest.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.issue.workflow.transitiontrigger;
+package io.onedev.server.model.support.issue.transitiontrigger;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/MergePullRequest.java b/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/MergePullRequest.java
similarity index 75%
rename from core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/MergePullRequest.java
rename to core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/MergePullRequest.java
index 5a48704361..f79bd52d30 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/MergePullRequest.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/MergePullRequest.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.issue.workflow.transitiontrigger;
+package io.onedev.server.model.support.issue.transitiontrigger;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/OpenPullRequest.java b/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/OpenPullRequest.java
similarity index 75%
rename from core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/OpenPullRequest.java
rename to core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/OpenPullRequest.java
index aaa4153f83..a95424e290 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/OpenPullRequest.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/OpenPullRequest.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.issue.workflow.transitiontrigger;
+package io.onedev.server.model.support.issue.transitiontrigger;
import io.onedev.server.web.editable.annotation.Editable;
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/PressButtonTrigger.java b/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java
similarity index 87%
rename from core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/PressButtonTrigger.java
rename to core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java
index 4d2e292fde..fb053c034a 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/PressButtonTrigger.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.issue.workflow.transitiontrigger;
+package io.onedev.server.model.support.issue.transitiontrigger;
import java.util.ArrayList;
import java.util.Iterator;
@@ -8,6 +8,9 @@ import javax.validation.constraints.NotNull;
import org.hibernate.validator.constraints.NotEmpty;
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.SettingManager;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.model.support.usermatcher.UserMatcher;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.inputspec.InputSpec;
@@ -15,7 +18,6 @@ import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.NameOfEmptyValue;
import io.onedev.server.web.page.project.ProjectPage;
-import io.onedev.server.web.page.project.setting.issueworkflow.IssueWorkflowPage;
import io.onedev.server.web.util.WicketUtils;
@Editable(order=100, name="Button is pressed")
@@ -63,8 +65,8 @@ public class PressButtonTrigger implements TransitionTrigger {
@SuppressWarnings("unused")
private static List<String> getFieldChoices() {
List<String> fields = new ArrayList<>();
- IssueWorkflowPage page = (IssueWorkflowPage) WicketUtils.getPage();
- for (InputSpec field: page.getWorkflow().getFieldSpecs())
+ GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();
+ for (InputSpec field: issueSetting.getFieldSpecs())
fields.add(field.getName());
return fields;
}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/PullRequestTrigger.java b/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PullRequestTrigger.java
similarity index 87%
rename from core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/PullRequestTrigger.java
rename to core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PullRequestTrigger.java
index 3b388449d6..22dd40d6e8 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/PullRequestTrigger.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PullRequestTrigger.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.issue.workflow.transitiontrigger;
+package io.onedev.server.model.support.issue.transitiontrigger;
import org.hibernate.validator.constraints.NotEmpty;
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/TransitionTrigger.java b/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/TransitionTrigger.java
similarity index 68%
rename from core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/TransitionTrigger.java
rename to core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/TransitionTrigger.java
index bd85c942be..54370b37a0 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/transitiontrigger/TransitionTrigger.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/TransitionTrigger.java
@@ -1,4 +1,4 @@
-package io.onedev.server.model.support.issue.workflow.transitiontrigger;
+package io.onedev.server.model.support.issue.transitiontrigger;
import java.io.Serializable;
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java b/core/src/main/java/io/onedev/server/model/support/setting/GlobalIssueSetting.java
similarity index 56%
rename from core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java
rename to core/src/main/java/io/onedev/server/model/support/setting/GlobalIssueSetting.java
index 9e719a041c..2d411071bd 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java
+++ b/core/src/main/java/io/onedev/server/model/support/setting/GlobalIssueSetting.java
@@ -1,7 +1,9 @@
-package io.onedev.server.model.support.issue.workflow;
+package io.onedev.server.model.support.setting;
import java.io.Serializable;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -13,15 +15,23 @@ import javax.annotation.Nullable;
import com.google.common.collect.Lists;
+import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.server.exception.OneException;
-import io.onedev.server.model.support.issue.workflow.transitionprerequisite.TransitionPrerequisite;
-import io.onedev.server.model.support.issue.workflow.transitionprerequisite.ValueIsEmpty;
-import io.onedev.server.model.support.issue.workflow.transitionprerequisite.ValueIsNotEmpty;
-import io.onedev.server.model.support.issue.workflow.transitiontrigger.PressButtonTrigger;
+import io.onedev.server.model.support.issue.BoardSpec;
+import io.onedev.server.model.support.issue.NamedIssueQuery;
+import io.onedev.server.model.support.issue.StateSpec;
+import io.onedev.server.model.support.issue.TransitionSpec;
+import io.onedev.server.model.support.issue.transitionprerequisite.TransitionPrerequisite;
+import io.onedev.server.model.support.issue.transitionprerequisite.ValueIsEmpty;
+import io.onedev.server.model.support.issue.transitionprerequisite.ValueIsNotEmpty;
+import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;
import io.onedev.server.model.support.usermatcher.CodeWriters;
import io.onedev.server.search.entity.issue.IssueCriteria;
+import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.search.entity.issue.OrCriteria;
import io.onedev.server.search.entity.issue.StateCriteria;
+import io.onedev.server.util.IssueConstants;
+import io.onedev.server.util.ValueSetEdit;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.util.inputspec.IssueChoiceInput;
import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;
@@ -31,26 +41,30 @@ import io.onedev.server.util.inputspec.choiceinput.defaultvalueprovider.Specifie
import io.onedev.server.util.inputspec.showcondition.ShowCondition;
import io.onedev.server.util.inputspec.showcondition.ValueIsOneOf;
import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;
+import io.onedev.server.web.editable.annotation.Editable;
-public class IssueWorkflow implements Serializable {
+@Editable
+public class GlobalIssueSetting implements Serializable {
private static final long serialVersionUID = 1L;
private List<StateSpec> stateSpecs = new ArrayList<>();
- private transient Map<String, StateSpec> stateSpecMap;
-
- private List<TransitionSpec> transitionSpecs = new ArrayList<>();
+ private List<TransitionSpec> defaultTransitionSpecs = new ArrayList<>();
private List<InputSpec> fieldSpecs = new ArrayList<>();
- private List<String> promptFieldsUponIssueOpen = new ArrayList<>();
+ private Set<String> defaultPromptFieldsUponIssueOpen = new HashSet<>();
- private boolean reconciled = true;
+ private List<BoardSpec> defaultBoardSpecs = new ArrayList<>();
+
+ private Set<String> defaultListFields = new HashSet<>();
- private transient Map<String, InputSpec> fieldSpecMap;
+ private List<NamedIssueQuery> defaultQueries = new ArrayList<>();
- public IssueWorkflow() {
+ private boolean reconciled = true;
+
+ public GlobalIssueSetting() {
ChoiceInput type = new ChoiceInput();
type.setName("Type");
SpecifiedChoices specifiedChoices = new SpecifiedChoices();
@@ -191,7 +205,7 @@ public class IssueWorkflow implements Serializable {
pressButton.setPromptFields(Lists.newArrayList("Assignee"));
transition.setTrigger(pressButton);
- transitionSpecs.add(transition);
+ defaultTransitionSpecs.add(transition);
transition = new TransitionSpec();
transition.setFromStates(Lists.newArrayList("Open", "Assigned"));
@@ -202,7 +216,7 @@ public class IssueWorkflow implements Serializable {
pressButton.setPromptFields(Lists.newArrayList("Resolution", "Duplicate With"));
transition.setTrigger(pressButton);
- transitionSpecs.add(transition);
+ defaultTransitionSpecs.add(transition);
transition = new TransitionSpec();
transition.setFromStates(Lists.newArrayList("Closed"));
@@ -216,7 +230,7 @@ public class IssueWorkflow implements Serializable {
pressButton.setAuthorized(new CodeWriters());
transition.setTrigger(pressButton);
- transitionSpecs.add(transition);
+ defaultTransitionSpecs.add(transition);
transition = new TransitionSpec();
transition.setFromStates(Lists.newArrayList("Closed"));
@@ -230,10 +244,46 @@ public class IssueWorkflow implements Serializable {
pressButton.setAuthorized(new CodeWriters());
transition.setTrigger(pressButton);
- transitionSpecs.add(transition);
-
- promptFieldsUponIssueOpen.add("Type");
- promptFieldsUponIssueOpen.add("Priority");
+ defaultTransitionSpecs.add(transition);
+
+ defaultPromptFieldsUponIssueOpen.add("Type");
+ defaultPromptFieldsUponIssueOpen.add("Priority");
+
+ BoardSpec board = new BoardSpec();
+ board.setName(IssueConstants.FIELD_STATE);
+ board.setIdentifyField(IssueConstants.FIELD_STATE);
+ board.setColumns(Lists.newArrayList("Open", "Assigned", "Closed"));
+ 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"));
+ }
+
+ public List<String> sortFieldNames(Collection<String> fieldNames) {
+ List<String> sorted = new ArrayList<>(fieldNames);
+ List<String> allFieldNames = getFieldNames();
+ Collections.sort(sorted, new Comparator<String>() {
+
+ @Override
+ public int compare(String o1, String o2) {
+ return allFieldNames.indexOf(o1) - allFieldNames.indexOf(o2);
+ }
+
+ });
+ return sorted;
}
public List<StateSpec> getStateSpecs() {
@@ -244,14 +294,15 @@ public class IssueWorkflow implements Serializable {
this.stateSpecs = stateSpecs;
}
- public List<TransitionSpec> getTransitionSpecs() {
- return transitionSpecs;
+ public List<TransitionSpec> getDefaultTransitionSpecs() {
+ return defaultTransitionSpecs;
}
- public void setTransitionSpecs(List<TransitionSpec> stateTransitions) {
- this.transitionSpecs = stateTransitions;
+ public void setDefaultTransitionSpecs(List<TransitionSpec> defaultStateTransitions) {
+ this.defaultTransitionSpecs = defaultStateTransitions;
}
+ @Editable
public List<InputSpec> getFieldSpecs() {
return fieldSpecs;
}
@@ -260,12 +311,12 @@ public class IssueWorkflow implements Serializable {
this.fieldSpecs = fieldSpecs;
}
- public List<String> getPromptFieldsUponIssueOpen() {
- return promptFieldsUponIssueOpen;
+ public Set<String> getDefaultPromptFieldsUponIssueOpen() {
+ return defaultPromptFieldsUponIssueOpen;
}
- public void setPromptFieldsUponIssueOpen(List<String> promptFieldsUponIssueOpen) {
- this.promptFieldsUponIssueOpen = promptFieldsUponIssueOpen;
+ public void setDefaultPromptFieldsUponIssueOpen(Set<String> defaultPromptFieldsUponIssueOpen) {
+ this.defaultPromptFieldsUponIssueOpen = defaultPromptFieldsUponIssueOpen;
}
public boolean isReconciled() {
@@ -277,20 +328,18 @@ public class IssueWorkflow implements Serializable {
}
private Map<String, InputSpec> getFieldSpecMap() {
- if (fieldSpecMap == null) {
- fieldSpecMap = new LinkedHashMap<>();
- for (InputSpec field: getFieldSpecs())
- fieldSpecMap.put(field.getName(), field);
- }
+ // Do not use cache here as we may change fieldSpecs while editing IssueSetting
+ Map<String, InputSpec> fieldSpecMap = new LinkedHashMap<>();
+ for (InputSpec field: getFieldSpecs())
+ fieldSpecMap.put(field.getName(), field);
return fieldSpecMap;
}
private Map<String, StateSpec> getStateSpecMap() {
- if (stateSpecMap == null) {
- stateSpecMap = new LinkedHashMap<>();
- for (StateSpec state: getStateSpecs())
- stateSpecMap.put(state.getName(), state);
- }
+ // Do not use cache here as we may change fieldSpecs while editing IssueSetting
+ Map<String, StateSpec> stateSpecMap = new LinkedHashMap<>();
+ for (StateSpec state: getStateSpecs())
+ stateSpecMap.put(state.getName(), state);
return stateSpecMap;
}
@@ -298,36 +347,49 @@ public class IssueWorkflow implements Serializable {
return new ArrayList<>(getFieldSpecMap().keySet());
}
- public void onDeleteConfiguration(String configurationName) {
- for (Iterator<TransitionSpec> it = getTransitionSpecs().iterator(); it.hasNext();) {
- TransitionSpec transition = it.next();
- if (transition.onDeleteConfiguration(configurationName))
- it.remove();
- }
- }
-
- public void onRenameConfiguration(String oldName, String newName) {
- for (Iterator<TransitionSpec> it = getTransitionSpecs().iterator(); it.hasNext();)
- it.next().onRenameConfiguration(oldName, newName);
- }
-
public void onDeleteState(String stateName) {
- for (Iterator<TransitionSpec> it = getTransitionSpecs().iterator(); it.hasNext();) {
+ for (Iterator<TransitionSpec> it = getDefaultTransitionSpecs().iterator(); it.hasNext();) {
TransitionSpec transition = it.next();
transition.getFromStates().remove(stateName);
if (transition.getFromStates().isEmpty() || transition.getToState().equals(stateName))
it.remove();
}
+ for (Iterator<BoardSpec> it = getDefaultBoardSpecs().iterator(); it.hasNext();) {
+ if (it.next().onDeleteState(stateName))
+ it.remove();
+ }
+
+ for (Iterator<NamedIssueQuery> it = getDefaultQueries().iterator(); it.hasNext();) {
+ NamedIssueQuery namedQuery = it.next();
+ try {
+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);
+ if (query.onDeleteState(stateName))
+ it.remove();
+ else
+ namedQuery.setQuery(query.toString());
+ } catch (Exception e) {
+ }
+ }
}
public void onRenameState(String oldName, String newName) {
- for (TransitionSpec transition: getTransitionSpecs()) {
+ for (TransitionSpec transition: getDefaultTransitionSpecs()) {
int index = transition.getFromStates().indexOf(oldName);
if (index != -1)
transition.getFromStates().set(index, newName);
if (transition.getToState().equals(oldName))
transition.setToState(newName);
}
+ for (BoardSpec board: getDefaultBoardSpecs())
+ board.onRenameState(oldName, newName);
+ for (NamedIssueQuery namedQuery: getDefaultQueries()) {
+ try {
+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);
+ query.onRenameState(oldName, newName);
+ namedQuery.setQuery(query.toString());
+ } catch (Exception e) {
+ }
+ }
}
@Nullable
@@ -335,51 +397,85 @@ public class IssueWorkflow implements Serializable {
return getStateSpecMap().get(stateName);
}
- public int getStateSpecIndex(String stateName) {
- for (int i=0; i<getStateSpecs().size(); i++) {
- if (getStateSpecs().get(i).getName().equals(stateName))
- return i;
- }
- return -1;
- }
-
- public int getTransitionSpecIndex(TransitionSpec transition) {
- for (int i=0; i<getTransitionSpecs().size(); i++) {
- if (getTransitionSpecs().get(i) == transition)
- return i;
- }
- return -1;
- }
-
@Nullable
public InputSpec getFieldSpec(String fieldName) {
return getFieldSpecMap().get(fieldName);
}
- public int getFieldSpecIndex(String fieldName) {
- for (int i=0; i<getFieldSpecs().size(); i++) {
- if (getFieldSpecs().get(i).getName().equals(fieldName))
- return i;
+ public void onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit) {
+ for (Iterator<TransitionSpec> it = getDefaultTransitionSpecs().iterator(); it.hasNext();) {
+ TransitionSpec transition = it.next();
+ if (transition.onEditFieldValues(fieldName, valueSetEdit))
+ it.remove();
+ }
+ for (Iterator<BoardSpec> it = getDefaultBoardSpecs().iterator(); it.hasNext();) {
+ if (it.next().onEditFieldValues(fieldName, valueSetEdit))
+ it.remove();
+ }
+
+ for (Iterator<NamedIssueQuery> it = getDefaultQueries().iterator(); it.hasNext();) {
+ NamedIssueQuery namedQuery = it.next();
+ try {
+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);
+ if (query.onEditFieldValues(fieldName, valueSetEdit))
+ it.remove();
+ else
+ namedQuery.setQuery(query.toString());
+ } catch (Exception e) {
+ }
+ }
+ Set<String> deletedFields = new HashSet<>();
+ for (Iterator<InputSpec> it = getFieldSpecs().iterator(); it.hasNext();) {
+ InputSpec field = it.next();
+ if (field.onEditInputValues(fieldName, valueSetEdit)) {
+ it.remove();
+ deletedFields.add(field.getName());
+ }
}
- return -1;
+ for (String deletedField: deletedFields)
+ onDeleteField(deletedField);
}
public void onRenameField(String oldName, String newName) {
- for (int i=0; i<getPromptFieldsUponIssueOpen().size(); i++) {
- if (getPromptFieldsUponIssueOpen().get(i).equals(oldName))
- getPromptFieldsUponIssueOpen().set(i, newName);
- }
- for (TransitionSpec transition: getTransitionSpecs())
+ for (TransitionSpec transition: getDefaultTransitionSpecs())
transition.onRenameField(oldName, newName);
for (InputSpec field: getFieldSpecs())
field.onRenameInput(oldName, newName);
+ for (BoardSpec board: getDefaultBoardSpecs())
+ board.onRenameField(this, oldName, newName);
+ for (NamedIssueQuery namedQuery: getDefaultQueries()) {
+ try {
+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);
+ query.onRenameField(oldName, newName);
+ namedQuery.setQuery(query.toString());
+ } catch (Exception e) {
+ }
+ }
}
public void onDeleteField(String fieldName) {
- for (Iterator<TransitionSpec> it = getTransitionSpecs().iterator(); it.hasNext();) {
+ for (Iterator<TransitionSpec> it = getDefaultTransitionSpecs().iterator(); it.hasNext();) {
if (it.next().onDeleteField(fieldName))
it.remove();
}
+
+ for (Iterator<BoardSpec> it = getDefaultBoardSpecs().iterator(); it.hasNext();) {
+ if (it.next().onDeleteField(this, fieldName))
+ it.remove();
+ }
+
+ for (Iterator<NamedIssueQuery> it = getDefaultQueries().iterator(); it.hasNext();) {
+ NamedIssueQuery namedQuery = it.next();
+ try {
+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);
+ if (query.onDeleteField(fieldName))
+ it.remove();
+ else
+ namedQuery.setQuery(query.toString());
+ } catch (Exception e) {
+ }
+ }
+
Set<String> deletedFields = new HashSet<>();
for (Iterator<InputSpec> it = getFieldSpecs().iterator(); it.hasNext();) {
InputSpec field = it.next();
@@ -393,13 +489,25 @@ public class IssueWorkflow implements Serializable {
}
public void onRenameUser(String oldName, String newName) {
- for (TransitionSpec transition: getTransitionSpecs())
+ for (TransitionSpec transition: getDefaultTransitionSpecs())
transition.onRenameUser(oldName, newName);
for (InputSpec field: getFieldSpecs())
field.onRenameUser(oldName, newName);
+ for (BoardSpec board: getDefaultBoardSpecs())
+ board.onRenameUser(this, oldName, newName);
}
public void onDeleteUser(String userName) {
+ for (Iterator<TransitionSpec> it = getDefaultTransitionSpecs().iterator(); it.hasNext();) {
+ TransitionSpec transition = it.next();
+ if (transition.onDeleteUser(userName))
+ it.remove();
+ }
+ for (Iterator<BoardSpec> it = getDefaultBoardSpecs().iterator(); it.hasNext();) {
+ if (it.next().onDeleteUser(this, userName))
+ it.remove();
+ }
+
Set<String> deletedFields = new HashSet<>();
for (Iterator<InputSpec> it = getFieldSpecs().iterator(); it.hasNext();) {
InputSpec field = it.next();
@@ -410,22 +518,21 @@ public class IssueWorkflow implements Serializable {
}
for (String deletedField: deletedFields)
onDeleteField(deletedField);
-
- for (Iterator<TransitionSpec> it = getTransitionSpecs().iterator(); it.hasNext();) {
- TransitionSpec transition = it.next();
- if (transition.onDeleteUser(userName))
- it.remove();
- }
}
public void onRenameGroup(String oldName, String newName) {
- for (TransitionSpec transition: getTransitionSpecs())
+ for (TransitionSpec transition: getDefaultTransitionSpecs())
transition.onRenameGroup(oldName, newName);
for (InputSpec field: getFieldSpecs())
field.onRenameGroup(oldName, newName);
}
public void onDeleteGroup(String groupName) {
+ for (Iterator<TransitionSpec> it = getDefaultTransitionSpecs().iterator(); it.hasNext();) {
+ TransitionSpec transition = it.next();
+ if (transition.onDeleteGroup(groupName))
+ it.remove();
+ }
Set<String> deletedFields = new HashSet<>();
for (Iterator<InputSpec> it = getFieldSpecs().iterator(); it.hasNext();) {
InputSpec field = it.next();
@@ -436,12 +543,6 @@ public class IssueWorkflow implements Serializable {
}
for (String deletedField: deletedFields)
onDeleteField(deletedField);
-
- for (Iterator<TransitionSpec> it = getTransitionSpecs().iterator(); it.hasNext();) {
- TransitionSpec transition = it.next();
- if (transition.onDeleteGroup(groupName))
- it.remove();
- }
}
public StateSpec getInitialStateSpec() {
@@ -459,5 +560,30 @@ public class IssueWorkflow implements Serializable {
}
return new OrCriteria(criterias);
}
+
+ public List<BoardSpec> getDefaultBoardSpecs() {
+ return defaultBoardSpecs;
+ }
+
+ public void setDefaultBoardSpecs(List<BoardSpec> defaultBoardSpecs) {
+ this.defaultBoardSpecs = defaultBoardSpecs;
+ }
+
+ public Set<String> getDefaultListFields() {
+ return defaultListFields;
+ }
+
+ public void setDefaultListFields(Set<String> defaultListFields) {
+ this.defaultListFields = defaultListFields;
+ }
+
+ @Editable(order=300, description="Define default issue queries for all projects")
+ public List<NamedIssueQuery> getDefaultQueries() {
+ return defaultQueries;
+ }
+
+ public void setDefaultQueries(List<NamedIssueQuery> defaultQueries) {
+ this.defaultQueries = defaultQueries;
+ }
}
diff --git a/core/src/main/java/io/onedev/server/model/support/usermatcher/SpecifiedGroup.java b/core/src/main/java/io/onedev/server/model/support/usermatcher/SpecifiedGroup.java
index c5999a2daf..82b6a6565f 100644
--- a/core/src/main/java/io/onedev/server/model/support/usermatcher/SpecifiedGroup.java
+++ b/core/src/main/java/io/onedev/server/model/support/usermatcher/SpecifiedGroup.java
@@ -13,7 +13,7 @@ import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.GroupChoice;
import io.onedev.server.web.editable.annotation.OmitName;
-@Editable(order=300, name="Group")
+@Editable(order=300, name="Specified group")
public class SpecifiedGroup implements UserMatcher {
private static final long serialVersionUID = 1L;
diff --git a/core/src/main/java/io/onedev/server/model/support/usermatcher/SpecifiedUser.java b/core/src/main/java/io/onedev/server/model/support/usermatcher/SpecifiedUser.java
index c82c5b067d..6d4a9a320b 100644
--- a/core/src/main/java/io/onedev/server/model/support/usermatcher/SpecifiedUser.java
+++ b/core/src/main/java/io/onedev/server/model/support/usermatcher/SpecifiedUser.java
@@ -12,7 +12,7 @@ import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.OmitName;
import io.onedev.server.web.editable.annotation.UserChoice;
-@Editable(order=500, name="User")
+@Editable(order=500, name="Specified user")
public class SpecifiedUser implements UserMatcher {
private static final long serialVersionUID = 1L;
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/AndCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/AndCriteria.java
index 74fe3fcc8f..b4d613cd74 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/AndCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/AndCriteria.java
@@ -15,6 +15,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.search.entity.QueryBuildContext;
+import io.onedev.server.util.ValueSetEdit;
import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;
public class AndCriteria extends IssueCriteria implements ParensAware {
@@ -48,31 +49,40 @@ public class AndCriteria extends IssueCriteria implements ParensAware {
}
@Override
- public Collection<String> getUndefinedStates(Project project) {
+ public Collection<String> getUndefinedStates() {
List<String> undefinedStates = new ArrayList<>();
for (IssueCriteria criteria: criterias)
- undefinedStates.addAll(criteria.getUndefinedStates(project));
+ undefinedStates.addAll(criteria.getUndefinedStates());
return undefinedStates;
}
@Override
- public void onRenameState(String oldState, String newState) {
+ public void onRenameState(String oldName, String newName) {
for (IssueCriteria criteria: criterias)
- criteria.onRenameState(oldState, newState);
+ criteria.onRenameState(oldName, newName);
}
@Override
- public Collection<String> getUndefinedFields(Project project) {
+ public boolean onDeleteState(String stateName) {
+ for (Iterator<IssueCriteria> it = criterias.iterator(); it.hasNext();) {
+ if (it.next().onDeleteState(stateName))
+ it.remove();
+ }
+ return criterias.isEmpty();
+ }
+
+ @Override
+ public Collection<String> getUndefinedFields() {
Set<String> undefinedFields = new HashSet<>();
for (IssueCriteria criteria: criterias)
- undefinedFields.addAll(criteria.getUndefinedFields(project));
+ undefinedFields.addAll(criteria.getUndefinedFields());
return undefinedFields;
}
@Override
- public void onRenameField(String oldField, String newField) {
+ public void onRenameField(String oldName, String newName) {
for (IssueCriteria criteria: criterias)
- criteria.onRenameField(oldField, newField);
+ criteria.onRenameField(oldName, newName);
}
@Override
@@ -85,28 +95,22 @@ public class AndCriteria extends IssueCriteria implements ParensAware {
}
@Override
- public Collection<UndefinedFieldValue> getUndefinedFieldValues(Project project) {
- Set<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();
- for (IssueCriteria criteria: criterias)
- undefinedFieldValues.addAll(criteria.getUndefinedFieldValues(project));
- return undefinedFieldValues;
- }
-
- @Override
- public void onRenameFieldValue(String fieldName, String oldValue, String newValue) {
- for (IssueCriteria criteria: criterias)
- criteria.onRenameFieldValue(fieldName, oldValue, newValue);
- }
-
- @Override
- public boolean onDeleteFieldValue(String fieldName, String fieldValue) {
+ public boolean onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit) {
for (Iterator<IssueCriteria> it = criterias.iterator(); it.hasNext();) {
- if (it.next().onDeleteFieldValue(fieldName, fieldValue))
+ if (it.next().onEditFieldValues(fieldName, valueSetEdit))
it.remove();
}
return criterias.isEmpty();
}
+ @Override
+ public Collection<UndefinedFieldValue> getUndefinedFieldValues() {
+ Set<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();
+ for (IssueCriteria criteria: criterias)
+ undefinedFieldValues.addAll(criteria.getUndefinedFieldValues());
+ return undefinedFieldValues;
+ }
+
@Override
public void fill(Issue issue, Set<String> initedLists) {
for (IssueCriteria criteria: criterias)
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java
index f2bbc4a1b7..f7bd24a150 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java
@@ -10,12 +10,16 @@ import java.util.Set;
import javax.persistence.criteria.From;
import javax.persistence.criteria.Predicate;
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.SettingManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueFieldUnary;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.search.entity.QueryBuildContext;
-import io.onedev.server.util.inputspec.InputSpec;
+import io.onedev.server.util.ValueSetEdit;
+import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;
public class ChoiceFieldCriteria extends FieldCriteria {
@@ -80,24 +84,26 @@ public class ChoiceFieldCriteria extends FieldCriteria {
}
@Override
- public Collection<UndefinedFieldValue> getUndefinedFieldValues(Project project) {
- Set<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();
- InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(getFieldName());
- List<String> choices = fieldSpec.getPossibleValues();
- if (!choices.contains(value))
+ public Collection<UndefinedFieldValue> getUndefinedFieldValues() {
+ Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();
+ GlobalIssueSetting 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));
+ }
return undefinedFieldValues;
}
@Override
- public void onRenameFieldValue(String fieldName, String oldValue, String newValue) {
- if (fieldName.equals(getFieldName()) && oldValue.equals(value))
- value = newValue;
- }
-
- @Override
- public boolean onDeleteFieldValue(String fieldName, String fieldValue) {
- return fieldName.equals(getFieldName()) && fieldValue.equals(value);
+ public boolean onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit) {
+ if (fieldName.equals(getFieldName())) {
+ if (valueSetEdit.getDeletions().contains(value))
+ return true;
+ String newValue = valueSetEdit.getRenames().get(value);
+ if (newValue != null)
+ value = newValue;
+ }
+ return false;
}
@SuppressWarnings({ "rawtypes", "unchecked" })
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/ClosedCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/ClosedCriteria.java
index 3211bb6e2c..4737c8f2d0 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/ClosedCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/ClosedCriteria.java
@@ -2,10 +2,12 @@ package io.onedev.server.search.entity.issue;
import javax.persistence.criteria.Predicate;
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.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.workflow.StateSpec;
+import io.onedev.server.model.support.issue.StateSpec;
import io.onedev.server.search.entity.QueryBuildContext;
public class ClosedCriteria extends IssueCriteria {
@@ -13,7 +15,7 @@ public class ClosedCriteria extends IssueCriteria {
private static final long serialVersionUID = 1L;
private IssueCriteria getCriteria(Project project) {
- return project.getIssueWorkflow().getCategoryCriteria(StateSpec.Category.CLOSED);
+ return OneDev.getInstance(SettingManager.class).getIssueSetting().getCategoryCriteria(StateSpec.Category.CLOSED);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java
index 62e057e155..f1e5dfdc77 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/FieldCriteria.java
@@ -4,7 +4,9 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
-import io.onedev.server.model.Project;
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.SettingManager;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.util.IssueConstants;
public abstract class FieldCriteria extends IssueCriteria {
@@ -22,10 +24,11 @@ public abstract class FieldCriteria extends IssueCriteria {
}
@Override
- public Collection<String> getUndefinedFields(Project project) {
+ public Collection<String> getUndefinedFields() {
Set<String> undefinedFields = new HashSet<>();
+ GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();
if (!IssueConstants.QUERY_FIELDS.contains(fieldName)
- && project.getIssueWorkflow().getFieldSpec(fieldName) == null) {
+ && issueSetting.getFieldSpec(fieldName) == null) {
undefinedFields.add(fieldName);
}
return undefinedFields;
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java
index 551c87ed06..6d4f1c99f6 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java
@@ -13,6 +13,7 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.EntityCriteria;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.ValueSetEdit;
import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;
public abstract class IssueCriteria extends EntityCriteria<Issue> {
@@ -28,14 +29,14 @@ public abstract class IssueCriteria extends EntityCriteria<Issue> {
public void fill(Issue issue, Set<String> initedLists) {
}
- public Collection<String> getUndefinedStates(Project project) {
+ public Collection<String> getUndefinedStates() {
return new HashSet<>();
}
public void onRenameState(String oldState, String newState) {
}
- public Collection<String> getUndefinedFields(Project project) {
+ public Collection<String> getUndefinedFields() {
return new HashSet<>();
}
@@ -45,18 +46,15 @@ public abstract class IssueCriteria extends EntityCriteria<Issue> {
public boolean onDeleteField(String fieldName) {
return false;
}
-
- public Collection<UndefinedFieldValue> getUndefinedFieldValues(Project project) {
- return new HashSet<>();
- }
-
- public void onRenameFieldValue(String fieldName, String oldValue, String newValue) {
- }
-
- public boolean onDeleteFieldValue(String fieldName, String fieldValue) {
+
+ public boolean onDeleteState(String stateName) {
return false;
}
+ public Collection<UndefinedFieldValue> getUndefinedFieldValues() {
+ return new HashSet<>();
+ }
+
@Nullable
public static IssueCriteria of(List<IssueCriteria> criterias) {
if (criterias.size() > 1)
@@ -66,4 +64,8 @@ public abstract class IssueCriteria extends EntityCriteria<Issue> {
else
return null;
}
+
+ public boolean onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit) {
+ return false;
+ }
}
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
index 36014fb75c..f430085fda 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
@@ -19,6 +19,7 @@ import java.util.Date;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import javax.annotation.Nullable;
@@ -32,10 +33,13 @@ import org.antlr.v4.runtime.Recognizer;
import org.eclipse.jgit.errors.RevisionSyntaxException;
import org.eclipse.jgit.lib.ObjectId;
+import io.onedev.server.OneDev;
import io.onedev.server.exception.OneException;
+import io.onedev.server.manager.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.setting.GlobalIssueSetting;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.EntitySort;
import io.onedev.server.search.entity.EntitySort.Direction;
@@ -52,22 +56,22 @@ import io.onedev.server.search.entity.issue.IssueQueryParser.OrderContext;
import io.onedev.server.search.entity.issue.IssueQueryParser.ParensCriteriaContext;
import io.onedev.server.search.entity.issue.IssueQueryParser.QueryContext;
import io.onedev.server.search.entity.issue.IssueQueryParser.RevisionCriteriaContext;
-import io.onedev.server.util.EditContext;
import io.onedev.server.util.IssueConstants;
-import io.onedev.server.util.OneContext;
+import io.onedev.server.util.ValueSetEdit;
import io.onedev.server.util.inputspec.BuildChoiceInput;
-import io.onedev.server.util.inputspec.InputContext;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.util.inputspec.IssueChoiceInput;
import io.onedev.server.util.inputspec.PullRequestChoiceInput;
import io.onedev.server.util.inputspec.booleaninput.BooleanInput;
import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;
import io.onedev.server.util.inputspec.dateinput.DateInput;
-import io.onedev.server.util.inputspec.numberinput.NumberInput;
import io.onedev.server.util.inputspec.groupchoiceinput.GroupChoiceInput;
+import io.onedev.server.util.inputspec.numberinput.NumberInput;
import io.onedev.server.util.inputspec.textinput.TextInput;
import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;
+import io.onedev.server.web.page.admin.issuesetting.GlobalIssueSettingPage;
import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;
+import io.onedev.server.web.util.WicketUtils;
public class IssueQuery extends EntityQuery<Issue> {
@@ -95,7 +99,7 @@ public class IssueQuery extends EntityQuery<Issue> {
return sorts;
}
- public static IssueQuery parse(Project project, @Nullable String queryString, boolean validate) {
+ public static IssueQuery parse(@Nullable Project project, @Nullable String queryString, boolean validate) {
if (queryString != null) {
ANTLRInputStream is = new ANTLRInputStream(queryString);
IssueQueryLexer lexer = new IssueQueryLexer(is);
@@ -128,37 +132,8 @@ public class IssueQuery extends EntityQuery<Issue> {
issueCriteria = new IssueQueryBaseVisitor<IssueCriteria>() {
private long getValueOrdinal(ChoiceInput field, String value) {
- OneContext.push(new OneContext() {
-
- @Override
- public Project getProject() {
- return project;
- }
-
- @Override
- public EditContext getEditContext(int level) {
- return new EditContext() {
-
- @Override
- public Object getInputValue(String name) {
- return null;
- }
-
- };
- }
-
- @Override
- public InputContext getInputContext() {
- throw new UnsupportedOperationException();
- }
-
- });
- try {
- List<String> choices = new ArrayList<>(field.getChoiceProvider().getChoices(true).keySet());
- return choices.indexOf(value);
- } finally {
- OneContext.pop();
- }
+ List<String> choices = new ArrayList<>(field.getChoiceProvider().getChoices(true).keySet());
+ return choices.indexOf(value);
}
@Override
@@ -182,7 +157,7 @@ public class IssueQuery extends EntityQuery<Issue> {
String fieldName = getValue(ctx.Quoted().getText());
int operator = ctx.operator.getType();
if (validate)
- checkField(project, fieldName, operator);
+ checkField(fieldName, operator);
if (fieldName.equals(FIELD_MILESTONE))
return new MilestoneCriteria(null);
else if (fieldName.equals(FIELD_DESCRIPTION))
@@ -196,7 +171,7 @@ public class IssueQuery extends EntityQuery<Issue> {
public IssueCriteria visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {
String value = getValue(ctx.Quoted().getText());
if (ctx.SubmittedBy() != null) {
- return new SubmittedByCriteria(getUser(value));
+ return new SubmittedByCriteria(getUser(value), value);
} else if (ctx.FixedInBuild() != null) {
return new FixedInCriteria(getBuild(project, value));
} else {
@@ -241,7 +216,7 @@ public class IssueQuery extends EntityQuery<Issue> {
String value = getValue(ctx.Quoted(1).getText());
int operator = ctx.operator.getType();
if (validate)
- checkField(project, fieldName, operator);
+ checkField(fieldName, operator);
switch (operator) {
case IssueQueryLexer.IsBefore:
@@ -261,16 +236,16 @@ public class IssueQuery extends EntityQuery<Issue> {
} else if (fieldName.equals(FIELD_COMMENT)) {
return new CommentCriteria(value);
} else {
- if (validate) {
- InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(fieldName);
- if (fieldSpec instanceof TextInput) {
- return new StringFieldCriteria(fieldName, value, operator);
- } else {
- long ordinal = getValueOrdinal((ChoiceInput) fieldSpec, value);
- return new ChoiceFieldCriteria(fieldName, value, ordinal, operator, true);
- }
- } else {
+ InputSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);
+ if (fieldSpec instanceof TextInput) {
return new StringFieldCriteria(fieldName, value, operator);
+ } else {
+ long ordinal;
+ if (validate)
+ ordinal = getValueOrdinal((ChoiceInput) fieldSpec, value);
+ else
+ ordinal = 0;
+ return new ChoiceFieldCriteria(fieldName, value, ordinal, operator, true);
}
}
case IssueQueryLexer.Is:
@@ -285,7 +260,7 @@ public class IssueQuery extends EntityQuery<Issue> {
} else if (fieldName.equals(FIELD_NUMBER)) {
return new NumberCriteria(getIntValue(value), operator);
} else {
- InputSpec field = project.getIssueWorkflow().getFieldSpec(fieldName);
+ InputSpec field = getIssueSetting().getFieldSpec(fieldName);
if (field instanceof IssueChoiceInput || field instanceof BuildChoiceInput
|| field instanceof PullRequestChoiceInput) {
value = value.trim();
@@ -315,16 +290,16 @@ public class IssueQuery extends EntityQuery<Issue> {
} else if (fieldName.equals(FIELD_NUMBER)) {
return new NumberCriteria(getIntValue(value), operator);
} else {
- if (validate) {
- InputSpec field = project.getIssueWorkflow().getFieldSpec(fieldName);
- if (field instanceof NumberInput) {
- return new NumberFieldCriteria(fieldName, getIntValue(value), operator);
- } else {
- long ordinal = getValueOrdinal((ChoiceInput) field, value);
- return new ChoiceFieldCriteria(fieldName, value, ordinal, operator, false);
- }
+ InputSpec field = getIssueSetting().getFieldSpec(fieldName);
+ if (field instanceof NumberInput) {
+ return new NumberFieldCriteria(fieldName, getIntValue(value), operator);
} else {
- return new NumberFieldCriteria(fieldName, 0, operator);
+ long ordinal;
+ if (validate)
+ ordinal = getValueOrdinal((ChoiceInput) field, value);
+ else
+ ordinal = 0;
+ return new ChoiceFieldCriteria(fieldName, value, ordinal, operator, false);
}
}
default:
@@ -362,7 +337,7 @@ public class IssueQuery extends EntityQuery<Issue> {
for (OrderContext order: queryContext.order()) {
String fieldName = getValue(order.Quoted().getText());
if (validate && !IssueConstants.ORDER_FIELDS.containsKey(fieldName)) {
- InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(fieldName);
+ InputSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);
if (!(fieldSpec instanceof ChoiceInput) && !(fieldSpec instanceof DateInput)
&& !(fieldSpec instanceof NumberInput)) {
throw new OneException("Can not order by field: " + fieldName);
@@ -384,12 +359,19 @@ public class IssueQuery extends EntityQuery<Issue> {
}
}
+ private static GlobalIssueSetting getIssueSetting() {
+ if (WicketUtils.getPage() instanceof GlobalIssueSettingPage)
+ return ((GlobalIssueSettingPage)WicketUtils.getPage()).getSetting();
+ else
+ return OneDev.getInstance(SettingManager.class).getIssueSetting();
+ }
+
private static OneException newOperatorException(String fieldName, int operator) {
return new OneException("Field '" + fieldName + "' is not applicable for operator '" + getRuleName(operator) + "'");
}
- public static void checkField(Project project, String fieldName, int operator) {
- InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(fieldName);
+ public static void checkField(String fieldName, int operator) {
+ InputSpec fieldSpec = getIssueSetting().getFieldSpec(fieldName);
if (fieldSpec == null && !IssueConstants.QUERY_FIELDS.contains(fieldName))
throw new OneException("Field not found: " + fieldName);
switch (operator) {
@@ -478,37 +460,41 @@ public class IssueQuery extends EntityQuery<Issue> {
return builder.toString().trim();
}
- public Collection<String> getUndefinedStates(Project project) {
+ public Collection<String> getUndefinedStates() {
if (criteria != null)
- return criteria.getUndefinedStates(project);
+ return criteria.getUndefinedStates();
else
return new ArrayList<>();
}
- public void onRenameState(String oldState, String newState) {
+ public void onRenameState(String oldName, String newName) {
if (criteria != null)
- criteria.onRenameState(oldState, newState);
+ criteria.onRenameState(oldName, newName);
}
- public Collection<String> getUndefinedFields(Project project) {
+ public boolean onDeleteState(String stateName) {
+ return criteria != null && criteria.onDeleteState(stateName);
+ }
+
+ public Collection<String> getUndefinedFields() {
Set<String> undefinedFields = new HashSet<>();
if (criteria != null)
- undefinedFields.addAll(criteria.getUndefinedFields(project));
+ undefinedFields.addAll(criteria.getUndefinedFields());
for (EntitySort sort: sorts) {
if (!IssueConstants.QUERY_FIELDS.contains(sort.getField())
- && project.getIssueWorkflow().getFieldSpec(sort.getField()) == null) {
+ && getIssueSetting().getFieldSpec(sort.getField()) == null) {
undefinedFields.add(sort.getField());
}
}
return undefinedFields;
}
- public void onRenameField(String oldField, String newField) {
+ public void onRenameField(String oldName, String newName) {
if (criteria != null)
- criteria.onRenameField(oldField, newField);
+ criteria.onRenameField(oldName, newName);
for (EntitySort sort: sorts) {
- if (sort.getField().equals(oldField))
- sort.setField(newField);
+ if (sort.getField().equals(oldName))
+ sort.setField(newName);
}
}
@@ -522,20 +508,23 @@ public class IssueQuery extends EntityQuery<Issue> {
return false;
}
- public Collection<UndefinedFieldValue> getUndefinedFieldValues(Project project) {
+ public Collection<UndefinedFieldValue> getUndefinedFieldValues() {
if (criteria != null)
- return criteria.getUndefinedFieldValues(project);
+ return criteria.getUndefinedFieldValues();
else
return new HashSet<>();
}
- public void onRenameFieldValue(String fieldName, String oldValue, String newValue) {
- if (criteria != null)
- criteria.onRenameFieldValue(fieldName, oldValue, newValue);
+ public boolean onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit) {
+ return criteria != null && criteria.onEditFieldValues(fieldName, valueSetEdit);
}
- public boolean onDeleteFieldValue(String fieldName, String fieldValue) {
- return criteria != null && criteria.onDeleteFieldValue(fieldName, fieldValue);
+ public boolean fixUndefinedFieldValues(Map<String, ValueSetEdit> valueSetEdits) {
+ for (Map.Entry<String, ValueSetEdit> entry: valueSetEdits.entrySet()) {
+ if (onEditFieldValues(entry.getKey(), entry.getValue()))
+ return true;
+ }
+ return false;
}
public static IssueQuery merge(IssueQuery query1, IssueQuery query2) {
@@ -549,5 +538,5 @@ public class IssueQuery extends EntityQuery<Issue> {
sorts.addAll(query2.getSorts());
return new IssueQuery(IssueCriteria.of(criterias), sorts);
}
-
+
}
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/MineCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/MineCriteria.java
index 26466244d0..5a788298c2 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/MineCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/MineCriteria.java
@@ -5,9 +5,12 @@ import java.util.List;
import javax.persistence.criteria.Predicate;
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.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.setting.GlobalIssueSetting;
import io.onedev.server.search.entity.QueryBuildContext;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;
@@ -17,9 +20,10 @@ public class MineCriteria extends IssueCriteria {
private static final long serialVersionUID = 1L;
private IssueCriteria getCriteria(Project project, User user) {
- IssueCriteria submitterCriteria = new SubmittedByCriteria(user);
+ IssueCriteria submitterCriteria = new SubmittedByCriteria(user, user.getName());
List<IssueCriteria> fieldCriterias = new ArrayList<>();
- for (InputSpec field: project.getIssueWorkflow().getFieldSpecs()) {
+ GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();
+ for (InputSpec field: issueSetting.getFieldSpecs()) {
if (field instanceof UserChoiceInput) {
IssueCriteria fieldCriteria = new FieldOperatorCriteria(field.getName(), IssueQueryLexer.IsMe);
fieldCriterias.add(fieldCriteria);
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/NotCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/NotCriteria.java
index 0afca9b91f..422ce8a8da 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/NotCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/NotCriteria.java
@@ -1,5 +1,7 @@
package io.onedev.server.search.entity.issue;
+import java.util.Collection;
+
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Issue;
@@ -7,6 +9,8 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.search.entity.NotCriteriaHelper;
import io.onedev.server.search.entity.QueryBuildContext;
+import io.onedev.server.util.ValueSetEdit;
+import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;
public class NotCriteria extends IssueCriteria {
@@ -38,4 +42,44 @@ public class NotCriteria extends IssueCriteria {
return new NotCriteriaHelper<Issue>(criteria).toString();
}
+ @Override
+ public void onRenameField(String oldName, String newName) {
+ criteria.onRenameField(oldName, newName);
+ }
+
+ @Override
+ public boolean onDeleteField(String fieldName) {
+ return criteria.onDeleteField(fieldName);
+ }
+
+ @Override
+ public void onRenameState(String oldName, String newName) {
+ criteria.onRenameState(oldName, newName);
+ }
+
+ @Override
+ public boolean onDeleteState(String stateName) {
+ return criteria.onDeleteState(stateName);
+ }
+
+ @Override
+ public Collection<String> getUndefinedStates() {
+ return criteria.getUndefinedStates();
+ }
+
+ @Override
+ public Collection<String> getUndefinedFields() {
+ return criteria.getUndefinedFields();
+ }
+
+ @Override
+ public Collection<UndefinedFieldValue> getUndefinedFieldValues() {
+ return criteria.getUndefinedFieldValues();
+ }
+
+ @Override
+ public boolean onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit) {
+ return criteria.onEditFieldValues(fieldName, valueSetEdit);
+ }
+
}
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/OrCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/OrCriteria.java
index 023d35e4bd..b25633c4c4 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/OrCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/OrCriteria.java
@@ -15,6 +15,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.search.entity.QueryBuildContext;
+import io.onedev.server.util.ValueSetEdit;
import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;
public class OrCriteria extends IssueCriteria implements ParensAware {
@@ -48,31 +49,40 @@ public class OrCriteria extends IssueCriteria implements ParensAware {
}
@Override
- public Collection<String> getUndefinedStates(Project project) {
+ public Collection<String> getUndefinedStates() {
List<String> undefinedStates = new ArrayList<>();
for (IssueCriteria criteria: criterias)
- undefinedStates.addAll(criteria.getUndefinedStates(project));
+ undefinedStates.addAll(criteria.getUndefinedStates());
return undefinedStates;
}
@Override
- public void onRenameState(String oldState, String newState) {
+ public void onRenameState(String oldName, String newName) {
for (IssueCriteria criteria: criterias)
- criteria.onRenameState(oldState, newState);
+ criteria.onRenameState(oldName, newName);
}
@Override
- public Collection<String> getUndefinedFields(Project project) {
+ public boolean onDeleteState(String stateName) {
+ for (Iterator<IssueCriteria> it = criterias.iterator(); it.hasNext();) {
+ if (it.next().onDeleteState(stateName))
+ it.remove();
+ }
+ return criterias.isEmpty();
+ }
+
+ @Override
+ public Collection<String> getUndefinedFields() {
Set<String> undefinedFields = new HashSet<>();
for (IssueCriteria criteria: criterias)
- undefinedFields.addAll(criteria.getUndefinedFields(project));
+ undefinedFields.addAll(criteria.getUndefinedFields());
return undefinedFields;
}
@Override
- public void onRenameField(String oldField, String newField) {
+ public void onRenameField(String oldName, String newName) {
for (IssueCriteria criteria: criterias)
- criteria.onRenameField(oldField, newField);
+ criteria.onRenameField(oldName, newName);
}
@Override
@@ -85,26 +95,19 @@ public class OrCriteria extends IssueCriteria implements ParensAware {
}
@Override
- public Collection<UndefinedFieldValue> getUndefinedFieldValues(Project project) {
+ public Collection<UndefinedFieldValue> getUndefinedFieldValues() {
Set<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();
for (IssueCriteria criteria: criterias)
- undefinedFieldValues.addAll(criteria.getUndefinedFieldValues(project));
+ undefinedFieldValues.addAll(criteria.getUndefinedFieldValues());
return undefinedFieldValues;
}
@Override
- public void onRenameFieldValue(String fieldName, String oldValue, String newValue) {
- for (IssueCriteria criteria: criterias)
- criteria.onRenameFieldValue(fieldName, oldValue, newValue);
- }
-
- @Override
- public boolean onDeleteFieldValue(String fieldName, String fieldValue) {
+ public boolean onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit) {
for (Iterator<IssueCriteria> it = criterias.iterator(); it.hasNext();) {
- if (it.next().onDeleteFieldValue(fieldName, fieldValue))
+ if (it.next().onEditFieldValues(fieldName, valueSetEdit))
it.remove();
}
return criterias.isEmpty();
}
-
}
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/OutstandingCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/OutstandingCriteria.java
index 24c9833df6..ffd5bd5bce 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/OutstandingCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/OutstandingCriteria.java
@@ -2,10 +2,12 @@ package io.onedev.server.search.entity.issue;
import javax.persistence.criteria.Predicate;
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.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.workflow.StateSpec;
+import io.onedev.server.model.support.issue.StateSpec;
import io.onedev.server.search.entity.QueryBuildContext;
public class OutstandingCriteria extends IssueCriteria {
@@ -13,7 +15,7 @@ public class OutstandingCriteria extends IssueCriteria {
private static final long serialVersionUID = 1L;
private IssueCriteria getCriteria(Project project) {
- return project.getIssueWorkflow().getCategoryCriteria(StateSpec.Category.OPEN);
+ return OneDev.getInstance(SettingManager.class).getIssueSetting().getCategoryCriteria(StateSpec.Category.OPEN);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java
index c334f89bd6..3c106af128 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java
@@ -8,6 +8,8 @@ import java.util.Set;
import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.SettingManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
@@ -51,17 +53,22 @@ public class StateCriteria extends IssueCriteria {
}
@Override
- public Collection<String> getUndefinedStates(Project project) {
+ public Collection<String> getUndefinedStates() {
List<String> undefinedStates = new ArrayList<>();
- if (project.getIssueWorkflow().getStateSpec(value) == null)
+ if (OneDev.getInstance(SettingManager.class).getIssueSetting().getStateSpec(value) == null)
undefinedStates.add(value);
return undefinedStates;
}
@Override
- public void onRenameState(String oldState, String newState) {
- if (value.equals(oldState))
- value = newState;
+ public void onRenameState(String oldName, String newName) {
+ if (value.equals(oldName))
+ value = newName;
+ }
+
+ @Override
+ public boolean onDeleteState(String stateName) {
+ return value.equals(stateName);
}
}
diff --git a/core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java b/core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java
index 046d031e56..d95be1838a 100644
--- a/core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java
+++ b/core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java
@@ -17,8 +17,11 @@ public class SubmittedByCriteria extends IssueCriteria {
private final User value;
- public SubmittedByCriteria(User value) {
+ private String rawValue;
+
+ public SubmittedByCriteria(User value, String rawValue) {
this.value = value;
+ this.rawValue = rawValue;
}
@Override
@@ -36,10 +39,10 @@ public class SubmittedByCriteria extends IssueCriteria {
public boolean needsLogin() {
return false;
}
-
+
@Override
public String toString() {
- return IssueQuery.getRuleName(IssueQueryLexer.SubmittedBy) + " " + IssueQuery.quote(value.getName());
+ return IssueQuery.getRuleName(IssueQueryLexer.SubmittedBy) + " " + IssueQuery.quote(rawValue);
}
}
diff --git a/core/src/main/java/io/onedev/server/util/CodeCommentConstants.java b/core/src/main/java/io/onedev/server/util/CodeCommentConstants.java
index 997ad97fde..2781d944dd 100644
--- a/core/src/main/java/io/onedev/server/util/CodeCommentConstants.java
+++ b/core/src/main/java/io/onedev/server/util/CodeCommentConstants.java
@@ -30,7 +30,7 @@ public class CodeCommentConstants {
public static final String FIELD_UPDATE_DATE = "Update Date";
- public static final String ATTR_UPDATE_DATE = "lastActivity.date";
+ public static final String ATTR_UPDATE_DATE = "updateDate";
public static final String ATTR_USER = "user";
diff --git a/core/src/main/java/io/onedev/server/util/IssueConstants.java b/core/src/main/java/io/onedev/server/util/IssueConstants.java
index 1c66872eb1..31d74ac71d 100644
--- a/core/src/main/java/io/onedev/server/util/IssueConstants.java
+++ b/core/src/main/java/io/onedev/server/util/IssueConstants.java
@@ -48,7 +48,7 @@ public class IssueConstants {
public static final String FIELD_UPDATE_DATE = "Update Date";
- public static final String ATTR_UPDATE_DATE = "lastActivity.date";
+ public static final String ATTR_UPDATE_DATE = "updateDate";
public static final String FIELD_MILESTONE = "Milestone";
@@ -61,10 +61,6 @@ public class IssueConstants {
FIELD_COMMENT, FIELD_SUBMIT_DATE, FIELD_UPDATE_DATE, FIELD_VOTE_COUNT,
FIELD_COMMENT_COUNT, FIELD_MILESTONE);
- public static final Set<String> DISPLAY_FIELDS = Sets.newHashSet(
- FIELD_NUMBER, FIELD_STATE, FIELD_TITLE, FIELD_SUBMITTER, FIELD_SUBMIT_DATE,
- FIELD_UPDATE_DATE, FIELD_VOTE_COUNT, FIELD_COMMENT_COUNT, FIELD_MILESTONE);
-
public static final List<String> QUERY_FIELDS = Lists.newArrayList(
FIELD_NUMBER, FIELD_STATE, FIELD_TITLE, FIELD_DESCRIPTION, FIELD_COMMENT,
FIELD_SUBMIT_DATE, FIELD_UPDATE_DATE, FIELD_VOTE_COUNT, FIELD_COMMENT_COUNT,
diff --git a/core/src/main/java/io/onedev/server/util/IssueField.java b/core/src/main/java/io/onedev/server/util/IssueField.java
index eba4f0708e..686009ad6d 100644
--- a/core/src/main/java/io/onedev/server/util/IssueField.java
+++ b/core/src/main/java/io/onedev/server/util/IssueField.java
@@ -12,6 +12,8 @@ import org.slf4j.LoggerFactory;
import com.thoughtworks.xstream.annotations.XStreamOmitField;
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.SettingManager;
import io.onedev.server.model.Project;
import io.onedev.server.util.inputspec.InputSpec;
@@ -73,7 +75,7 @@ public class IssueField implements Serializable {
@Nullable
public Object getValue(Project project) {
- InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(name);
+ InputSpec fieldSpec = OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldSpec(name);
if (fieldSpec != null) {
try {
if (!getValues().isEmpty())
diff --git a/core/src/main/java/io/onedev/server/util/IssueUtils.java b/core/src/main/java/io/onedev/server/util/IssueUtils.java
index d5bf5079d1..e1e7694c7b 100644
--- a/core/src/main/java/io/onedev/server/util/IssueUtils.java
+++ b/core/src/main/java/io/onedev/server/util/IssueUtils.java
@@ -15,8 +15,9 @@ import com.google.common.collect.Sets;
import io.onedev.server.OneDev;
import io.onedev.server.manager.ProjectManager;
+import io.onedev.server.manager.SettingManager;
import io.onedev.server.model.Project;
-import io.onedev.server.model.support.issue.workflow.IssueWorkflow;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.editable.BeanDescriptor;
import io.onedev.server.web.editable.PropertyDescriptor;
@@ -35,8 +36,8 @@ public class IssueUtils {
@SuppressWarnings("unchecked")
public static Class<? extends Serializable> defineBeanClass(Project project) {
String className = BEAN_PREFIX + project.getId();
- IssueWorkflow workflow = project.getIssueWorkflow();
- return (Class<? extends Serializable>) InputSpec.defineClass(className, workflow.getFieldSpecs());
+ GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();
+ return (Class<? extends Serializable>) InputSpec.defineClass(className, issueSetting.getFieldSpecs());
}
@Nullable
diff --git a/core/src/main/java/io/onedev/server/util/OneContext.java b/core/src/main/java/io/onedev/server/util/OneContext.java
index 35b5351a5e..bb2388469e 100644
--- a/core/src/main/java/io/onedev/server/util/OneContext.java
+++ b/core/src/main/java/io/onedev/server/util/OneContext.java
@@ -54,4 +54,9 @@ public abstract class OneContext {
public abstract InputContext getInputContext();
+ @Nullable
+ public OneContext getPropertyContext(String propertyName) {
+ return null;
+ }
+
}
diff --git a/core/src/main/java/io/onedev/server/util/PullRequestConstants.java b/core/src/main/java/io/onedev/server/util/PullRequestConstants.java
index c5fd31c7b3..fc6e6633d3 100644
--- a/core/src/main/java/io/onedev/server/util/PullRequestConstants.java
+++ b/core/src/main/java/io/onedev/server/util/PullRequestConstants.java
@@ -54,7 +54,7 @@ public class PullRequestConstants {
public static final String FIELD_UPDATE_DATE = "Update Date";
- public static final String ATTR_UPDATE_DATE = "lastActivity.date";
+ public static final String ATTR_UPDATE_DATE = "updateDate";
public static final String FIELD_CLOSE_DATE = "Close Date";
diff --git a/core/src/main/java/io/onedev/server/util/ValueSetEdit.java b/core/src/main/java/io/onedev/server/util/ValueSetEdit.java
new file mode 100644
index 0000000000..922527a4c6
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/util/ValueSetEdit.java
@@ -0,0 +1,28 @@
+package io.onedev.server.util;
+
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.Map;
+
+public class ValueSetEdit implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private final Map<String, String> renames;
+
+ private final Collection<String> deletions;
+
+ public ValueSetEdit(Map<String, String> renames, Collection<String> deletions) {
+ this.renames = renames;
+ this.deletions = deletions;
+ }
+
+ public Map<String, String> getRenames() {
+ return renames;
+ }
+
+ public Collection<String> getDeletions() {
+ return deletions;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java b/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java
index 5e0d7b035a..73ef99aaec 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java
@@ -17,7 +17,10 @@ import com.google.common.collect.Lists;
import io.onedev.server.util.GroovyUtils;
import io.onedev.server.util.OneContext;
+import io.onedev.server.util.ValueSetEdit;
import io.onedev.server.util.inputspec.showcondition.ShowCondition;
+import io.onedev.server.util.inputspec.showcondition.ValueIsNotAnyOf;
+import io.onedev.server.util.inputspec.showcondition.ValueIsOneOf;
import io.onedev.server.util.validation.annotation.InputName;
import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.editable.annotation.Editable;
@@ -178,6 +181,25 @@ public abstract class InputSpec implements Serializable {
if (getNameOfEmptyValue() != null)
buffer.append(" @NameOfEmptyValue(\"" + escape(getNameOfEmptyValue()) + "\")");
}
+
+ private void wrapWithPropertyContext(StringBuffer buffer, int index, String statement) {
+ buffer.append(" OneContext context = OneContext.get();\n");
+ buffer.append(" if (context != null) {\n");
+ buffer.append(" OneContext propertyContext = context.getPropertyContext(\"input" + index + "\");\n");
+ buffer.append(" if (propertyContext != null) {\n");
+ buffer.append(" OneContext.push(propertyContext);\n");
+ buffer.append(" try {\n");
+ buffer.append(" " + statement + "\n");
+ buffer.append(" } finally {\n");
+ buffer.append(" OneContext.pop();\n");
+ buffer.append(" }\n");
+ buffer.append(" } else {\n");
+ buffer.append(" " + statement + "\n");
+ buffer.append(" }\n");
+ buffer.append(" } else {\n");
+ buffer.append(" " + statement + "\n");
+ buffer.append(" }\n");
+ }
protected void appendMethods(StringBuffer buffer, int index, String type,
@Nullable Serializable choiceProvider, @Nullable Serializable defaultValueProvider) {
@@ -186,10 +208,11 @@ public abstract class InputSpec implements Serializable {
buffer.append(" if (input" + index + "!=null) {\n");
buffer.append(" return input" + index + ".orNull();\n");
buffer.append(" } else {\n");
- if (defaultValueProvider != null)
- buffer.append(" return SerializationUtils.deserialize(" + literalBytes + ").getDefaultValue();\n");
- else
+ if (defaultValueProvider != null) {
+ wrapWithPropertyContext(buffer, index, "return SerializationUtils.deserialize(" + literalBytes + ").getDefaultValue();");
+ } else {
buffer.append(" return null;\n");
+ }
buffer.append(" }\n");
buffer.append(" }\n");
buffer.append("\n");
@@ -206,7 +229,7 @@ public abstract class InputSpec implements Serializable {
buffer.append(" }\n");
buffer.append("\n");
}
-
+
if (choiceProvider != null) {
buffer.append(" private static List getInput" + index + "Choices() {\n");
literalBytes = getLiteral(SerializationUtils.serialize(choiceProvider));
@@ -300,5 +323,32 @@ public abstract class InputSpec implements Serializable {
public String getType() {
return EditableUtils.getDisplayName(getClass());
}
+
+ public boolean onEditInputValues(String fieldName, ValueSetEdit valueSetEdit) {
+ if (showCondition != null && showCondition.getInputName().equals(fieldName)) {
+ if (showCondition.getValueMatcher() instanceof ValueIsOneOf) {
+ ValueIsOneOf valueIsOneOf = (ValueIsOneOf) showCondition.getValueMatcher();
+ valueIsOneOf.getValues().removeAll(valueSetEdit.getDeletions());
+ for (int i=0; i<valueIsOneOf.getValues().size(); i++) {
+ String newValue = valueSetEdit.getRenames().get(valueIsOneOf.getValues().get(i));
+ if (newValue != null)
+ valueIsOneOf.getValues().set(i, newValue);
+ }
+ if (valueIsOneOf.getValues().isEmpty())
+ showCondition = null;
+ } else if (showCondition.getValueMatcher() instanceof ValueIsNotAnyOf) {
+ ValueIsNotAnyOf valueIsNotAnyOf = (ValueIsNotAnyOf) showCondition.getValueMatcher();
+ valueIsNotAnyOf.getValues().removeAll(valueSetEdit.getDeletions());
+ for (int i=0; i<valueIsNotAnyOf.getValues().size(); i++) {
+ String newValue = valueSetEdit.getRenames().get(valueIsNotAnyOf.getValues().get(i));
+ if (newValue != null)
+ valueIsNotAnyOf.getValues().set(i, newValue);
+ }
+ if (valueIsNotAnyOf.getValues().isEmpty())
+ showCondition = null;
+ }
+ }
+ return false;
+ }
}
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/Choice.java b/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/Choice.java
index e9c09f7504..f0323edfba 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/Choice.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/Choice.java
@@ -1,6 +1,7 @@
package io.onedev.server.util.inputspec.choiceinput.choiceprovider;
import java.io.Serializable;
+import java.util.UUID;
import org.hibernate.validator.constraints.NotEmpty;
@@ -13,10 +14,21 @@ public class Choice implements Serializable {
private static final long serialVersionUID = 1L;
+ private String uuid = UUID.randomUUID().toString();
+
private String value;
private String color;
+ @Editable
+ public String getUuid() {
+ return uuid;
+ }
+
+ public void setUuid(String uuid) {
+ this.uuid = uuid;
+ }
+
@Editable(order=100)
@NotEmpty
public String getValue() {
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java b/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java
index 6e745816e4..da5eb31fe4 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java
@@ -4,9 +4,13 @@ import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
+import javax.annotation.Nullable;
import javax.validation.constraints.Size;
+import io.onedev.server.util.inputspec.InputSpec;
+import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.OmitName;
@@ -35,4 +39,19 @@ public class SpecifiedChoices extends ChoiceProvider {
choices.put(choice.getValue(), choice.getColor());
return choices;
}
+
+ public List<String> getChoiceValues() {
+ return choices.stream().map(it->it.getValue()).collect(Collectors.toList());
+ }
+
+ @Nullable
+ public static SpecifiedChoices of(@Nullable InputSpec inputSpec) {
+ if (inputSpec instanceof ChoiceInput) {
+ ChoiceInput choiceInput = (ChoiceInput) inputSpec;
+ if (choiceInput.getChoiceProvider() instanceof SpecifiedChoices)
+ return (SpecifiedChoices) choiceInput.getChoiceProvider();
+ }
+ return null;
+ }
+
}
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/CodeReaders.java b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/CodeReaders.java
index e8bf5458be..f3dfe31315 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/CodeReaders.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/CodeReaders.java
@@ -18,7 +18,10 @@ public class CodeReaders implements ChoiceProvider {
@Override
public List<UserFacade> getChoices(boolean allPossible) {
Project project = OneContext.get().getProject();
- return new ArrayList<>(SecurityUtils.getAuthorizedUsers(project.getFacade(), ProjectPrivilege.CODE_READ));
+ if (project != null)
+ return new ArrayList<>(SecurityUtils.getAuthorizedUsers(project.getFacade(), ProjectPrivilege.CODE_READ));
+ else
+ return new ArrayList<>();
}
}
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/CodeWriters.java b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/CodeWriters.java
index c662805103..04a9b35af0 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/CodeWriters.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/CodeWriters.java
@@ -18,7 +18,10 @@ public class CodeWriters implements ChoiceProvider {
@Override
public List<UserFacade> getChoices(boolean allPossible) {
Project project = OneContext.get().getProject();
- return new ArrayList<>(SecurityUtils.getAuthorizedUsers(project.getFacade(), ProjectPrivilege.CODE_WRITE));
+ if (project != null)
+ return new ArrayList<>(SecurityUtils.getAuthorizedUsers(project.getFacade(), ProjectPrivilege.CODE_WRITE));
+ else
+ return new ArrayList<>();
}
}
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/IssueReaders.java b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/IssueReaders.java
index b12cfb88dd..c51c954b1a 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/IssueReaders.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/IssueReaders.java
@@ -18,7 +18,10 @@ public class IssueReaders implements ChoiceProvider {
@Override
public List<UserFacade> getChoices(boolean allPossible) {
Project project = OneContext.get().getProject();
- return new ArrayList<>(SecurityUtils.getAuthorizedUsers(project.getFacade(), ProjectPrivilege.ISSUE_READ));
+ if (project != null)
+ return new ArrayList<>(SecurityUtils.getAuthorizedUsers(project.getFacade(), ProjectPrivilege.ISSUE_READ));
+ else
+ return new ArrayList<>();
}
}
diff --git a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ProjectAdministrators.java b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ProjectAdministrators.java
index c9a6a2a354..0059c60419 100644
--- a/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ProjectAdministrators.java
+++ b/core/src/main/java/io/onedev/server/util/inputspec/userchoiceinput/choiceprovider/ProjectAdministrators.java
@@ -18,7 +18,10 @@ public class ProjectAdministrators implements ChoiceProvider {
@Override
public List<UserFacade> getChoices(boolean allPossible) {
Project project = OneContext.get().getProject();
- return new ArrayList<>(SecurityUtils.getAuthorizedUsers(project.getFacade(), ProjectPrivilege.ADMINISTRATION));
+ if (project != null)
+ return new ArrayList<>(SecurityUtils.getAuthorizedUsers(project.getFacade(), ProjectPrivilege.ADMINISTRATION));
+ else
+ return new ArrayList<>();
}
}
diff --git a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
index 3e8334aa80..9852cea0c3 100644
--- a/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
+++ b/core/src/main/java/io/onedev/server/web/OneUrlMapper.java
@@ -16,6 +16,11 @@ import io.onedev.server.web.page.admin.group.GroupListPage;
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.DefaultQueryListPage;
+import io.onedev.server.web.page.admin.issuesetting.DefaultBoardListPage;
+import io.onedev.server.web.page.admin.issuesetting.IssueFieldListPage;
+import io.onedev.server.web.page.admin.issuesetting.IssueStateListPage;
+import io.onedev.server.web.page.admin.issuesetting.DefaultStateTransitionsPage;
import io.onedev.server.web.page.admin.licensemanagement.LicenseManagementPage;
import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;
import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage;
@@ -66,9 +71,8 @@ import io.onedev.server.web.page.project.setting.configuration.ConfigurationEdit
import io.onedev.server.web.page.project.setting.configuration.ConfigurationListPage;
import io.onedev.server.web.page.project.setting.configuration.NewConfigurationPage;
import io.onedev.server.web.page.project.setting.general.GeneralSettingPage;
-import io.onedev.server.web.page.project.setting.issueworkflow.fields.IssueFieldsPage;
-import io.onedev.server.web.page.project.setting.issueworkflow.states.IssueStatesPage;
-import io.onedev.server.web.page.project.setting.issueworkflow.statetransitions.StateTransitionsPage;
+import io.onedev.server.web.page.project.setting.issue.PromptFieldsUponIssueOpenSettingPage;
+import io.onedev.server.web.page.project.setting.issue.StateTransitionsPage;
import io.onedev.server.web.page.project.setting.tagprotection.TagProtectionPage;
import io.onedev.server.web.page.project.stats.ProjectContribsPage;
import io.onedev.server.web.page.project.stats.SourceLinesPage;
@@ -142,6 +146,13 @@ public class OneUrlMapper extends CompoundRequestMapper {
add(new OnePageMapper("administration/settings/backup", DatabaseBackupPage.class));
add(new OnePageMapper("administration/settings/security", SecuritySettingPage.class));
add(new OnePageMapper("administration/settings/authenticator", AuthenticatorPage.class));
+
+ add(new OnePageMapper("administration/settings/issue-fields", IssueFieldListPage.class));
+ 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));
add(new OnePageMapper("administration/license-management", LicenseManagementPage.class));
@@ -222,10 +233,10 @@ public class OneUrlMapper extends CompoundRequestMapper {
add(new OnePageMapper("projects/${project}/settings/authorizations", ProjectAuthorizationsPage.class));
add(new OnePageMapper("projects/${project}/settings/branch-protection", BranchProtectionPage.class));
add(new OnePageMapper("projects/${project}/settings/tag-protection", TagProtectionPage.class));
+ add(new OnePageMapper("projects/${project}/settings/issue/state-transitions", StateTransitionsPage.class));
+ add(new OnePageMapper("projects/${project}/settings/issue/prompt-fields-upon-issue-open",
+ PromptFieldsUponIssueOpenSettingPage.class));
add(new OnePageMapper("projects/${project}/settings/commit-message-transform", CommitMessageTransformPage.class));
- add(new OnePageMapper("projects/${project}/settings/issue-fields", IssueFieldsPage.class));
- add(new OnePageMapper("projects/${project}/settings/issue-states", IssueStatesPage.class));
- add(new OnePageMapper("projects/${project}/settings/issue-state-transitions", StateTransitionsPage.class));
add(new OnePageMapper("projects/${project}/settings/configurations", ConfigurationListPage.class));
add(new OnePageMapper("projects/${project}/settings/configurations/new", NewConfigurationPage.class));
add(new OnePageMapper("projects/${project}/settings/configurations/${configuration}", ConfigurationEditPage.class));
diff --git a/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
index bc8c37cf0f..c4393e0da5 100644
--- a/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
+++ b/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
@@ -33,13 +33,15 @@ import io.onedev.codeassist.parser.TerminalExpect;
import io.onedev.server.OneDev;
import io.onedev.server.exception.OneException;
import io.onedev.server.manager.BuildManager;
+import io.onedev.server.manager.GroupManager;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.manager.PullRequestManager;
-import io.onedev.server.manager.GroupManager;
+import io.onedev.server.manager.SettingManager;
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.setting.GlobalIssueSetting;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.search.entity.issue.IssueQueryLexer;
import io.onedev.server.search.entity.issue.IssueQueryParser;
@@ -94,6 +96,8 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
@Override
protected List<InputSuggestion> suggest(TerminalExpect terminalExpect) {
+ GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();
+
if (terminalExpect.getElementSpec() instanceof LexerRuleRefElementSpec) {
LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) terminalExpect.getElementSpec();
if (spec.getRuleName().equals("Quoted")) {
@@ -107,12 +111,12 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
if ("criteriaField".equals(spec.getLabel())) {
List<String> candidates = new ArrayList<>(IssueConstants.QUERY_FIELDS);
- for (InputSpec field: project.getIssueWorkflow().getFieldSpecs())
+ for (InputSpec field: issueSetting.getFieldSpecs())
candidates.add(field.getName());
suggestions.addAll(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
} else if ("orderField".equals(spec.getLabel())) {
List<String> candidates = new ArrayList<>(IssueConstants.ORDER_FIELDS.keySet());
- for (InputSpec field: project.getIssueWorkflow().getFieldSpecs()) {
+ for (InputSpec field: issueSetting.getFieldSpecs()) {
if (field instanceof NumberInput || field instanceof ChoiceInput || field instanceof DateInput)
candidates.add(field.getName());
}
@@ -122,13 +126,16 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
.findMatchedElementsByLabel("revisionType", true).iterator().next().getMatchedText();
switch (revisionType) {
case "branch":
- suggestions.addAll(SuggestionUtils.suggestBranch(project, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
+ if (getProject() != null)
+ suggestions.addAll(SuggestionUtils.suggestBranch(project, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
break;
case "tag":
- suggestions.addAll(SuggestionUtils.suggestTag(project, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
+ if (getProject() != null)
+ suggestions.addAll(SuggestionUtils.suggestTag(project, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
break;
case "build":
- suggestions.addAll(SuggestionUtils.suggestBuild(project, unfencedLowerCaseMatchWith, true, ESCAPE_CHARS));
+ if (getProject() != null)
+ suggestions.addAll(SuggestionUtils.suggestBuild(project, unfencedLowerCaseMatchWith, true, ESCAPE_CHARS));
break;
}
} else if ("criteriaValue".equals(spec.getLabel())) {
@@ -146,8 +153,8 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
String fieldName = IssueQuery.getValue(fieldElements.get(0).getMatchedText());
try {
- IssueQuery.checkField(project, fieldName, operator);
- InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(fieldName);
+ IssueQuery.checkField(fieldName, operator);
+ InputSpec fieldSpec = issueSetting.getFieldSpec(fieldName);
if (fieldSpec instanceof DateInput || fieldName.equals(FIELD_SUBMIT_DATE)
|| fieldName.equals(FIELD_UPDATE_DATE)) {
suggestions.addAll(SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, unfencedLowerCaseMatchWith, null));
@@ -178,7 +185,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
List<String> candidates = OneDev.getInstance(GroupManager.class).query().stream().map(it->it.getName()).collect(Collectors.toList());
suggestions.addAll(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
} else if (fieldName.equals(FIELD_STATE)) {
- List<String> candidates = project.getIssueWorkflow().getStateSpecs().stream().map(it->it.getName()).collect(Collectors.toList());
+ List<String> candidates = issueSetting.getStateSpecs().stream().map(it->it.getName()).collect(Collectors.toList());
suggestions.addAll(SuggestionUtils.suggest(candidates, unfencedLowerCaseMatchWith, ESCAPE_CHARS));
} else if (fieldSpec instanceof ChoiceInput) {
OneContext.push(newOneContext());
@@ -266,7 +273,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
if (!fieldElements.isEmpty()) {
String fieldName = IssueQuery.getValue(fieldElements.iterator().next().getMatchedText());
try {
- IssueQuery.checkField(getProject(), fieldName, IssueQuery.getOperator(suggestedLiteral));
+ IssueQuery.checkField(fieldName, IssueQuery.getOperator(suggestedLiteral));
} catch (OneException e) {
return null;
}
diff --git a/core/src/main/java/io/onedev/server/web/component/branch/choice/BranchChoiceProvider.java b/core/src/main/java/io/onedev/server/web/component/branch/choice/BranchChoiceProvider.java
index 9d5281a140..2047d65430 100644
--- a/core/src/main/java/io/onedev/server/web/component/branch/choice/BranchChoiceProvider.java
+++ b/core/src/main/java/io/onedev/server/web/component/branch/choice/BranchChoiceProvider.java
@@ -31,10 +31,12 @@ public class BranchChoiceProvider extends ChoiceProvider<String> {
term = term.toLowerCase();
List<String> branches = new ArrayList<>();
Project project = projectModel.getObject();
- for (RefInfo ref: project.getBranches()) {
- String branch = GitUtils.ref2branch(ref.getRef().getName());
- if (branch.toLowerCase().startsWith(term))
- branches.add(branch);
+ if (project != null) {
+ for (RefInfo ref: project.getBranches()) {
+ String branch = GitUtils.ref2branch(ref.getRef().getName());
+ if (branch.toLowerCase().startsWith(term))
+ branches.add(branch);
+ }
}
Collections.sort(branches);
diff --git a/core/src/main/java/io/onedev/server/web/component/configuration/ConfigurationSingleChoice.java b/core/src/main/java/io/onedev/server/web/component/configuration/ConfigurationSingleChoice.java
index 1a8527bae4..3c372e1300 100644
--- a/core/src/main/java/io/onedev/server/web/component/configuration/ConfigurationSingleChoice.java
+++ b/core/src/main/java/io/onedev/server/web/component/configuration/ConfigurationSingleChoice.java
@@ -1,5 +1,6 @@
package io.onedev.server.web.component.configuration;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
@@ -22,11 +23,15 @@ public class ConfigurationSingleChoice extends Select2Choice<String> {
}
private static List<String> getConfigurationNames() {
- ProjectPage projectPage = (ProjectPage) WicketUtils.getPage();
- List<String> configurationNames = projectPage.getProject().getConfigurations()
- .stream().map(it->it.getName()).collect(Collectors.toList());
- Collections.sort(configurationNames);
- return configurationNames;
+ if (WicketUtils.getPage() instanceof ProjectPage) {
+ ProjectPage projectPage = (ProjectPage) WicketUtils.getPage();
+ List<String> configurationNames = projectPage.getProject().getConfigurations()
+ .stream().map(it->it.getName()).collect(Collectors.toList());
+ Collections.sort(configurationNames);
+ return configurationNames;
+ } else {
+ return new ArrayList<>();
+ }
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionModal.java b/core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionModal.java
new file mode 100644
index 0000000000..0d6811cfeb
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionModal.java
@@ -0,0 +1,55 @@
+package io.onedev.server.web.component.confirmaction;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+
+import io.onedev.server.web.component.modal.ModalPanel;
+
+@SuppressWarnings("serial")
+public abstract class ConfirmActionModal extends ModalPanel {
+
+ public ConfirmActionModal(AjaxRequestTarget target) {
+ super(target);
+ }
+
+ @Override
+ protected Component newContent(String id) {
+ return new ConfirmActionPanel(id) {
+
+ @Override
+ protected void onConfirm(AjaxRequestTarget target) {
+ close();
+ ConfirmActionModal.this.onConfirm(target);
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ close();
+ ConfirmActionModal.this.onCancel(target);
+ }
+
+ @Override
+ protected String getConfirmMessage() {
+ return ConfirmActionModal.this.getConfirmMessage();
+ }
+
+ @Override
+ protected String getConfirmInput() {
+ return ConfirmActionModal.this.getConfirmInput();
+ }
+
+ };
+ }
+
+ protected abstract void onConfirm(AjaxRequestTarget target);
+
+ protected abstract void onCancel(AjaxRequestTarget target);
+
+ @Nullable
+ protected abstract String getConfirmInput();
+
+ protected abstract String getConfirmMessage();
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/component/confirmdelete/ConfirmDeletePanel.html b/core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionPanel.html
similarity index 60%
rename from core/src/main/java/io/onedev/server/web/component/confirmdelete/ConfirmDeletePanel.html
rename to core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionPanel.html
index 21065c427d..e56acce854 100644
--- a/core/src/main/java/io/onedev/server/web/component/confirmdelete/ConfirmDeletePanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionPanel.html
@@ -1,19 +1,17 @@
<wicket:panel>
- <div class="confirm-delete">
+ <div class="confirm-action">
<!-- Add form tag so that the default delete button can be triggered when user hits return -->
<form>
<div class="modal-header">
<button wicket:id="close" type="button" class="close">&times;</button>
- <h4 id="modal-title" class="modal-title">
- Do you really want to delete?
- </h4>
+ <h4 id="modal-title" class="modal-title">Please Confirm</h4>
</div>
<div class="modal-body">
<div wicket:id="message" class="message"></div>
- <input class="form-control confirm"></input>
+ <input wicket:id="input" class="form-control confirm">
</div>
<div class="modal-footer">
- <input wicket:id="delete" type="submit" class="btn btn-danger" disabled="disabled" value="Delete"></input>
+ <input wicket:id="ok" type="submit" class="btn btn-primary" value="Ok">
<a wicket:id="cancel" class="btn btn-default">Cancel</a>
</div>
</form>
diff --git a/core/src/main/java/io/onedev/server/web/component/confirmdelete/ConfirmDeletePanel.java b/core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionPanel.java
similarity index 61%
rename from core/src/main/java/io/onedev/server/web/component/confirmdelete/ConfirmDeletePanel.java
rename to core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionPanel.java
index 9f53098d60..72564ddf5a 100644
--- a/core/src/main/java/io/onedev/server/web/component/confirmdelete/ConfirmDeletePanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionPanel.java
@@ -1,20 +1,24 @@
-package io.onedev.server.web.component.confirmdelete;
+package io.onedev.server.web.component.confirmaction;
+
+import javax.annotation.Nullable;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.unbescape.javascript.JavaScriptEscape;
import io.onedev.server.web.component.link.PreventDefaultAjaxLink;
@SuppressWarnings("serial")
-abstract class ConfirmDeletePanel extends Panel {
+abstract class ConfirmActionPanel extends Panel {
- public ConfirmDeletePanel(String id) {
+ public ConfirmActionPanel(String id) {
super(id);
}
@@ -34,19 +38,21 @@ abstract class ConfirmDeletePanel extends Panel {
@Override
public String getObject() {
- return getWarningMessage();
+ return getConfirmMessage();
}
}));
+ add(new WebMarkupContainer("input").setVisible(getConfirmInput() != null));
- add(new PreventDefaultAjaxLink<Void>("delete") {
+ add(new PreventDefaultAjaxLink<Void>("ok") {
@Override
public void onClick(AjaxRequestTarget target) {
- onDelete(target);
+ onConfirm(target);
}
});
+
add(new AjaxLink<Void>("cancel") {
@Override
@@ -62,17 +68,20 @@ abstract class ConfirmDeletePanel extends Panel {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(JavaScriptHeaderItem.forReference(new ConfirmDeleteResourceReference()));
+ response.render(JavaScriptHeaderItem.forReference(new ConfirmActionResourceReference()));
- String script = String.format("onedev.server.confirmDelete('%s', '%s');", getMarkupId(), getConfirmInput());
+ String script = String.format("onedev.server.confirmAction('%s', %s);",
+ getMarkupId(), getConfirmInput()!=null?"'" + JavaScriptEscape.escapeJavaScript(getConfirmInput()) + "'": "undefined");
response.render(OnDomReadyHeaderItem.forScript(script));
}
- protected abstract String getWarningMessage();
-
+ protected abstract String getConfirmMessage();
+
+ @Nullable
protected abstract String getConfirmInput();
- protected abstract void onDelete(AjaxRequestTarget target);
+ protected abstract void onConfirm(AjaxRequestTarget target);
protected abstract void onCancel(AjaxRequestTarget target);
+
}
diff --git a/core/src/main/java/io/onedev/server/web/component/confirmdelete/ConfirmDeleteResourceReference.java b/core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionResourceReference.java
similarity index 65%
rename from core/src/main/java/io/onedev/server/web/component/confirmdelete/ConfirmDeleteResourceReference.java
rename to core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionResourceReference.java
index 725b9c2acf..26bbc9d6b1 100644
--- a/core/src/main/java/io/onedev/server/web/component/confirmdelete/ConfirmDeleteResourceReference.java
+++ b/core/src/main/java/io/onedev/server/web/component/confirmaction/ConfirmActionResourceReference.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.component.confirmdelete;
+package io.onedev.server.web.component.confirmaction;
import java.util.List;
@@ -8,18 +8,18 @@ import org.apache.wicket.request.resource.CssResourceReference;
import io.onedev.server.web.page.base.BaseDependentResourceReference;
-public class ConfirmDeleteResourceReference extends BaseDependentResourceReference {
+public class ConfirmActionResourceReference extends BaseDependentResourceReference {
private static final long serialVersionUID = 1L;
- public ConfirmDeleteResourceReference() {
- super(ConfirmDeleteResourceReference.class, "confirm-delete.js");
+ public ConfirmActionResourceReference() {
+ super(ConfirmActionResourceReference.class, "confirm-action.js");
}
@Override
public List<HeaderItem> getDependencies() {
List<HeaderItem> dependencies = super.getDependencies();
- dependencies.add(CssHeaderItem.forReference(new CssResourceReference(ConfirmDeleteResourceReference.class, "confirm-delete.css")));
+ dependencies.add(CssHeaderItem.forReference(new CssResourceReference(ConfirmActionResourceReference.class, "confirm-action.css")));
return dependencies;
}
diff --git a/core/src/main/java/io/onedev/server/web/component/confirmaction/confirm-action.css b/core/src/main/java/io/onedev/server/web/component/confirmaction/confirm-action.css
new file mode 100644
index 0000000000..7a9503ed49
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/confirmaction/confirm-action.css
@@ -0,0 +1,6 @@
+.confirm-action .message {
+ font-size: 13px;
+}
+.confirm-action input.confirm {
+ margin-top: 20px;
+}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/confirmaction/confirm-action.js b/core/src/main/java/io/onedev/server/web/component/confirmaction/confirm-action.js
new file mode 100644
index 0000000000..e8f75f9c66
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/confirmaction/confirm-action.js
@@ -0,0 +1,13 @@
+onedev.server.confirmAction = function(containerId, confirmInput) {
+ var $container = $("#" + containerId);
+ var $confirmBtn = $container.find(".btn-danger, .btn-primary");
+ if (confirmInput) {
+ $confirmBtn.attr("disabled", "disabled");
+ $container.find("input.confirm").on("input", function() {
+ if ($(this).val() === confirmInput)
+ $confirmBtn.removeAttr("disabled");
+ else
+ $confirmBtn.attr("disabled", "disabled");
+ });
+ }
+};
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/confirmdelete/ConfirmDeleteModal.java b/core/src/main/java/io/onedev/server/web/component/confirmdelete/ConfirmDeleteModal.java
deleted file mode 100644
index 00a1d3416b..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/confirmdelete/ConfirmDeleteModal.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package io.onedev.server.web.component.confirmdelete;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-
-import io.onedev.server.web.component.modal.ModalPanel;
-
-@SuppressWarnings("serial")
-public abstract class ConfirmDeleteModal extends ModalPanel {
-
- public ConfirmDeleteModal(AjaxRequestTarget target) {
- super(target);
- }
-
- @Override
- protected Component newContent(String id) {
- return new ConfirmDeletePanel(id) {
-
- @Override
- protected void onDelete(AjaxRequestTarget target) {
- close();
- doDelete(target);
- }
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- close();
- }
-
- @Override
- protected String getWarningMessage() {
- return ConfirmDeleteModal.this.getWarningMessage();
- }
-
- @Override
- protected String getConfirmInput() {
- return ConfirmDeleteModal.this.getConfirmInput();
- }
-
- };
- }
-
- protected abstract void doDelete(AjaxRequestTarget target);
-
- protected abstract String getConfirmInput();
-
- protected abstract String getWarningMessage();
-}
diff --git a/core/src/main/java/io/onedev/server/web/component/confirmdelete/confirm-delete.css b/core/src/main/java/io/onedev/server/web/component/confirmdelete/confirm-delete.css
deleted file mode 100644
index 7aca07a146..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/confirmdelete/confirm-delete.css
+++ /dev/null
@@ -1,4 +0,0 @@
-.confirm-delete .message {
- margin-bottom: 20px;
- font-size: 13px;
-}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/confirmdelete/confirm-delete.js b/core/src/main/java/io/onedev/server/web/component/confirmdelete/confirm-delete.js
deleted file mode 100644
index aee0763704..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/confirmdelete/confirm-delete.js
+++ /dev/null
@@ -1,11 +0,0 @@
-onedev.server.confirmDelete = function(containerId, confirmText) {
- var $container = $("#" + containerId);
-
- $container.find("input.confirm").on("input", function() {
- var $deleteBtn = $container.find(".btn-danger");
- if ($(this).val() === confirmText)
- $deleteBtn.removeAttr("disabled");
- else
- $deleteBtn.attr("disabled", "disabled");
- });
-};
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/IssueStateLabel.java b/core/src/main/java/io/onedev/server/web/component/issue/IssueStateLabel.java
index 0e23105b1a..6156ca74e1 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/IssueStateLabel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/IssueStateLabel.java
@@ -4,8 +4,10 @@ import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.SettingManager;
import io.onedev.server.model.Issue;
-import io.onedev.server.model.support.issue.workflow.StateSpec;
+import io.onedev.server.model.support.issue.StateSpec;
import io.onedev.utils.ColorUtils;
@SuppressWarnings("serial")
@@ -29,7 +31,7 @@ public class IssueStateLabel extends Label {
super.onInitialize();
Issue issue = issueModel.getObject();
- StateSpec stateSpec = issue.getProject().getIssueWorkflow().getStateSpec(issue.getState());
+ StateSpec stateSpec = OneDev.getInstance(SettingManager.class).getIssueSetting().getStateSpec(issue.getState());
if (stateSpec != null) {
String fontColor = ColorUtils.isLight(stateSpec.getColor())?"black":"white";
String style = String.format("background-color: %s; color: %s;", stateSpec.getColor(), fontColor);
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardEditPanel.html b/core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.html
similarity index 81%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardEditPanel.html
rename to core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.html
index 5b5bbe9234..0cdca3a99b 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardEditPanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.html
@@ -1,5 +1,5 @@
<wicket:panel>
- <form wicket:id="form" class="leave-confirm board-edit">
+ <form wicket:id="form" class="leave-confirm board-spec-edit">
<div class="modal-header">
<button wicket:id="close" type="button" class="close">&times;</button>
<h4 id="modal-title" class="modal-title">Edit Board</h4>
@@ -9,7 +9,7 @@
</div>
<div class="modal-footer">
<div class="form-group">
- <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save"></input>
+ <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save">
<a wicket:id="cancel" class="btn btn-default">Cancel</a>
</div>
</div>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardEditPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java
similarity index 63%
rename from core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardEditPanel.java
rename to core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java
index 7e0b57e5b7..6c81df85ad 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java
@@ -1,9 +1,10 @@
-package io.onedev.server.web.page.project.issues.boards;
+package io.onedev.server.web.component.issue.board;
-import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Nullable;
import org.apache.commons.lang3.SerializationUtils;
-import org.apache.wicket.Session;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -11,34 +12,45 @@ import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.panel.Panel;
-import io.onedev.server.OneDev;
-import io.onedev.server.manager.ProjectManager;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.support.issue.IssueBoard;
+import io.onedev.server.model.support.issue.BoardSpec;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.editable.PathSegment;
import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;
@SuppressWarnings("serial")
-abstract class BoardEditPanel extends Panel {
+public abstract class BoardEditPanel extends Panel {
- private final ArrayList<IssueBoard> boards;
+ private final List<BoardSpec> boards;
private final int boardIndex;
- public BoardEditPanel(String id, ArrayList<IssueBoard> boards, int boardIndex) {
+ public BoardEditPanel(String id, List<BoardSpec> boards, int boardIndex) {
super(id);
this.boards = boards;
this.boardIndex = boardIndex;
}
+ @Nullable
+ private BoardSpec getBoard(String boardName) {
+ for (BoardSpec board: boards) {
+ if (board.getName().equals(boardName))
+ return board;
+ }
+ return null;
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
- IssueBoard board = SerializationUtils.clone(boards.get(boardIndex));
+ BoardSpec board;
+ if (boardIndex != -1)
+ board = SerializationUtils.clone(boards.get(boardIndex));
+ else
+ board = new BoardSpec();
+
BeanEditor editor = BeanContext.editBean("editor", board);
Form<?> form = new Form<Void>("form");
@@ -49,19 +61,25 @@ abstract class BoardEditPanel extends Panel {
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
super.onSubmit(target, form);
- int indexWithSameName = IssueBoard.getBoardIndex(boards, board.getName());
- if (indexWithSameName != -1 && indexWithSameName != boardIndex) {
+ if (boardIndex != -1) {
+ BoardSpec oldBoard = boards.get(boardIndex);
+ if (!board.getName().equals(oldBoard.getName()) && getBoard(board.getName()) != null) {
+ editor.getErrorContext(new PathSegment.Property("name"))
+ .addError("This name has already been used by another board");
+ }
+ } else if (getBoard(board.getName()) != null) {
editor.getErrorContext(new PathSegment.Property("name"))
- .addError("This name has already been used by another issue board in the project");
- }
- if (!editor.hasErrors(true)){
- boards.set(boardIndex, board);
- getProject().setIssueBoards(boards);
- OneDev.getInstance(ProjectManager.class).save(getProject());
- Session.get().success("Issue board saved");
+ .addError("This name has already been used by another board");
+ }
+ if (!editor.hasErrors(true)) {
+ if (boardIndex != -1) {
+ boards.set(boardIndex, board);
+ } else {
+ boards.add(board);
+ }
onBoardSaved(target, board);
} else {
- target.add(BoardEditPanel.this);
+ target.add(form);
}
}
@@ -106,9 +124,7 @@ abstract class BoardEditPanel extends Panel {
setOutputMarkupId(true);
}
- protected abstract Project getProject();
-
- protected abstract void onBoardSaved(AjaxRequestTarget target, IssueBoard board);
+ protected abstract void onBoardSaved(AjaxRequestTarget target, BoardSpec board);
protected abstract void onCancel(AjaxRequestTarget target);
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
index 882d9111a7..567afa2785 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java
@@ -18,8 +18,11 @@ import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.ConversionException;
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.SettingManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.search.entity.issue.IssueCriteria;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.IssueUtils;
@@ -98,7 +101,7 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implement
add(milestoneChoice);
Collection<String> properties = IssueUtils.getPropertyNames(fieldBeanClass,
- getProject().getIssueWorkflow().getPromptFieldsUponIssueOpen());
+ getProject().getIssueSetting().getPromptFieldsUponIssueOpen(true));
add(fieldEditor = new BeanContext(fieldBean.getClass(), properties, false).renderForEdit("fields", Model.of(fieldBean)));
}
@@ -120,9 +123,13 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implement
throw new UnsupportedOperationException();
}
+ private GlobalIssueSetting getIssueSetting() {
+ return OneDev.getInstance(SettingManager.class).getIssueSetting();
+ }
+
@Override
public InputSpec getInputSpec(String inputName) {
- return getProject().getIssueWorkflow().getFieldSpec(inputName);
+ return getIssueSetting().getFieldSpec(inputName);
}
@Override
@@ -134,7 +141,7 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implement
Issue issue = new Issue();
issue.setProject(getProject());
issue.setSubmitDate(new Date());
- issue.setState(getProject().getIssueWorkflow().getInitialStateSpec().getName());
+ issue.setState(getIssueSetting().getInitialStateSpec().getName());
issue.setSubmitter(SecurityUtils.getUser());
if (getTemplate() != null)
getTemplate().fill(issue);
@@ -149,7 +156,7 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implement
issue.setDescription(descriptionInput.getConvertedInput());
issue.setMilestone(getProject().getMilestone(milestoneChoice.getConvertedInput()));
- Collection<String> fieldNames = getProject().getIssueWorkflow().getPromptFieldsUponIssueOpen();
+ Collection<String> fieldNames = getProject().getIssueSetting().getPromptFieldsUponIssueOpen(true);
issue.setFieldValues(IssueUtils.getFieldValues(fieldEditor.getConvertedInput(), fieldNames));
setConvertedInput(issue);
} catch (ConversionException e) {
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
index aa8b278dfb..5454f69282 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java
@@ -20,11 +20,13 @@ import io.onedev.server.OneDev;
import io.onedev.server.manager.BuildManager;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.manager.PullRequestManager;
+import io.onedev.server.manager.SettingManager;
import io.onedev.server.manager.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.setting.GlobalIssueSetting;
import io.onedev.server.util.EditContext;
import io.onedev.server.util.IssueField;
import io.onedev.server.util.OneContext;
@@ -51,6 +53,10 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {
super(id);
}
+ private GlobalIssueSetting getIssueSetting() {
+ return OneDev.getInstance(SettingManager.class).getIssueSetting();
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -102,7 +108,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {
}
} else {
Label label = new Label("value", value);
- InputSpec fieldSpec = getIssue().getProject().getIssueWorkflow().getFieldSpec(getField().getName());
+ InputSpec fieldSpec = getIssueSetting().getFieldSpec(getField().getName());
if (fieldSpec != null && fieldSpec instanceof ChoiceInput) {
ChoiceProvider choiceProvider = ((ChoiceInput)fieldSpec).getChoiceProvider();
OneContext.push(new ComponentContext(this));
@@ -131,7 +137,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {
} else {
InputSpec fieldSpec = null;
if (getField() != null)
- fieldSpec = getIssue().getProject().getIssueWorkflow().getFieldSpec(getField().getName());
+ fieldSpec = getIssueSetting().getFieldSpec(getField().getName());
String displayValue;
if (fieldSpec != null && fieldSpec.getNameOfEmptyValue() != null)
displayValue = fieldSpec.getNameOfEmptyValue();
@@ -145,7 +151,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {
@Override
public Object getInputValue(String name) {
IssueField field = getIssue().getFields().get(name);
- InputSpec fieldSpec = getIssue().getProject().getIssueWorkflow().getFieldSpec(name);
+ InputSpec fieldSpec = getIssueSetting().getFieldSpec(name);
if (field != null && fieldSpec != null && field.getType().equals(EditableUtils.getDisplayName(fieldSpec.getClass()))) {
return fieldSpec.convertToObject(field.getValues());
} else {
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.html b/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.html
index 277402f536..489da58981 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.html
@@ -38,7 +38,7 @@
<div wicket:id="comment" placeholder="Leave a comment"></div>
</div>
<div class="modal-footer clearfix">
- <input wicket:id="save" type="submit" class="btn btn-primary" value="Save"></input>
+ <input wicket:id="save" type="submit" class="btn btn-primary" value="Save">
<a wicket:id="cancel" class="btn btn-default">Cancel</a>
</div>
</form>
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java
index dbe3ce2a79..ecce39bc3f 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/BatchEditPanel.java
@@ -31,9 +31,11 @@ import com.google.common.collect.Lists;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import io.onedev.server.OneDev;
import io.onedev.server.manager.IssueChangeManager;
+import io.onedev.server.manager.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.setting.GlobalIssueSetting;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.IssueConstants;
@@ -135,7 +137,7 @@ abstract class BatchEditPanel extends Panel implements InputContext {
}).add(newOnChangeBehavior(form)));
- List<String> customFieldNames = getProject().getIssueWorkflow().getFieldNames();
+ List<String> customFieldNames = getIssueSetting().getFieldNames();
form.add(new ListView<String>("customFields", customFieldNames) {
@Override
@@ -291,15 +293,19 @@ abstract class BatchEditPanel extends Panel implements InputContext {
add(form);
}
+
+ private GlobalIssueSetting getIssueSetting() {
+ return OneDev.getInstance(SettingManager.class).getIssueSetting();
+ }
@Override
public List<String> getInputNames() {
- return getProject().getIssueWorkflow().getFieldNames();
+ return getIssueSetting().getFieldNames();
}
@Override
public InputSpec getInputSpec(String inputName) {
- return getProject().getIssueWorkflow().getFieldSpec(inputName);
+ return getIssueSetting().getFieldSpec(inputName);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/BuiltInFieldsBean.java b/core/src/main/java/io/onedev/server/web/component/issue/list/BuiltInFieldsBean.java
index 59cc642a3a..899ca2fc67 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/list/BuiltInFieldsBean.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/BuiltInFieldsBean.java
@@ -6,6 +6,9 @@ import java.util.stream.Collectors;
import org.hibernate.validator.constraints.NotEmpty;
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.SettingManager;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.util.OneContext;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
@@ -44,7 +47,8 @@ public class BuiltInFieldsBean implements Serializable {
@SuppressWarnings("unused")
private static List<String> getStateChoices() {
- return OneContext.get().getProject().getIssueWorkflow().getStateSpecs().stream().map(it->it.getName()).collect(Collectors.toList());
+ GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();
+ return issueSetting.getStateSpecs().stream().map(it->it.getName()).collect(Collectors.toList());
}
@SuppressWarnings("unused")
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/FieldsEditBean.java b/core/src/main/java/io/onedev/server/web/component/issue/list/FieldsEditBean.java
deleted file mode 100644
index 4ecfbc2f07..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/issue/list/FieldsEditBean.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package io.onedev.server.web.component.issue.list;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import io.onedev.server.util.IssueConstants;
-import io.onedev.server.util.inputspec.InputSpec;
-import io.onedev.server.web.editable.annotation.ChoiceProvider;
-import io.onedev.server.web.editable.annotation.Editable;
-import io.onedev.server.web.page.project.ProjectPage;
-import io.onedev.server.web.util.WicketUtils;
-
-@Editable
-public class FieldsEditBean implements Serializable {
-
- private static final long serialVersionUID = 1L;
-
- private List<String> fields = new ArrayList<>();
-
- @Editable(description="<b>Hint:</b> Selected fields can be dragged and reordered")
- @ChoiceProvider("getFieldChoices")
- public List<String> getFields() {
- return fields;
- }
-
- public void setFields(List<String> fields) {
- this.fields = fields;
- }
-
- @SuppressWarnings("unused")
- private static List<String> getFieldChoices() {
- List<String> fields = new ArrayList<>(IssueConstants.DISPLAY_FIELDS);
- ProjectPage page = (ProjectPage) WicketUtils.getPage();
- for (InputSpec field: page.getProject().getIssueWorkflow().getFieldSpecs())
- fields.add(field.getName());
- return fields;
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
index 621e3732c0..d6e315231b 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
@@ -14,7 +14,7 @@
<a wicket:id="saveQuery" class="pull-left save-query"><i class="fa fa-save"></i> Save Query</a>
<a wicket:id="batchEditSelected" class="pull-left"><i class="fa fa-pencil"></i> Batch Edit Selected</a>
<a wicket:id="batchEditAll" class="pull-left"><i class="fa fa-pencil"></i> Batch Edit All</a>
- <a wicket:id="displayFields" class="display-fields pull-left"><i class="fa fa-list-ul"></i> Display Fields</a>
+ <a wicket:id="listFields" class="list-fields pull-left"><i class="fa fa-list-ul"></i> Display Fields</a>
<div wicket:id="pageInfo" class="page-info pull-right"></div>
</div>
</div>
@@ -26,21 +26,24 @@
<wicket:fragment wicket:id="linkFrag">
<a wicket:id="link"><span wicket:id="label"></span></a>
</wicket:fragment>
- <wicket:fragment wicket:id="fieldsFrag">
- <form wicket:id="form" class="issue-table-fields leave-confirm no-autofocus">
- <div class="modal-header">
- <button wicket:id="close" type="button" class="close">&times;</button>
- <h4 id="modal-title" class="modal-title">
- Fields to Display
- </h4>
- </div>
- <div class="modal-body">
- <div wicket:id="editor"></div>
- </div>
- <div class="modal-footer clearfix">
- <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save">
- <a wicket:id="cancel" class="btn btn-default">Cancel</a>
- </div>
- </form>
+ <wicket:fragment wicket:id="listFieldsFrag">
+ <div class="issue-list-fields">
+ <form wicket:id="form">
+ <div class="modal-header">
+ <button wicket:id="close" type="button" class="close">&times;</button>
+ <h4 id="modal-title" class="modal-title">
+ Fields to Display
+ </h4>
+ </div>
+ <div class="modal-body">
+ <input wicket:id="fields" type="hidden" class="form-control">
+ </div>
+ <div class="modal-footer clearfix">
+ <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save">
+ <a wicket:id="useDefault" class="btn btn-primary">Use Default</a>
+ <a wicket:id="cancel" class="btn btn-default">Cancel</a>
+ </div>
+ </form>
+ </div>
</wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index dfc3e86d30..72768ebb36 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -1,8 +1,11 @@
package io.onedev.server.web.component.issue.list;
import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
import javax.annotation.Nullable;
@@ -35,7 +38,6 @@ import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
-import org.apache.wicket.request.cycle.RequestCycle;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,14 +45,14 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel
import io.onedev.server.OneDev;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.manager.ProjectManager;
+import io.onedev.server.manager.SettingManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.DateUtils;
import io.onedev.server.util.IssueConstants;
import io.onedev.server.util.IssueField;
-import io.onedev.server.util.facade.UserFacade;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.IssueQueryBehavior;
import io.onedev.server.web.component.datatable.HistoryAwareDataTable;
@@ -60,16 +62,12 @@ 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.user.ident.UserIdentPanel;
-import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;
-import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.component.stringchoice.StringMultiChoice;
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.issues.milestones.MilestoneDetailPage;
import io.onedev.server.web.util.PagingHistorySupport;
import io.onedev.server.web.util.QueryPosition;
import io.onedev.server.web.util.QuerySaveSupport;
-import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.util.VisibleVisitor;
import io.onedev.utils.StringUtils;
@@ -140,6 +138,10 @@ public abstract class IssueListPanel extends GenericPanel<String> {
@Nullable
protected abstract QuerySaveSupport getQuerySaveSupport();
+ private GlobalIssueSetting getGlobalIssueSetting() {
+ return OneDev.getInstance(SettingManager.class).getIssueSetting();
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -215,25 +217,33 @@ public abstract class IssueListPanel extends GenericPanel<String> {
});
add(form);
- others.add(new ModalLink("displayFields") {
+ others.add(new ModalLink("listFields") {
+ private Set<String> fieldSet;
+
@Override
protected Component newContent(String id, ModalPanel modal) {
- Fragment fragment = new Fragment(id, "fieldsFrag", IssueListPanel.this);
-
- FieldsEditBean bean = new FieldsEditBean();
- bean.setFields(getProject().getIssueListFields());
- Form<?> form = new Form<Void>("form") {
+ Fragment fragment = new Fragment(id, "listFieldsFrag", IssueListPanel.this);
+ Form<?> form = new Form<Void>("form");
+ fieldSet = getProject().getIssueSetting().getListFields(true);
+ form.add(new StringMultiChoice("fields", new IModel<Collection<String>>() {
@Override
- protected void onError() {
- super.onError();
- RequestCycle.get().find(AjaxRequestTarget.class).add(this);
+ public void detach() {
}
- };
- form.add(BeanContext.editBean("editor", bean));
+ @Override
+ public Collection<String> getObject() {
+ return fieldSet;
+ }
+ @Override
+ public void setObject(Collection<String> object) {
+ fieldSet = new HashSet<>(object);
+ }
+
+ }, getGlobalIssueSetting().getFieldNames()));
+
form.add(new AjaxLink<Void>("close") {
@Override
@@ -248,14 +258,26 @@ public abstract class IssueListPanel extends GenericPanel<String> {
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
super.onSubmit(target, form);
- getProject().setIssueListFields((ArrayList<String>) bean.getFields());
- OneDev.getInstance(ProjectManager.class).save(getProject());
modal.close();
+ getProject().getIssueSetting().setListFields(fieldSet);
+ OneDev.getInstance(ProjectManager.class).save(getProject());
onQueryUpdated(target);
}
});
+ form.add(new AjaxLink<Void>("useDefault") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ modal.close();
+ getProject().getIssueSetting().setListFields(null);
+ OneDev.getInstance(ProjectManager.class).save(getProject());
+ onQueryUpdated(target);
+ }
+
+ }.setVisible(getProject().getIssueSetting().getListFields(false) != null));
+
form.add(new AjaxLink<Void>("cancel") {
@Override
@@ -264,8 +286,9 @@ public abstract class IssueListPanel extends GenericPanel<String> {
}
});
- form.setOutputMarkupId(true);
+
fragment.add(form);
+
return fragment;
}
@@ -444,160 +467,76 @@ public abstract class IssueListPanel extends GenericPanel<String> {
});
}
- for (String field: getProject().getIssueListFields()) {
- switch (field) {
- case IssueConstants.FIELD_NUMBER:
- columns.add(new AbstractColumn<Issue, Void>(Model.of("#")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,
- IModel<Issue> rowModel) {
- cellItem.add(new Label(componentId, rowModel.getObject().getNumber()));
- }
- });
- break;
- case IssueConstants.FIELD_STATE:
- columns.add(new AbstractColumn<Issue, Void>(Model.of(IssueConstants.FIELD_STATE)) {
-
- @Override
- public String getCssClass() {
- return "state";
- }
-
- @Override
- public void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,
- IModel<Issue> rowModel) {
- cellItem.add(new IssueStateLabel(componentId, rowModel));
- }
- });
- break;
- case IssueConstants.FIELD_TITLE:
- columns.add(new AbstractColumn<Issue, Void>(Model.of(IssueConstants.FIELD_TITLE)) {
+ columns.add(new AbstractColumn<Issue, Void>(Model.of("#")) {
- @Override
- public void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,
- IModel<Issue> rowModel) {
- Fragment fragment = new Fragment(componentId, "linkFrag", IssueListPanel.this);
- OddEvenItem<?> row = cellItem.findParent(OddEvenItem.class);
- QueryPosition position = new QueryPosition(parsedQueryModel.getObject().toString(), (int)issuesTable.getItemCount(),
- (int)issuesTable.getCurrentPage() * WebConstants.PAGE_SIZE + row.getIndex());
- Link<Void> link = new BookmarkablePageLink<Void>("link", IssueActivitiesPage.class,
- IssueActivitiesPage.paramsOf(rowModel.getObject(), position));
- link.add(new Label("label", rowModel.getObject().getTitle()));
- fragment.add(link);
- cellItem.add(fragment);
- }
- });
- break;
- case IssueConstants.FIELD_SUBMITTER:
- columns.add(new AbstractColumn<Issue, Void>(Model.of(IssueConstants.FIELD_SUBMITTER)) {
+ @Override
+ public void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,
+ IModel<Issue> rowModel) {
+ cellItem.add(new Label(componentId, rowModel.getObject().getNumber()));
+ }
+
+ });
+ columns.add(new AbstractColumn<Issue, Void>(Model.of(IssueConstants.FIELD_STATE)) {
- @Override
- public String getCssClass() {
- return "submitter";
- }
+ @Override
+ public String getCssClass() {
+ return "state";
+ }
- @Override
- public void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,
- IModel<Issue> rowModel) {
- Issue issue = rowModel.getObject();
- UserIdent userIdent = UserIdent.of(UserFacade.of(issue.getSubmitter()), issue.getSubmitterName());
- cellItem.add(new UserIdentPanel(componentId, userIdent, Mode.AVATAR_AND_NAME));
- }
- });
- break;
- case IssueConstants.FIELD_SUBMIT_DATE:
- columns.add(new AbstractColumn<Issue, Void>(Model.of(IssueConstants.FIELD_SUBMIT_DATE)) {
+ @Override
+ public void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,
+ IModel<Issue> rowModel) {
+ cellItem.add(new IssueStateLabel(componentId, rowModel));
+ }
+ });
+ columns.add(new AbstractColumn<Issue, Void>(Model.of(IssueConstants.FIELD_TITLE)) {
- @Override
- public void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,
- IModel<Issue> rowModel) {
- cellItem.add(new Label(componentId, DateUtils.formatAge(rowModel.getObject().getSubmitDate())));
- }
- });
- break;
- case IssueConstants.FIELD_UPDATE_DATE:
- columns.add(new AbstractColumn<Issue, Void>(Model.of(IssueConstants.FIELD_UPDATE_DATE)) {
+ @Override
+ public void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,
+ IModel<Issue> rowModel) {
+ Fragment fragment = new Fragment(componentId, "linkFrag", IssueListPanel.this);
+ OddEvenItem<?> row = cellItem.findParent(OddEvenItem.class);
+ QueryPosition position = new QueryPosition(parsedQueryModel.getObject().toString(), (int)issuesTable.getItemCount(),
+ (int)issuesTable.getCurrentPage() * WebConstants.PAGE_SIZE + row.getIndex());
+ Link<Void> link = new BookmarkablePageLink<Void>("link", IssueActivitiesPage.class,
+ IssueActivitiesPage.paramsOf(rowModel.getObject(), position));
+ link.add(new Label("label", rowModel.getObject().getTitle()));
+ fragment.add(link);
+ cellItem.add(fragment);
+ }
+
+ });
+ for (String field: getGlobalIssueSetting().sortFieldNames(getProject().getIssueSetting().getListFields(true))) {
+ columns.add(new AbstractColumn<Issue, Void>(Model.of(field)) {
- @Override
- public void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,
- IModel<Issue> rowModel) {
- cellItem.add(new Label(componentId, DateUtils.formatAge(rowModel.getObject().getUpdateDate())));
- }
- });
- break;
- case IssueConstants.FIELD_MILESTONE:
- columns.add(new AbstractColumn<Issue, Void>(Model.of(IssueConstants.FIELD_MILESTONE)) {
+ @Override
+ public void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,
+ IModel<Issue> rowModel) {
+ cellItem.add(new FieldValuesPanel(componentId) {
- @Override
- public void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,
- IModel<Issue> rowModel) {
- Issue issue = rowModel.getObject();
- if (issue.getMilestone() != null) {
- Fragment fragment = new Fragment(componentId, "linkFrag", IssueListPanel.this);
- Link<Void> link = new BookmarkablePageLink<Void>("link", MilestoneDetailPage.class,
- MilestoneDetailPage.paramsOf(issue.getMilestone(), null));
- link.add(new Label("label", issue.getMilestoneName()));
- fragment.add(link);
- cellItem.add(fragment);
- } else {
- cellItem.add(new Label(componentId, "<i>No milestone</i>").setEscapeModelStrings(false));
+ @Override
+ protected Issue getIssue() {
+ return rowModel.getObject();
}
- }
- });
- break;
- case IssueConstants.FIELD_VOTE_COUNT:
- columns.add(new AbstractColumn<Issue, Void>(Model.of(IssueConstants.FIELD_VOTE_COUNT)) {
-
- @Override
- public void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,
- IModel<Issue> rowModel) {
- cellItem.add(new Label(componentId, rowModel.getObject().getVoteCount()));
- }
- });
- break;
- case IssueConstants.FIELD_COMMENT_COUNT:
- columns.add(new AbstractColumn<Issue, Void>(Model.of(IssueConstants.FIELD_COMMENT_COUNT)) {
- @Override
- public void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,
- IModel<Issue> rowModel) {
- cellItem.add(new Label(componentId, rowModel.getObject().getVoteCount()));
- }
- });
- break;
- default:
- columns.add(new AbstractColumn<Issue, Void>(Model.of(field)) {
-
- @Override
- public void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,
- IModel<Issue> rowModel) {
- cellItem.add(new FieldValuesPanel(componentId) {
-
- @Override
- protected Issue getIssue() {
- return rowModel.getObject();
- }
-
- @Override
- protected IssueField getField() {
- Issue issue = rowModel.getObject();
- if (issue.isFieldVisible(field))
- return issue.getFields().get(field);
- else
- return null;
- }
-
- }.setRenderBodyOnly(true));
- }
+ @Override
+ protected IssueField getField() {
+ Issue issue = rowModel.getObject();
+ if (issue.isFieldVisible(field))
+ return issue.getFields().get(field);
+ else
+ return null;
+ }
+
+ }.setRenderBodyOnly(true));
+ }
- @Override
- public String getCssClass() {
- return "custom-field";
- }
-
- });
- }
+ @Override
+ public String getCssClass() {
+ return "custom-field";
+ }
+
+ });
}
add(issuesTable = new HistoryAwareDataTable<Issue, Void>("issues", columns, dataProvider,
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css b/core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css
index e4a1a2a856..b0dfcaeb3b 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css
+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css
@@ -37,4 +37,4 @@
}
.issue-batch-edit .select-fields>.checkboxes>* {
margin-right: 10px;
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
index 557973190c..918225037f 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/operation/IssueOperationsPanel.java
@@ -3,8 +3,6 @@ package io.onedev.server.web.component.issue.operation;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
import java.util.List;
import java.util.Map;
@@ -31,11 +29,12 @@ import com.google.common.collect.Lists;
import io.onedev.server.OneDev;
import io.onedev.server.manager.IssueChangeManager;
+import io.onedev.server.manager.SettingManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
-import io.onedev.server.model.support.issue.workflow.IssueWorkflow;
-import io.onedev.server.model.support.issue.workflow.TransitionSpec;
-import io.onedev.server.model.support.issue.workflow.transitiontrigger.PressButtonTrigger;
+import io.onedev.server.model.support.issue.TransitionSpec;
+import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.IssueConstants;
@@ -88,16 +87,8 @@ public abstract class IssueOperationsPanel extends Panel {
RepeatingView transitionsView = new RepeatingView("transitions");
- List<TransitionSpec> transitions = getIssue().getProject().getIssueWorkflow().getTransitionSpecs();
- Collections.sort(transitions, new Comparator<TransitionSpec>() {
-
- @Override
- public int compare(TransitionSpec o1, TransitionSpec o2) {
- IssueWorkflow workflow = getIssue().getProject().getIssueWorkflow();
- return workflow.getStateSpecIndex(o1.getToState()) - workflow.getStateSpecIndex(o2.getToState());
- }
-
- });
+ GlobalIssueSetting 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) {
PressButtonTrigger trigger = (PressButtonTrigger) transition.getTrigger();
@@ -192,7 +183,7 @@ public abstract class IssueOperationsPanel extends Panel {
if (strings.isEmpty()) {
criterias.add(IssueQuery.quote(entry.getKey()) + " is empty");
} else {
- InputSpec field = getIssue().getProject().getIssueWorkflow().getFieldSpec(entry.getKey());
+ InputSpec field = issueSetting.getFieldSpec(entry.getKey());
if (field instanceof ChoiceInput && ((ChoiceInput)field).isAllowMultiple()) {
for (String string: strings)
criterias.add(IssueQuery.quote(entry.getKey()) + " contains " + IssueQuery.quote(string));
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java b/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
index 67a91840df..7d291c528b 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/side/IssueSidePanel.java
@@ -40,6 +40,7 @@ import io.onedev.server.manager.IssueChangeManager;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.manager.IssueVoteManager;
import io.onedev.server.manager.IssueWatchManager;
+import io.onedev.server.manager.SettingManager;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.model.Issue;
import io.onedev.server.model.IssueVote;
@@ -54,6 +55,7 @@ import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.IssueField;
import io.onedev.server.util.IssueUtils;
import io.onedev.server.util.facade.UserFacade;
+import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.component.entity.nav.EntityNavPanel;
import io.onedev.server.web.component.entity.watches.EntityWatchesPanel;
import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;
@@ -66,7 +68,6 @@ import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.page.project.issues.milestones.MilestoneDetailPage;
import io.onedev.server.web.page.security.LoginPage;
import io.onedev.server.web.util.QueryPositionSupport;
-import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.util.ajaxlistener.AppendLoadingIndicatorListener;
@SuppressWarnings("serial")
@@ -193,7 +194,7 @@ public abstract class IssueSidePanel extends Panel {
protected void onConfigure() {
super.onConfigure();
User user = SecurityUtils.getUser();
- String initialState = getProject().getIssueWorkflow().getInitialStateSpec().getName();
+ String initialState = OneDev.getInstance(SettingManager.class).getIssueSetting().getInitialStateSpec().getName();
setVisible(SecurityUtils.canWriteCode(getIssue().getProject().getFacade())
|| user != null && user.equals(getIssue().getSubmitter()) && getIssue().getState().equals(initialState));
}
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/statetransition/ChangeListener.java b/core/src/main/java/io/onedev/server/web/component/issue/statetransition/ChangeListener.java
new file mode 100644
index 0000000000..9651fb6456
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/issue/statetransition/ChangeListener.java
@@ -0,0 +1,11 @@
+package io.onedev.server.web.component.issue.statetransition;
+
+import java.io.Serializable;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+
+public interface ChangeListener extends Serializable {
+
+ void onChanged(AjaxRequestTarget target);
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.html b/core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.html
new file mode 100644
index 0000000000..e951583140
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.html
@@ -0,0 +1,23 @@
+<wicket:panel>
+ <div class="state-transition-list def-list list">
+ <div class="head">
+ <a wicket:id="addNew" class="btn btn-default"><i class="fa fa-plus"></i> Add New</a>
+ <a wicket:id="useDefault" class="btn btn-default"><i class="fa fa-undo"></i> Use Default</a>
+ </div>
+ <table wicket:id="stateTransitions" class="table table-hover"></table>
+ </div>
+ <wicket:fragment wicket:id="firstColumnFrag">
+ <span class="drag-handle fa fa-arrows" title="Drag to reorder"></span>
+ <a wicket:id="link"><span wicket:id="label"></span></a>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="otherColumnsFrag">
+ <a wicket:id="link"><span wicket:id="label"></span></a>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="viewTransitionFrag">
+ <div class="actions">
+ <a wicket:id="edit" class="btn btn-sm btn-default"><i class="fa fa-pencil"></i> Edit</a>
+ <a wicket:id="delete" class="btn btn-sm btn-default"><i class="fa fa-trash"></i> Delete</a>
+ </div>
+ <div wicket:id="viewer"></div>
+ </wicket:fragment>
+</wicket:panel>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/StateTransitionsPage.java b/core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.java
similarity index 64%
rename from core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/StateTransitionsPage.java
rename to core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.java
index 84bbe267af..8af2a6f4df 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/StateTransitionsPage.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.java
@@ -1,10 +1,11 @@
-package io.onedev.server.web.page.project.setting.issueworkflow.statetransitions;
+package io.onedev.server.web.component.issue.statetransition;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Comparator;
import java.util.List;
+import javax.annotation.Nullable;
+
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
@@ -19,21 +20,18 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToo
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.IDataProvider;
import org.apache.wicket.markup.repeater.data.ListDataProvider;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.google.common.base.Preconditions;
-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
-import io.onedev.server.OneDev;
-import io.onedev.server.manager.ProjectManager;
-import io.onedev.server.model.support.issue.workflow.IssueWorkflow;
-import io.onedev.server.model.support.issue.workflow.TransitionSpec;
+import io.onedev.server.model.support.issue.TransitionSpec;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
import io.onedev.server.web.component.modal.ModalLink;
@@ -41,18 +39,19 @@ import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.page.layout.SideFloating;
-import io.onedev.server.web.page.project.setting.issueworkflow.IssueWorkflowPage;
+import io.onedev.server.web.util.ConfirmOnClick;
import io.onedev.server.web.util.ajaxlistener.ConfirmListener;
import io.onedev.utils.StringUtils;
import jersey.repackaged.com.google.common.collect.Sets;
@SuppressWarnings("serial")
-public class StateTransitionsPage extends IssueWorkflowPage {
+public abstract class StateTransitionListPanel extends Panel {
- private DataTable<TransitionSpec, Void> transitionsTable;
+ private final List<TransitionSpec> transitions;
- public StateTransitionsPage(PageParameters params) {
- super(params);
+ public StateTransitionListPanel(String componentId, List<TransitionSpec> transitions) {
+ super(componentId);
+ this.transitions = transitions;
}
@Override
@@ -63,11 +62,12 @@ public class StateTransitionsPage extends IssueWorkflowPage {
@Override
protected Component newContent(String id, ModalPanel modal) {
- return new TransitionEditPanel(id, -1) {
+ return new TransitionEditPanel(id, transitions, -1) {
@Override
- protected void onSave(AjaxRequestTarget target) {
- target.add(transitionsTable);
+ protected void onChanged(AjaxRequestTarget target) {
+ StateTransitionListPanel.this.onChanged(target);
+ target.add(StateTransitionListPanel.this);
modal.close();
}
@@ -76,16 +76,27 @@ public class StateTransitionsPage extends IssueWorkflowPage {
modal.close();
}
- @Override
- protected IssueWorkflow getWorkflow() {
- return StateTransitionsPage.this.getWorkflow();
- }
-
};
}
});
+ String message = "This will discard all project specific transitions, do you want to continue?";
+ add(new Link<Void>("useDefault") {
+
+ @Override
+ public void onClick() {
+ getUseDefaultListener().onUseDefault();
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(getUseDefaultListener() != null);
+ }
+
+ }.add(new ConfirmOnClick(message)));
+
List<IColumn<TransitionSpec, Void>> columns = new ArrayList<>();
columns.add(new AbstractColumn<TransitionSpec, Void>(Model.of("From States")) {
@@ -93,7 +104,7 @@ public class StateTransitionsPage extends IssueWorkflowPage {
@Override
public void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {
String label = StringUtils.join(rowModel.getObject().getFromStates());
- cellItem.add(new ColumnFragment(componentId, rowModel.getObject(), label));
+ cellItem.add(new ColumnFragment(componentId, rowModel.getObject(), label, "firstColumnFrag"));
}
});
@@ -101,7 +112,7 @@ public class StateTransitionsPage extends IssueWorkflowPage {
@Override
public void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {
- cellItem.add(new ColumnFragment(componentId, rowModel.getObject(), rowModel.getObject().getToState()));
+ cellItem.add(new ColumnFragment(componentId, rowModel.getObject(), rowModel.getObject().getToState(), "otherColumnsFrag"));
}
});
@@ -111,7 +122,7 @@ public class StateTransitionsPage extends IssueWorkflowPage {
@Override
public void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {
String label = EditableUtils.getDisplayName(rowModel.getObject().getTrigger().getClass());
- cellItem.add(new ColumnFragment(componentId, rowModel.getObject(), label));
+ cellItem.add(new ColumnFragment(componentId, rowModel.getObject(), label, "otherColumnsFrag"));
}
});
@@ -120,32 +131,17 @@ public class StateTransitionsPage extends IssueWorkflowPage {
@Override
protected List<TransitionSpec> getData() {
- Collections.sort(getWorkflow().getTransitionSpecs(), new Comparator<TransitionSpec>() {
-
- @Override
- public int compare(TransitionSpec transition1, TransitionSpec transition2) {
- int fromStateIndex1 = getWorkflow().getStateSpecIndex(transition1.getFromStates().get(0));
- int fromStateIndex2 = getWorkflow().getStateSpecIndex(transition2.getFromStates().get(0));
- int toStateIndex1 = getWorkflow().getStateSpecIndex(transition1.getToState());
- int toStateIndex2 = getWorkflow().getStateSpecIndex(transition2.getToState());
- if (fromStateIndex1 != fromStateIndex2)
- return fromStateIndex1 - fromStateIndex2;
- else
- return toStateIndex1 - toStateIndex2;
- }
-
- });
- return getWorkflow().getTransitionSpecs();
+ return transitions;
}
};
- add(transitionsTable = new DataTable<TransitionSpec, Void>("stateTransitions", columns, dataProvider, Integer.MAX_VALUE));
- transitionsTable.addTopToolbar(new HeadersToolbar<Void>(transitionsTable, null));
- transitionsTable.addBottomToolbar(new NoRecordsToolbar(transitionsTable));
- transitionsTable.setOutputMarkupId(true);
+ DataTable<TransitionSpec, Void> dataTable;
+ add(dataTable = new DataTable<TransitionSpec, Void>("stateTransitions", columns, dataProvider, Integer.MAX_VALUE));
+ dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));
+ dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));
- transitionsTable.add(new SortBehavior() {
+ dataTable.add(new SortBehavior() {
@Override
protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {
@@ -153,41 +149,49 @@ public class StateTransitionsPage extends IssueWorkflowPage {
int toIndex = to.getItemIndex();
if (fromIndex < toIndex) {
for (int i=0; i<toIndex-fromIndex; i++)
- Collections.swap(getWorkflow().getTransitionSpecs(), fromIndex+i, fromIndex+i+1);
+ Collections.swap(transitions, fromIndex+i, fromIndex+i+1);
} else {
for (int i=0; i<fromIndex-toIndex; i++)
- Collections.swap(getWorkflow().getTransitionSpecs(), fromIndex-i, fromIndex-i-1);
+ Collections.swap(transitions, fromIndex-i, fromIndex-i-1);
}
-
- getProject().setIssueWorkflow(getWorkflow());
- OneDev.getInstance(ProjectManager.class).save(getProject());
- target.add(transitionsTable);
+ onChanged(target);
+ target.add(StateTransitionListPanel.this);
}
}.sortable("tbody").handle(".drag-handle").helperClass("sort-helper"));
+
+ setOutputMarkupId(true);
}
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(CssHeaderItem.forReference(new StateTransitionsResourceReference()));
+ response.render(CssHeaderItem.forReference(new StateTransitionListResourceReference()));
}
+ private int getTransitionSpecIndex(TransitionSpec transition) {
+ for (int i=0; i<transitions.size(); i++) {
+ if (transitions.get(i) == transition)
+ return i;
+ }
+ return -1;
+ }
+
private class ColumnFragment extends Fragment {
private final int index;
private final String label;
- public ColumnFragment(String id, TransitionSpec transition, String label) {
- super(id, "columnFrag", StateTransitionsPage.this);
- this.index = getWorkflow().getTransitionSpecIndex(transition);
+ public ColumnFragment(String id, TransitionSpec transition, String label, String columnFrag) {
+ super(id, columnFrag, StateTransitionListPanel.this);
+ this.index = getTransitionSpecIndex(transition);
Preconditions.checkState(this.index != -1);
this.label = label;
}
private TransitionSpec getTransition() {
- return getWorkflow().getTransitionSpecs().get(index);
+ return transitions.get(index);
}
@Override
@@ -207,24 +211,26 @@ public class StateTransitionsPage extends IssueWorkflowPage {
@Override
protected void onInitialize() {
super.onInitialize();
- add(AttributeAppender.append("class", "state-transition"));
+ add(AttributeAppender.append("class", "transition-spec def-detail"));
}
@Override
protected Component newBody(String id) {
SideFloating sideFloating = this;
- Fragment fragment = new Fragment(id, "viewTransitionFrag", StateTransitionsPage.this);
+ Fragment fragment = new Fragment(id, "viewTransitionFrag", StateTransitionListPanel.this);
fragment.add(BeanContext.viewBean("viewer", getTransition(), Sets.newHashSet("name"), true));
+
fragment.add(new ModalLink("edit") {
@Override
protected Component newContent(String id, ModalPanel modal) {
sideFloating.close();
- return new TransitionEditPanel(id, index) {
+ return new TransitionEditPanel(id, transitions, index) {
@Override
- protected void onSave(AjaxRequestTarget target) {
- target.add(transitionsTable);
+ protected void onChanged(AjaxRequestTarget target) {
+ StateTransitionListPanel.this.onChanged(target);
+ target.add(StateTransitionListPanel.this);
modal.close();
}
@@ -233,11 +239,6 @@ public class StateTransitionsPage extends IssueWorkflowPage {
modal.close();
}
- @Override
- protected IssueWorkflow getWorkflow() {
- return StateTransitionsPage.this.getWorkflow();
- }
-
};
}
@@ -252,16 +253,14 @@ public class StateTransitionsPage extends IssueWorkflowPage {
@Override
public void onClick(AjaxRequestTarget target) {
- getWorkflow().getTransitionSpecs().remove(index);
- getProject().setIssueWorkflow(getWorkflow());
- OneDev.getInstance(ProjectManager.class).save(getProject());
- target.add(transitionsTable);
+ transitions.remove(index);
+ onChanged(target);
+ target.add(StateTransitionListPanel.this);
close();
}
});
- fragment.add(new NotificationPanel("feedback", fragment));
fragment.setOutputMarkupId(true);
return fragment;
@@ -279,4 +278,10 @@ public class StateTransitionsPage extends IssueWorkflowPage {
}
}
+
+ protected abstract void onChanged(AjaxRequestTarget target);
+
+ @Nullable
+ protected abstract UseDefaultListener getUseDefaultListener();
+
}
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListResourceReference.java b/core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListResourceReference.java
new file mode 100644
index 0000000000..35afe62d0a
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.component.issue.statetransition;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+
+public class StateTransitionListResourceReference extends BaseDependentCssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public StateTransitionListResourceReference() {
+ super(StateTransitionListResourceReference.class, "state-transition-list.css");
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/TransitionEditPanel.html b/core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.html
similarity index 79%
rename from core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/TransitionEditPanel.html
rename to core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.html
index 0d9cfb9d73..67da067597 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/TransitionEditPanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.html
@@ -1,5 +1,5 @@
<wicket:panel>
- <form wicket:id="form" class="state-transition-edit leave-confirm">
+ <form wicket:id="form" class="transition-spec-edit leave-confirm">
<div class="modal-header">
<button wicket:id="close" type="button" class="close">&times;</button>
<h4 id="modal-title" class="modal-title">
@@ -10,7 +10,7 @@
<div wicket:id="editor"></div>
</div>
<div class="modal-footer">
- <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save"></input>
+ <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save">
<a wicket:id="cancel" class="btn btn-default">Cancel</a>
</div>
</form>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/TransitionEditPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.java
similarity index 72%
rename from core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/TransitionEditPanel.java
rename to core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.java
index 4020f8e72e..b412129e9a 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/TransitionEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.setting.issueworkflow.statetransitions;
+package io.onedev.server.web.component.issue.statetransition;
import java.util.List;
@@ -12,41 +12,36 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.request.cycle.RequestCycle;
import io.onedev.server.OneDev;
-import io.onedev.server.manager.ProjectManager;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.support.issue.workflow.IssueWorkflow;
-import io.onedev.server.model.support.issue.workflow.TransitionSpec;
+import io.onedev.server.manager.SettingManager;
+import io.onedev.server.model.support.issue.TransitionSpec;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.util.inputspec.InputContext;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.editable.PathSegment;
-import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;
@SuppressWarnings("serial")
abstract class TransitionEditPanel extends Panel implements InputContext {
+ private final List<TransitionSpec> transitions;
+
private final int transitionIndex;
- public TransitionEditPanel(String id, int transitionIndex) {
+ public TransitionEditPanel(String id, List<TransitionSpec> transitions, int transitionIndex) {
super(id);
-
+ this.transitions = transitions;
this.transitionIndex = transitionIndex;
}
- private Project getProject() {
- ProjectPage page = (ProjectPage) getPage();
- return page.getProject();
- }
-
@Override
protected void onInitialize() {
super.onInitialize();
TransitionSpec transition;
if (transitionIndex != -1)
- transition = SerializationUtils.clone(getWorkflow().getTransitionSpecs().get(transitionIndex));
+ transition = SerializationUtils.clone(transitions.get(transitionIndex));
else
transition = new TransitionSpec();
@@ -86,16 +81,14 @@ abstract class TransitionEditPanel extends Panel implements InputContext {
if (transition.getFromStates().contains(transition.getToState())) {
String error = "Can not do transition between same state";
editor.getErrorContext(new PathSegment.Property("fromStates")).addError(error);
- editor.getErrorContext(new PathSegment.Property("toStates")).addError(error);
+ editor.getErrorContext(new PathSegment.Property("toState")).addError(error);
target.add(form);
} else {
if (transitionIndex != -1)
- getWorkflow().getTransitionSpecs().set(transitionIndex, transition);
+ transitions.set(transitionIndex, transition);
else
- getWorkflow().getTransitionSpecs().add(transition);
- getProject().setIssueWorkflow(getWorkflow());
- OneDev.getInstance(ProjectManager.class).save(getProject());
- onSave(target);
+ transitions.add(transition);
+ onChanged(target);
}
}
@@ -120,14 +113,18 @@ abstract class TransitionEditPanel extends Panel implements InputContext {
add(form);
}
+ private GlobalIssueSetting getIssueSetting() {
+ return OneDev.getInstance(SettingManager.class).getIssueSetting();
+ }
+
@Override
public List<String> getInputNames() {
- return getWorkflow().getFieldNames();
+ return getIssueSetting().getFieldNames();
}
@Override
public InputSpec getInputSpec(String inputName) {
- return getWorkflow().getFieldSpec(inputName);
+ return getIssueSetting().getFieldSpec(inputName);
}
@Override
@@ -135,9 +132,7 @@ abstract class TransitionEditPanel extends Panel implements InputContext {
throw new UnsupportedOperationException();
}
- protected abstract IssueWorkflow getWorkflow();
-
- protected abstract void onSave(AjaxRequestTarget target);
+ protected abstract void onChanged(AjaxRequestTarget target);
protected abstract void onCancel(AjaxRequestTarget target);
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/statetransition/UseDefaultListener.java b/core/src/main/java/io/onedev/server/web/component/issue/statetransition/UseDefaultListener.java
new file mode 100644
index 0000000000..d274b6defb
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/issue/statetransition/UseDefaultListener.java
@@ -0,0 +1,9 @@
+package io.onedev.server.web.component.issue.statetransition;
+
+import java.io.Serializable;
+
+public interface UseDefaultListener extends Serializable {
+
+ void onUseDefault();
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/statetransition/state-transition-list.css b/core/src/main/java/io/onedev/server/web/component/issue/statetransition/state-transition-list.css
new file mode 100644
index 0000000000..869c2f2f15
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/component/issue/statetransition/state-transition-list.css
@@ -0,0 +1,20 @@
+.state-transition-list>.head>a {
+ margin-right: 8px;
+}
+.transition-spec-edit .property-prerequisite>.value .control-label,
+.transition-spec-edit .property-trigger>.value .control-label {
+ font-weight: normal;
+}
+.floating.transition-spec .property-authorized .name {
+ border-right: none;
+ text-align: left;
+}
+.floating.transition-spec .property-authorized .value {
+ white-space: nowrap;
+}
+.floating.transition-spec .property-prerequisite .property-inputName td.name,
+.floating.transition-spec .property-buttonLabel td.name,
+.floating.transition-spec .property-promptFields td.name {
+ border-right: none;
+ text-align: left;
+}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
index 6f3ff7d2cf..515cecafd5 100644
--- a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
+++ b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
@@ -25,6 +25,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.manager.MarkdownManager;
import io.onedev.server.manager.PullRequestManager;
+import io.onedev.server.manager.SettingManager;
import io.onedev.server.manager.UserManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.PullRequest;
@@ -32,9 +33,9 @@ import io.onedev.server.model.User;
import io.onedev.server.model.support.pullrequest.CloseInfo;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.PullRequestConstants;
+import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.page.project.ProjectPage;
-import io.onedev.server.util.userident.UserIdent;
import io.onedev.server.web.util.avatar.AvatarManager;
import io.onedev.utils.ColorUtils;
import io.onedev.utils.StringUtils;
@@ -132,7 +133,7 @@ public class MarkdownViewer extends GenericPanel<String> {
case "issue":
Issue issue = OneDev.getInstance(IssueManager.class).get(Long.valueOf(referenceId));
if (issue != null) {
- String color = issue.getProject().getIssueWorkflow().getStateSpec(issue.getState()).getColor();
+ String color = OneDev.getInstance(SettingManager.class).getIssueSetting().getStateSpec(issue.getState()).getColor();
String script = String.format("onedev.server.markdown.renderIssueTooltip('%s', '%s', '%s', '%s')",
JavaScriptEscape.escapeJavaScript(issue.getTitle()), JavaScriptEscape.escapeJavaScript(issue.getState()),
ColorUtils.isLight(color)? "black": "white", color);
diff --git a/core/src/main/java/io/onedev/server/web/component/milestone/closelink/MilestoneCloseLink.java b/core/src/main/java/io/onedev/server/web/component/milestone/closelink/MilestoneCloseLink.java
index deb11c9176..55cebde542 100644
--- a/core/src/main/java/io/onedev/server/web/component/milestone/closelink/MilestoneCloseLink.java
+++ b/core/src/main/java/io/onedev/server/web/component/milestone/closelink/MilestoneCloseLink.java
@@ -8,7 +8,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import io.onedev.server.OneDev;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.model.Milestone;
-import io.onedev.server.model.support.issue.workflow.StateSpec;
+import io.onedev.server.model.support.issue.StateSpec;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
diff --git a/core/src/main/java/io/onedev/server/web/component/confirmdelete/ConfirmDeleteProjectModal.java b/core/src/main/java/io/onedev/server/web/component/project/ConfirmDeleteProjectModal.java
similarity index 66%
rename from core/src/main/java/io/onedev/server/web/component/confirmdelete/ConfirmDeleteProjectModal.java
rename to core/src/main/java/io/onedev/server/web/component/project/ConfirmDeleteProjectModal.java
index 182135ec23..3ada9495a2 100644
--- a/core/src/main/java/io/onedev/server/web/component/confirmdelete/ConfirmDeleteProjectModal.java
+++ b/core/src/main/java/io/onedev/server/web/component/project/ConfirmDeleteProjectModal.java
@@ -1,24 +1,25 @@
-package io.onedev.server.web.component.confirmdelete;
+package io.onedev.server.web.component.project;
import org.apache.wicket.ajax.AjaxRequestTarget;
import io.onedev.server.OneDev;
import io.onedev.server.manager.ProjectManager;
import io.onedev.server.model.Project;
+import io.onedev.server.web.component.confirmaction.ConfirmActionModal;
@SuppressWarnings("serial")
-public abstract class ConfirmDeleteProjectModal extends ConfirmDeleteModal {
+public abstract class ConfirmDeleteProjectModal extends ConfirmActionModal {
public ConfirmDeleteProjectModal(AjaxRequestTarget target) {
super(target);
}
@Override
- protected void doDelete(AjaxRequestTarget target) {
+ protected void onConfirm(AjaxRequestTarget target) {
Project project = getProject();
OneDev.getInstance(ProjectManager.class).delete(project);
- getSession().success("Repository has been deleted");
+ getSession().success("Project has been deleted");
onDeleted(target);
}
@@ -26,7 +27,7 @@ public abstract class ConfirmDeleteProjectModal extends ConfirmDeleteModal {
protected abstract void onDeleted(AjaxRequestTarget target);
@Override
- protected String getWarningMessage() {
+ protected String getConfirmMessage() {
return "Everything inside this project will be deleted and can not be recovered, "
+ "please input project name \"" + getProject().getName() + "\" below to confirm deletion.";
}
@@ -36,6 +37,10 @@ public abstract class ConfirmDeleteProjectModal extends ConfirmDeleteModal {
return getProject().getName();
}
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ }
+
protected abstract Project getProject();
}
diff --git a/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java b/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java
index e15d7359c1..4140d0513a 100644
--- a/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java
@@ -293,7 +293,20 @@ public class BeanEditor extends ValueEditor<Serializable> {
@Override
public void validate(IValidatable<Serializable> validatable) {
- OneContext.push(new ComponentContext(BeanEditor.this));
+ OneContext.push(new ComponentContext(BeanEditor.this) {
+
+ @Override
+ public OneContext getPropertyContext(String propertyName) {
+ for (Component item: propertiesView) {
+ int propertyIndex = (int) item.getDefaultModelObject();
+ PropertyContext<Serializable> propertyContext = propertyContexts.get(propertyIndex);
+ if (propertyContext.getPropertyName().equals(propertyName))
+ return new ComponentContext(item);
+ }
+ return null;
+ }
+
+ });
try {
Validator validator = AppLoader.getInstance(Validator.class);
for (ConstraintViolation<Serializable> violation: validator.validate(validatable.getValue())) {
diff --git a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.java b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.java
index bd1dac287d..55ea356a84 100644
--- a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.java
+++ b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyViewer.java
@@ -5,6 +5,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.wicket.AttributeModifier;
+import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.list.ListItem;
@@ -43,7 +44,9 @@ public class BeanListPropertyViewer extends Panel {
@Override
protected void populateItem(ListItem<PropertyContext<Serializable>> item) {
- item.add(new Label("header", EditableUtils.getDisplayName(item.getModelObject().getPropertyGetter())));
+ PropertyContext<?> propertyContext = item.getModelObject();
+ item.add(new Label("header", EditableUtils.getDisplayName(propertyContext.getPropertyGetter())));
+ item.add(AttributeAppender.append("class", "property-" + propertyContext.getPropertyName()));
}
});
@@ -58,6 +61,7 @@ public class BeanListPropertyViewer extends Panel {
PropertyContext<Serializable> propertyContext = columnItem.getModelObject();
Serializable elementPropertyValue = (Serializable) propertyContext.getPropertyValue(rowItem.getModelObject());
columnItem.add(propertyContext.renderForView("cell", Model.of(elementPropertyValue)));
+ columnItem.add(AttributeAppender.append("class", "property-" + propertyContext.getPropertyName()));
}
});
diff --git a/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java
index 90bde814a8..87d43efd0c 100644
--- a/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchMultiChoiceEditor.java
@@ -38,8 +38,10 @@ public class BranchMultiChoiceEditor extends PropertyEditor<List<String>> {
@Override
protected Project load() {
- ProjectPage page = (ProjectPage) getPage();
- return page.getProject();
+ if (getPage() instanceof ProjectPage)
+ return ((ProjectPage) getPage()).getProject();
+ else
+ return null;
}
});
diff --git a/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java
index 1f74f28e4f..caf1581380 100644
--- a/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/branchchoice/BranchSingleChoiceEditor.java
@@ -33,8 +33,10 @@ public class BranchSingleChoiceEditor extends PropertyEditor<String> {
@Override
protected Project load() {
- ProjectPage page = (ProjectPage) getPage();
- return page.getProject();
+ if (getPage() instanceof ProjectPage)
+ return ((ProjectPage) getPage()).getProject();
+ else
+ return null;
}
});
diff --git a/core/src/main/java/io/onedev/server/web/editable/issuequery/IssueQueryEditor.java b/core/src/main/java/io/onedev/server/web/editable/issuequery/IssueQueryEditor.java
index 178c9e95bd..b8b5548b59 100644
--- a/core/src/main/java/io/onedev/server/web/editable/issuequery/IssueQueryEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/issuequery/IssueQueryEditor.java
@@ -34,7 +34,10 @@ public class IssueQueryEditor extends PropertyEditor<String> {
@Override
public Project getObject() {
- return ((ProjectPage) getPage()).getProject();
+ if (getPage() instanceof ProjectPage)
+ return ((ProjectPage) getPage()).getProject();
+ else
+ return null;
}
}));
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java b/core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java
index 6bffb2024c..3b6acf5ff2 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/AdministrationPage.java
@@ -15,6 +15,8 @@ import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage;
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.IssueFieldListPage;
+import io.onedev.server.web.page.admin.issuesetting.GlobalIssueSettingPage;
import io.onedev.server.web.page.admin.licensemanagement.LicenseManagementPage;
import io.onedev.server.web.page.admin.mailsetting.MailSettingPage;
import io.onedev.server.web.page.admin.securitysetting.SecuritySettingPage;
@@ -47,6 +49,7 @@ public abstract class AdministrationPage extends LayoutPage {
tabs.add(new AdministrationTab("Group Management", "fa fa-fw fa-group", GroupListPage.class, NewGroupPage.class, GroupPage.class));
tabs.add(new AdministrationTab("System Setting", "fa fa-fw fa-sliders", SystemSettingPage.class));
tabs.add(new AdministrationTab("Security Setting", "fa fa-fw fa-lock", SecuritySettingPage.class));
+ tabs.add(new AdministrationTab("Issue Setting", "fa fa-fw fa-bug", IssueFieldListPage.class, GlobalIssueSettingPage.class));
tabs.add(new AdministrationTab("External Authentication", "fa fa-fw fa-key", AuthenticatorPage.class));
tabs.add(new AdministrationTab("Mail Setting", "fa fa-fw fa-envelope", MailSettingPage.class));
tabs.add(new AdministrationTab("Database Backup", "fa fa-fw fa-database", DatabaseBackupPage.class));
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/StateTransitionsPage.html b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.html
similarity index 56%
rename from core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/StateTransitionsPage.html
rename to core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.html
index 82452f6939..5934e6c834 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/StateTransitionsPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.html
@@ -1,21 +1,26 @@
<wicket:extend>
- <div class="state-transitions list">
+ <div class="issue-boards def-list list">
<div class="head clearfix">
<div class="pull-left">
<a wicket:id="addNew" class="btn btn-default"><i class="fa fa-plus"></i> Add New</a>
</div>
</div>
- <table wicket:id="stateTransitions" class="table table-hover"></table>
+ <div class="body">
+ <table wicket:id="issueBoards" class="table table-hover"></table>
+ </div>
</div>
- <wicket:fragment wicket:id="columnFrag">
+ <wicket:fragment wicket:id="nameColumnFrag">
+ <span class="drag-handle fa fa-arrows" title="Drag to reorder boards"></span>
+ <a wicket:id="link"><span wicket:id="label"></span></a>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="otherColumnFrag">
<a wicket:id="link"><span wicket:id="label"></span></a>
</wicket:fragment>
- <wicket:fragment wicket:id="viewTransitionFrag">
+ <wicket:fragment wicket:id="viewBoardFrag">
<div class="actions">
<a wicket:id="edit" class="btn btn-sm btn-default"><i class="fa fa-pencil"></i> Edit</a>
<a wicket:id="delete" class="btn btn-sm btn-default"><i class="fa fa-trash"></i> Delete</a>
</div>
- <div wicket:id="feedback"></div>
<div wicket:id="viewer"></div>
</wicket:fragment>
</wicket:extend>
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.java b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.java
new file mode 100644
index 0000000000..5368c74d2d
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultBoardListPage.java
@@ -0,0 +1,259 @@
+package io.onedev.server.web.page.admin.issuesetting;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.data.IDataProvider;
+import org.apache.wicket.markup.repeater.data.ListDataProvider;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
+
+import com.google.common.base.Preconditions;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.SettingManager;
+import io.onedev.server.model.support.issue.BoardSpec;
+import io.onedev.server.web.behavior.sortable.SortBehavior;
+import io.onedev.server.web.behavior.sortable.SortPosition;
+import io.onedev.server.web.component.issue.board.BoardEditPanel;
+import io.onedev.server.web.component.modal.ModalLink;
+import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.page.layout.SideFloating;
+import io.onedev.server.web.util.ajaxlistener.ConfirmListener;
+import io.onedev.utils.StringUtils;
+import jersey.repackaged.com.google.common.collect.Sets;
+
+@SuppressWarnings("serial")
+public class DefaultBoardListPage extends GlobalIssueSettingPage {
+
+ private DataTable<BoardSpec, Void> boardsTable;
+
+ private int getBoardSpecIndex(String boardName) {
+ for (int i=0; i<getSetting().getDefaultBoardSpecs().size(); i++) {
+ if (getSetting().getDefaultBoardSpecs().get(i).getName().equals(boardName))
+ return i;
+ }
+ return -1;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new ModalLink("addNew") {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return new BoardEditPanel(id, getSetting().getDefaultBoardSpecs(), -1) {
+
+ @Override
+ protected void onBoardSaved(AjaxRequestTarget target, BoardSpec board) {
+ target.add(boardsTable);
+ modal.close();
+ OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ };
+ }
+
+ });
+
+ List<IColumn<BoardSpec, Void>> columns = new ArrayList<>();
+
+ columns.add(new AbstractColumn<BoardSpec, Void>(Model.of("Name")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<BoardSpec>> cellItem, String componentId, IModel<BoardSpec> rowModel) {
+ Fragment fragment = new Fragment(componentId, "nameColumnFrag", DefaultBoardListPage.this);
+ BoardSpec board = rowModel.getObject();
+ int index = getBoardSpecIndex(board.getName());
+ Preconditions.checkState(index != -1);
+ AjaxLink<Void> link = new AjaxLink<Void>("link") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ newBoardDetail(target, index);
+ }
+
+ };
+ link.add(new Label("label", board.getName()));
+ fragment.add(link);
+ cellItem.add(fragment);
+ }
+ });
+
+ columns.add(new AbstractColumn<BoardSpec, Void>(Model.of("Identify Field")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<BoardSpec>> cellItem, String componentId, IModel<BoardSpec> rowModel) {
+ Fragment fragment = new Fragment(componentId, "otherColumnFrag", DefaultBoardListPage.this);
+ BoardSpec board = rowModel.getObject();
+ int index = getBoardSpecIndex(board.getName());
+ Preconditions.checkState(index != -1);
+ AjaxLink<Void> link = new AjaxLink<Void>("link") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ newBoardDetail(target, index);
+ }
+
+ };
+ link.add(new Label("label", rowModel.getObject().getIdentifyField()));
+ fragment.add(link);
+ cellItem.add(fragment);
+ }
+
+ });
+
+ columns.add(new AbstractColumn<BoardSpec, Void>(Model.of("Columns")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<BoardSpec>> cellItem, String componentId, IModel<BoardSpec> rowModel) {
+ Fragment fragment = new Fragment(componentId, "otherColumnFrag", DefaultBoardListPage.this);
+ BoardSpec board = rowModel.getObject();
+ int index = getBoardSpecIndex(board.getName());
+ Preconditions.checkState(index != -1);
+ AjaxLink<Void> link = new AjaxLink<Void>("link") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ newBoardDetail(target, index);
+ }
+
+ };
+ link.add(new Label("label", StringUtils.join(rowModel.getObject().getColumns())));
+ fragment.add(link);
+ cellItem.add(fragment);
+ }
+
+ });
+
+ IDataProvider<BoardSpec> dataProvider = new ListDataProvider<BoardSpec>() {
+
+ @Override
+ protected List<BoardSpec> getData() {
+ return getSetting().getDefaultBoardSpecs();
+ }
+
+ };
+
+ add(boardsTable = new DataTable<BoardSpec, Void>("issueBoards", columns, dataProvider, Integer.MAX_VALUE));
+ boardsTable.addTopToolbar(new HeadersToolbar<Void>(boardsTable, null));
+ boardsTable.addBottomToolbar(new NoRecordsToolbar(boardsTable));
+ boardsTable.setOutputMarkupId(true);
+
+ boardsTable.add(new SortBehavior() {
+
+ @Override
+ protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {
+ int fromIndex = from.getItemIndex();
+ int toIndex = to.getItemIndex();
+ if (fromIndex < toIndex) {
+ for (int i=0; i<toIndex-fromIndex; i++)
+ Collections.swap(getSetting().getDefaultBoardSpecs(), fromIndex+i, fromIndex+i+1);
+ } else {
+ for (int i=0; i<fromIndex-toIndex; i++)
+ Collections.swap(getSetting().getDefaultBoardSpecs(), fromIndex-i, fromIndex-i-1);
+ }
+
+ OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
+ target.add(boardsTable);
+ }
+
+ }.sortable("tbody").handle(".drag-handle").helperClass("sort-helper"));
+ }
+
+ private void newBoardDetail(AjaxRequestTarget target, int index) {
+ new SideFloating(target, SideFloating.Placement.RIGHT) {
+
+ private BoardSpec getBoard() {
+ return getSetting().getDefaultBoardSpecs().get(index);
+
+ }
+ @Override
+ protected String getTitle() {
+ return getBoard().getName();
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(AttributeAppender.append("class", "board-spec def-detail"));
+ }
+
+ @Override
+ protected Component newBody(String id) {
+ SideFloating sideFloating = this;
+ Fragment fragment = new Fragment(id, "viewBoardFrag", DefaultBoardListPage.this);
+ fragment.add(BeanContext.viewBean("viewer", getBoard(), Sets.newHashSet("name"), true));
+ fragment.add(new ModalLink("edit") {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ sideFloating.close();
+ return new BoardEditPanel(id, getSetting().getDefaultBoardSpecs(), index) {
+
+ @Override
+ protected void onBoardSaved(AjaxRequestTarget target, BoardSpec board) {
+ target.add(boardsTable);
+ modal.close();
+ OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ };
+ }
+
+ });
+ fragment.add(new AjaxLink<Void>("delete") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmListener("Do you really want to delete this board?"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ getSetting().getDefaultBoardSpecs().remove(index);
+ OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
+ target.add(boardsTable);
+ close();
+ }
+
+ });
+
+ fragment.setOutputMarkupId(true);
+
+ return fragment;
+ }
+
+ };
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultQueryListPage.html b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultQueryListPage.html
new file mode 100644
index 0000000000..ea5e674d99
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultQueryListPage.html
@@ -0,0 +1,8 @@
+<wicket:extend>
+ <form wicket:id="form" class="leave-confirm default-queries">
+ <div wicket:id="editor"></div>
+ <div class="actions">
+ <input type="submit" class="btn btn-primary dirty-aware" value="Save">
+ </div>
+ </form>
+</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultQueryListPage.java b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultQueryListPage.java
new file mode 100644
index 0000000000..7904aec8f3
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultQueryListPage.java
@@ -0,0 +1,33 @@
+package io.onedev.server.web.page.admin.issuesetting;
+
+import org.apache.wicket.markup.html.form.Form;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.SettingManager;
+import io.onedev.server.web.editable.PropertyContext;
+
+@SuppressWarnings("serial")
+public class DefaultQueryListPage extends GlobalIssueSettingPage {
+
+ @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.editBean("editor", getSetting(), "defaultQueries"));
+
+ add(form);
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultStateTransitionsPage.html b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultStateTransitionsPage.html
new file mode 100644
index 0000000000..d0b0867add
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultStateTransitionsPage.html
@@ -0,0 +1,3 @@
+<wicket:extend>
+ <div wicket:id="content"></div>
+</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultStateTransitionsPage.java b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultStateTransitionsPage.java
new file mode 100644
index 0000000000..c6800eefa5
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/DefaultStateTransitionsPage.java
@@ -0,0 +1,33 @@
+package io.onedev.server.web.page.admin.issuesetting;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.SettingManager;
+import io.onedev.server.web.component.issue.statetransition.StateTransitionListPanel;
+import io.onedev.server.web.component.issue.statetransition.UseDefaultListener;
+
+@SuppressWarnings("serial")
+public class DefaultStateTransitionsPage extends GlobalIssueSettingPage {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new StateTransitionListPanel("content", getSetting().getDefaultTransitionSpecs()) {
+
+ @Override
+ protected void onChanged(AjaxRequestTarget target) {
+ OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
+ }
+
+ @Override
+ protected UseDefaultListener getUseDefaultListener() {
+ return null;
+ }
+
+ });
+
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldBean.java b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldBean.java
similarity index 56%
rename from core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldBean.java
rename to core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldBean.java
index 8878da6c86..81f6f338d0 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldBean.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldBean.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.setting.issueworkflow.fields;
+package io.onedev.server.web.page.admin.issuesetting;
import java.io.Serializable;
@@ -14,7 +14,9 @@ public class FieldBean implements Serializable {
private InputSpec field;
- private boolean promptUponIssueOpen;
+ private boolean promptUponIssueOpen = true;
+
+ private boolean displayInIssueList = true;
@Editable(name="Type", order=100)
@NotNull(message="may not be empty")
@@ -26,8 +28,7 @@ public class FieldBean implements Serializable {
this.field = field;
}
- @Editable(order=200, description="Whether or not to prompt this field when the issue is opened. You may also "
- + "choose to prompt the field when issue transits to other states in state transition definitions")
+ @Editable(order=200, description="If checked, this field will be prompted for user input by default when issue is opened")
public boolean isPromptUponIssueOpen() {
return promptUponIssueOpen;
}
@@ -35,5 +36,14 @@ public class FieldBean implements Serializable {
public void setPromptUponIssueOpen(boolean promptUponIssueOpen) {
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/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldEditPanel.html b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.html
similarity index 80%
rename from core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldEditPanel.html
rename to core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.html
index f415ce1e8c..76a12dc065 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldEditPanel.html
+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.html
@@ -1,5 +1,5 @@
<wicket:panel>
- <form wicket:id="form" class="field-edit leave-confirm">
+ <form wicket:id="form" class="field-spec-edit leave-confirm">
<div class="modal-header">
<button wicket:id="close" type="button" class="close">&times;</button>
<h4 id="modal-title" class="modal-title">
@@ -10,7 +10,7 @@
<div wicket:id="editor"></div>
</div>
<div class="modal-footer">
- <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save"></input>
+ <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save">
<a wicket:id="cancel" class="btn btn-default">Cancel</a>
</div>
</form>
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.java b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.java
new file mode 100644
index 0000000000..c09a5503ab
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/FieldEditPanel.java
@@ -0,0 +1,213 @@
+package io.onedev.server.web.page.admin.issuesetting;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.commons.lang3.SerializationUtils;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+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.OneDev;
+import io.onedev.server.manager.SettingManager;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
+import io.onedev.server.util.IssueConstants;
+import io.onedev.server.util.ValueSetEdit;
+import io.onedev.server.util.inputspec.InputContext;
+import io.onedev.server.util.inputspec.InputSpec;
+import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;
+import io.onedev.server.util.inputspec.choiceinput.choiceprovider.Choice;
+import io.onedev.server.util.inputspec.choiceinput.choiceprovider.SpecifiedChoices;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.editable.BeanEditor;
+import io.onedev.server.web.editable.PathSegment;
+import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;
+
+@SuppressWarnings("serial")
+abstract class FieldEditPanel extends Panel implements InputContext {
+
+ private final int fieldIndex;
+
+ public FieldEditPanel(String id, int fieldIndex) {
+ super(id);
+
+ this.fieldIndex = fieldIndex;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ FieldBean bean = new FieldBean();
+ 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") {
+
+ @Override
+ protected void onError() {
+ super.onError();
+ RequestCycle.get().find(AjaxRequestTarget.class).add(this);
+ }
+
+ };
+
+ form.add(new AjaxLink<Void>("close") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(FieldEditPanel.this));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+
+ BeanEditor editor = BeanContext.editBean("editor", bean);
+ form.add(editor);
+ form.add(new AjaxButton("save") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+
+ InputSpec field = bean.getField();
+ if (fieldIndex != -1) {
+ InputSpec oldField = getSetting().getFieldSpecs().get(fieldIndex);
+ if (!field.getName().equals(oldField.getName()) && getSetting().getFieldSpec(field.getName()) != null) {
+ editor.getErrorContext(new PathSegment.Property("field"))
+ .getErrorContext(new PathSegment.Property("name"))
+ .addError("This name has already been used by another field");
+ }
+ } else if (getSetting().getFieldSpec(field.getName()) != null) {
+ editor.getErrorContext(new PathSegment.Property("field"))
+ .getErrorContext(new PathSegment.Property("name"))
+ .addError("This name has already been used by another field");
+ }
+
+ if (!editor.hasErrors(true)) {
+ if (fieldIndex != -1) {
+ InputSpec oldField = getSetting().getFieldSpecs().get(fieldIndex);
+ getSetting().getFieldSpecs().set(fieldIndex, field);
+ getSetting().getDefaultPromptFieldsUponIssueOpen().remove(oldField.getName());
+ getSetting().getDefaultListFields().remove(oldField.getName());
+ if (!field.getName().equals(oldField.getName())) {
+ getSetting().onRenameField(oldField.getName(), field.getName());
+ getSetting().setReconciled(false);
+ }
+ if (oldField instanceof ChoiceInput && field instanceof ChoiceInput) {
+ ChoiceInput oldChoiceInput = (ChoiceInput) oldField;
+ ChoiceInput choiceInput = (ChoiceInput) field;
+ if (oldChoiceInput.getChoiceProvider() instanceof SpecifiedChoices
+ && choiceInput.getChoiceProvider() instanceof SpecifiedChoices) {
+ SpecifiedChoices oldChoices = (SpecifiedChoices) oldChoiceInput.getChoiceProvider();
+ SpecifiedChoices choices = (SpecifiedChoices) choiceInput.getChoiceProvider();
+ Map<String, String> valueRenames = new HashMap<>();
+ Set<String> valueDeletions = new HashSet<>();
+ Map<String, String> uuid2value = new HashMap<>();
+ Map<String, Integer> uuid2order = new HashMap<>();
+ for (int i=0; i<choices.getChoices().size(); i++) {
+ Choice choice = choices.getChoices().get(i);
+ uuid2value.put(choice.getUuid(), choice.getValue());
+ uuid2order.put(choice.getUuid(), i);
+ }
+ for (int i=0; i<oldChoices.getChoices().size(); i++) {
+ Choice oldChoice = oldChoices.getChoices().get(i);
+ String newValue = uuid2value.get(oldChoice.getUuid());
+ if (newValue != null) {
+ if (!newValue.equals(oldChoice.getValue())) {
+ valueRenames.put(oldChoice.getValue(), newValue);
+ getSetting().setReconciled(false);
+ }
+ } else {
+ valueDeletions.add(oldChoice.getValue());
+ getSetting().setReconciled(false);
+ }
+ Integer newOrder = uuid2order.get(oldChoice.getUuid());
+ if (newOrder == null || newOrder != i)
+ getSetting().setReconciled(false);
+ }
+ if (!valueRenames.isEmpty() || !valueDeletions.isEmpty()) {
+ getSetting().onEditFieldValues(field.getName(), new ValueSetEdit(valueRenames, valueDeletions));
+ }
+ }
+ }
+ } else {
+ getSetting().getFieldSpecs().add(field);
+ }
+ 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 {
+ target.add(form);
+ }
+ }
+
+ });
+
+ form.add(new AjaxLink<Void>("cancel") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(FieldEditPanel.this));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+ form.setOutputMarkupId(true);
+
+ add(form);
+ }
+
+ protected abstract GlobalIssueSetting getSetting();
+
+ protected abstract void onSave(AjaxRequestTarget target);
+
+ protected abstract void onCancel(AjaxRequestTarget target);
+
+ @Override
+ public List<String> getInputNames() {
+ List<String> inputNames = new ArrayList<>();
+ int currentIndex = 0;
+ for (InputSpec field: getSetting().getFieldSpecs()) {
+ if (currentIndex != fieldIndex)
+ inputNames.add(field.getName());
+ currentIndex++;
+ }
+ return inputNames;
+ }
+
+ @Override
+ public InputSpec getInputSpec(String inputName) {
+ return getSetting().getFieldSpec(inputName);
+ }
+
+ @Override
+ public boolean isReservedName(String inputName) {
+ return IssueConstants.ALL_FIELDS.contains(inputName);
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/GlobalIssueSettingPage.html b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/GlobalIssueSettingPage.html
new file mode 100644
index 0000000000..cdc3b18356
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/GlobalIssueSettingPage.html
@@ -0,0 +1,6 @@
+<wicket:extend>
+ <div id="issue-setting">
+ <ul wicket:id="issueSettingTabs" class="tabs nav nav-tabs"></ul>
+ <wicket:child></wicket:child>
+ </div>
+</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/GlobalIssueSettingPage.java b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/GlobalIssueSettingPage.java
new file mode 100644
index 0000000000..f9afe19d32
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/GlobalIssueSettingPage.java
@@ -0,0 +1,49 @@
+package io.onedev.server.web.page.admin.issuesetting;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.model.Model;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.SettingManager;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
+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 {
+
+ private final GlobalIssueSetting setting;
+
+ public GlobalIssueSettingPage() {
+ setting = OneDev.getInstance(SettingManager.class).getIssueSetting();
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ List<Tab> tabs = new ArrayList<>();
+ tabs.add(new PageTab(Model.of("Custom Fields"), IssueFieldListPage.class));
+ 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() {
+ return setting;
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new GlobalIssueSettingResourceReference()));
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/GlobalIssueSettingResourceReference.java b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/GlobalIssueSettingResourceReference.java
new file mode 100644
index 0000000000..eeb6407458
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/GlobalIssueSettingResourceReference.java
@@ -0,0 +1,13 @@
+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/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.html b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.html
similarity index 81%
rename from core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.html
rename to core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.html
index 4509ef5696..7cbaed953d 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.html
@@ -1,5 +1,5 @@
<wicket:extend>
- <div class="issue-fields list">
+ <div class="issue-fields def-list list">
<div class="head clearfix">
<div class="pull-left">
<a wicket:id="addNew" class="btn btn-default"><i class="fa fa-plus"></i> Add New</a>
@@ -8,7 +8,7 @@
<table wicket:id="issueFields" class="table table-hover"></table>
</div>
<wicket:fragment wicket:id="nameColumnFrag">
- <span class="drag-handle fa fa-arrows" title="Drag to reorder fields"></span>
+ <span class="drag-handle fa fa-arrows" title="Drag to reorder"></span>
<a wicket:id="link"><span wicket:id="label"></span></a>
</wicket:fragment>
<wicket:fragment wicket:id="otherColumnFrag">
@@ -19,7 +19,7 @@
<a wicket:id="edit" class="btn btn-sm btn-default"><i class="fa fa-pencil"></i> Edit</a>
<a wicket:id="delete" class="btn btn-sm btn-default"><i class="fa fa-trash"></i> Delete</a>
</div>
- <div wicket:id="feedback"></div>
- <div wicket:id="viewer"></div>
+ <div wicket:id="viewer1"></div>
+ <div wicket:id="viewer2"></div>
</wicket:fragment>
</wicket:extend>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.java b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java
similarity index 72%
rename from core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.java
rename to core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java
index 5e2b32e1e0..81a141c02d 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.setting.issueworkflow.fields;
+package io.onedev.server.web.page.admin.issuesetting;
import java.util.ArrayList;
import java.util.Collections;
@@ -15,8 +15,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.repeater.Item;
@@ -24,14 +22,12 @@ import org.apache.wicket.markup.repeater.data.IDataProvider;
import org.apache.wicket.markup.repeater.data.ListDataProvider;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.google.common.base.Preconditions;
-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import io.onedev.server.OneDev;
-import io.onedev.server.manager.ProjectManager;
-import io.onedev.server.model.support.issue.workflow.IssueWorkflow;
+import io.onedev.server.manager.SettingManager;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
@@ -40,20 +36,15 @@ import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.page.layout.SideFloating;
-import io.onedev.server.web.page.project.setting.issueworkflow.IssueWorkflowPage;
import io.onedev.server.web.util.ajaxlistener.ConfirmListener;
import io.onedev.utils.StringUtils;
import jersey.repackaged.com.google.common.collect.Sets;
@SuppressWarnings("serial")
-public class IssueFieldsPage extends IssueWorkflowPage {
+public class IssueFieldListPage extends GlobalIssueSettingPage {
private DataTable<InputSpec, Void> fieldsTable;
- public IssueFieldsPage(PageParameters params) {
- super(params);
- }
-
@Override
protected void onInitialize() {
super.onInitialize();
@@ -76,8 +67,8 @@ public class IssueFieldsPage extends IssueWorkflowPage {
}
@Override
- protected IssueWorkflow getWorkflow() {
- return IssueFieldsPage.this.getWorkflow();
+ protected GlobalIssueSetting getSetting() {
+ return IssueFieldListPage.this.getSetting();
}
};
@@ -104,12 +95,22 @@ public class IssueFieldsPage extends IssueWorkflowPage {
}
});
- columns.add(new AbstractColumn<InputSpec, Void>(Model.of("Prompt upon issue open")) {
+ columns.add(new AbstractColumn<InputSpec, Void>(Model.of("Prompt upon Issue Open")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {
+ InputSpec field = rowModel.getObject();
+ String label = StringUtils.describe(getSetting().getDefaultPromptFieldsUponIssueOpen().contains(field.getName()));
+ cellItem.add(new ColumnFragment(componentId, rowModel, label, false));
+ }
+ });
+
+ columns.add(new AbstractColumn<InputSpec, Void>(Model.of("Display in Issue List")) {
@Override
public void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {
InputSpec field = rowModel.getObject();
- String label = StringUtils.describe(getWorkflow().getPromptFieldsUponIssueOpen().contains(field.getName()));
+ String label = StringUtils.describe(getSetting().getDefaultListFields().contains(field.getName()));
cellItem.add(new ColumnFragment(componentId, rowModel, label, false));
}
});
@@ -118,7 +119,7 @@ public class IssueFieldsPage extends IssueWorkflowPage {
@Override
protected List<InputSpec> getData() {
- return getWorkflow().getFieldSpecs();
+ return getSetting().getFieldSpecs();
}
};
@@ -136,26 +137,27 @@ public class IssueFieldsPage extends IssueWorkflowPage {
int toIndex = to.getItemIndex();
if (fromIndex < toIndex) {
for (int i=0; i<toIndex-fromIndex; i++)
- Collections.swap(getWorkflow().getFieldSpecs(), fromIndex+i, fromIndex+i+1);
+ Collections.swap(getSetting().getFieldSpecs(), fromIndex+i, fromIndex+i+1);
} else {
for (int i=0; i<fromIndex-toIndex; i++)
- Collections.swap(getWorkflow().getFieldSpecs(), fromIndex-i, fromIndex-i-1);
+ Collections.swap(getSetting().getFieldSpecs(), fromIndex-i, fromIndex-i-1);
}
- getProject().setIssueWorkflow(getWorkflow());
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
target.add(fieldsTable);
}
}.sortable("tbody").handle(".drag-handle").helperClass("sort-helper"));
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new IssueFieldsResourceReference()));
+ private int getFieldSpecIndex(String fieldName) {
+ for (int i=0; i<getSetting().getFieldSpecs().size(); i++) {
+ if (getSetting().getFieldSpecs().get(i).getName().equals(fieldName))
+ return i;
+ }
+ return -1;
}
-
+
private class ColumnFragment extends Fragment {
private final int index;
@@ -163,8 +165,8 @@ public class IssueFieldsPage extends IssueWorkflowPage {
private final String label;
public ColumnFragment(String id, IModel<InputSpec> model, String label, boolean nameColumn) {
- super(id, nameColumn?"nameColumnFrag":"otherColumnFrag", IssueFieldsPage.this, model);
- this.index = getWorkflow().getFieldSpecIndex(getField().getName());
+ super(id, nameColumn?"nameColumnFrag":"otherColumnFrag", IssueFieldListPage.this, model);
+ this.index = getFieldSpecIndex(getField().getName());
Preconditions.checkState(this.index != -1);
this.label = label;
}
@@ -190,14 +192,18 @@ public class IssueFieldsPage extends IssueWorkflowPage {
@Override
protected void onInitialize() {
super.onInitialize();
- add(AttributeAppender.append("class", "field-view"));
+ add(AttributeAppender.append("class", "field-spec def-detail"));
}
@Override
protected Component newBody(String id) {
SideFloating sideFloating = this;
- Fragment fragment = new Fragment(id, "viewFieldFrag", IssueFieldsPage.this);
- fragment.add(BeanContext.viewBean("viewer", getField(), Sets.newHashSet("name"), true));
+ Fragment fragment = new Fragment(id, "viewFieldFrag", IssueFieldListPage.this);
+ fragment.add(BeanContext.viewBean("viewer1", getField(), Sets.newHashSet("name"), true));
+ FieldBean bean = new FieldBean();
+ bean.setPromptUponIssueOpen(getSetting().getDefaultPromptFieldsUponIssueOpen().contains(getField().getName()));
+ bean.setDisplayInIssueList(getSetting().getDefaultListFields().contains(getField().getName()));
+ fragment.add(BeanContext.viewBean("viewer2", bean, Sets.newHashSet("field"), true));
fragment.add(new ModalLink("edit") {
@Override
@@ -217,8 +223,8 @@ public class IssueFieldsPage extends IssueWorkflowPage {
}
@Override
- protected IssueWorkflow getWorkflow() {
- return IssueFieldsPage.this.getWorkflow();
+ protected GlobalIssueSetting getSetting() {
+ return IssueFieldListPage.this.getSetting();
}
};
@@ -235,18 +241,18 @@ public class IssueFieldsPage extends IssueWorkflowPage {
@Override
public void onClick(AjaxRequestTarget target) {
- getWorkflow().getFieldSpecs().remove(index);
- getWorkflow().onDeleteField(getField().getName());
- getWorkflow().setReconciled(false);
- getProject().setIssueWorkflow(getWorkflow());
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ getSetting().getFieldSpecs().remove(index);
+ getSetting().getDefaultPromptFieldsUponIssueOpen().remove(getField().getName());
+ getSetting().getDefaultListFields().remove(getField().getName());
+ getSetting().onDeleteField(getField().getName());
+ getSetting().setReconciled(false);
+ OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
target.add(fieldsTable);
close();
}
});
- fragment.add(new NotificationPanel("feedback", fragment));
fragment.setOutputMarkupId(true);
return fragment;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.properties b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.properties
similarity index 100%
rename from core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsPage.properties
rename to core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.properties
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.html b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.html
similarity index 90%
rename from core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.html
rename to core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.html
index bfe9027377..b44e8cd3ed 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.html
@@ -1,5 +1,5 @@
<wicket:extend>
- <div class="issue-states list">
+ <div class="issue-states def-list list">
<div class="head clearfix">
<div class="pull-left">
<a wicket:id="addNew" class="btn btn-default"><i class="fa fa-plus"></i> Add New</a>
@@ -11,7 +11,7 @@
</div>
</div>
<wicket:fragment wicket:id="nameColumnFrag">
- <span class="drag-handle fa fa-arrows" title="Drag to reorder states"></span>
+ <span class="drag-handle fa fa-arrows" title="Drag to reorder"></span>
<a wicket:id="link"><span wicket:id="label"></span> <label wicket:id="initial" class="label label-default">Initial</label></a>
</wicket:fragment>
<wicket:fragment wicket:id="otherColumnFrag">
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.java b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.java
similarity index 78%
rename from core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.java
rename to core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.java
index 03b7fa90f1..b9a9c2bbfd 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.setting.issueworkflow.states;
+package io.onedev.server.web.page.admin.issuesetting;
import java.util.ArrayList;
import java.util.Collections;
@@ -16,8 +16,6 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
-import org.apache.wicket.markup.head.CssHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Fragment;
@@ -26,34 +24,36 @@ import org.apache.wicket.markup.repeater.data.IDataProvider;
import org.apache.wicket.markup.repeater.data.ListDataProvider;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
import com.google.common.base.Preconditions;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import io.onedev.server.OneDev;
-import io.onedev.server.manager.ProjectManager;
-import io.onedev.server.model.support.issue.workflow.IssueWorkflow;
-import io.onedev.server.model.support.issue.workflow.StateSpec;
+import io.onedev.server.manager.SettingManager;
+import io.onedev.server.model.support.issue.StateSpec;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.page.layout.SideFloating;
-import io.onedev.server.web.page.project.setting.issueworkflow.IssueWorkflowPage;
import io.onedev.server.web.util.ajaxlistener.ConfirmListener;
import jersey.repackaged.com.google.common.collect.Sets;
@SuppressWarnings("serial")
-public class IssueStatesPage extends IssueWorkflowPage {
+public class IssueStateListPage extends GlobalIssueSettingPage {
private DataTable<StateSpec, Void> statesTable;
- public IssueStatesPage(PageParameters params) {
- super(params);
+ private int getStateSpecIndex(String stateName) {
+ for (int i=0; i<getSetting().getStateSpecs().size(); i++) {
+ if (getSetting().getStateSpecs().get(i).getName().equals(stateName))
+ return i;
+ }
+ return -1;
}
-
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -76,8 +76,8 @@ public class IssueStatesPage extends IssueWorkflowPage {
}
@Override
- protected IssueWorkflow getWorkflow() {
- return IssueStatesPage.this.getWorkflow();
+ protected GlobalIssueSetting getSetting() {
+ return IssueStateListPage.this.getSetting();
}
};
@@ -91,9 +91,9 @@ public class IssueStatesPage extends IssueWorkflowPage {
@Override
public void populateItem(Item<ICellPopulator<StateSpec>> cellItem, String componentId, IModel<StateSpec> rowModel) {
- Fragment fragment = new Fragment(componentId, "nameColumnFrag", IssueStatesPage.this);
+ Fragment fragment = new Fragment(componentId, "nameColumnFrag", IssueStateListPage.this);
StateSpec state = rowModel.getObject();
- int index = getWorkflow().getStateSpecIndex(state.getName());
+ int index = getStateSpecIndex(state.getName());
Preconditions.checkState(index != -1);
AjaxLink<Void> link = new AjaxLink<Void>("link") {
@@ -114,9 +114,9 @@ public class IssueStatesPage extends IssueWorkflowPage {
@Override
public void populateItem(Item<ICellPopulator<StateSpec>> cellItem, String componentId, IModel<StateSpec> rowModel) {
- Fragment fragment = new Fragment(componentId, "otherColumnFrag", IssueStatesPage.this);
+ Fragment fragment = new Fragment(componentId, "otherColumnFrag", IssueStateListPage.this);
StateSpec state = rowModel.getObject();
- int index = getWorkflow().getStateSpecIndex(state.getName());
+ int index = getStateSpecIndex(state.getName());
Preconditions.checkState(index != -1);
AjaxLink<Void> link = new AjaxLink<Void>("link") {
@@ -137,9 +137,9 @@ public class IssueStatesPage extends IssueWorkflowPage {
@Override
public void populateItem(Item<ICellPopulator<StateSpec>> cellItem, String componentId, IModel<StateSpec> rowModel) {
- Fragment fragment = new Fragment(componentId, "otherColumnFrag", IssueStatesPage.this);
+ Fragment fragment = new Fragment(componentId, "otherColumnFrag", IssueStateListPage.this);
StateSpec state = rowModel.getObject();
- int index = getWorkflow().getStateSpecIndex(state.getName());
+ int index = getStateSpecIndex(state.getName());
Preconditions.checkState(index != -1);
AjaxLink<Void> link = new AjaxLink<Void>("link") {
@@ -161,7 +161,7 @@ public class IssueStatesPage extends IssueWorkflowPage {
@Override
protected List<StateSpec> getData() {
- return getWorkflow().getStateSpecs();
+ return getSetting().getStateSpecs();
}
};
@@ -179,33 +179,26 @@ public class IssueStatesPage extends IssueWorkflowPage {
int toIndex = to.getItemIndex();
if (fromIndex < toIndex) {
for (int i=0; i<toIndex-fromIndex; i++)
- Collections.swap(getWorkflow().getStateSpecs(), fromIndex+i, fromIndex+i+1);
+ Collections.swap(getSetting().getStateSpecs(), fromIndex+i, fromIndex+i+1);
} else {
for (int i=0; i<fromIndex-toIndex; i++)
- Collections.swap(getWorkflow().getStateSpecs(), fromIndex-i, fromIndex-i-1);
+ Collections.swap(getSetting().getStateSpecs(), fromIndex-i, fromIndex-i-1);
}
- getProject().setIssueWorkflow(getWorkflow());
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
target.add(statesTable);
}
}.sortable("tbody").handle(".drag-handle").helperClass("sort-helper"));
}
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new IssueStatesResourceReference()));
- }
-
private void newStateDetail(AjaxRequestTarget target, int index) {
new SideFloating(target, SideFloating.Placement.RIGHT) {
private StateSpec getState() {
- return getWorkflow().getStateSpecs().get(index);
-
+ return getSetting().getStateSpecs().get(index);
}
+
@Override
protected String getTitle() {
return getState().getName();
@@ -214,13 +207,13 @@ public class IssueStatesPage extends IssueWorkflowPage {
@Override
protected void onInitialize() {
super.onInitialize();
- add(AttributeAppender.append("class", "state-spec"));
+ add(AttributeAppender.append("class", "state-spec def-detail"));
}
@Override
protected Component newBody(String id) {
SideFloating sideFloating = this;
- Fragment fragment = new Fragment(id, "viewStateFrag", IssueStatesPage.this);
+ Fragment fragment = new Fragment(id, "viewStateFrag", IssueStateListPage.this);
fragment.add(BeanContext.viewBean("viewer", getState(), Sets.newHashSet("name"), true));
fragment.add(new ModalLink("edit") {
@@ -241,8 +234,8 @@ public class IssueStatesPage extends IssueWorkflowPage {
}
@Override
- protected IssueWorkflow getWorkflow() {
- return IssueStatesPage.this.getWorkflow();
+ protected GlobalIssueSetting getSetting() {
+ return IssueStateListPage.this.getSetting();
}
};
@@ -259,12 +252,11 @@ public class IssueStatesPage extends IssueWorkflowPage {
@Override
public void onClick(AjaxRequestTarget target) {
- String stateName = getState().getName();
- getWorkflow().getStateSpecs().remove(index);
- getWorkflow().onDeleteState(stateName);
- getWorkflow().setReconciled(false);
- getProject().setIssueWorkflow(getWorkflow());
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ StateSpec state = getState();
+ getSetting().getStateSpecs().remove(index);
+ getSetting().onDeleteState(state.getName());
+ getSetting().setReconciled(false);
+ OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
target.add(statesTable);
close();
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/StateEditPanel.html b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.html
similarity index 80%
rename from core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/StateEditPanel.html
rename to core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.html
index 3ce5561d35..1cc46af3ff 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/StateEditPanel.html
+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.html
@@ -1,5 +1,5 @@
<wicket:panel>
- <form wicket:id="form" class="state-edit leave-confirm">
+ <form wicket:id="form" class="state-spec-edit leave-confirm">
<div class="modal-header">
<button wicket:id="close" type="button" class="close">&times;</button>
<h4 id="modal-title" class="modal-title">
@@ -10,7 +10,7 @@
<div wicket:id="editor"></div>
</div>
<div class="modal-footer">
- <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save"></input>
+ <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save">
<a wicket:id="cancel" class="btn btn-default">Cancel</a>
</div>
</form>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/StateEditPanel.java b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.java
similarity index 70%
rename from core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/StateEditPanel.java
rename to core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.java
index 2701a5ffb0..fc0ccdf077 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/StateEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/StateEditPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.page.project.setting.issueworkflow.states;
+package io.onedev.server.web.page.admin.issuesetting;
import org.apache.commons.lang3.SerializationUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -10,14 +10,12 @@ import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.request.cycle.RequestCycle;
import io.onedev.server.OneDev;
-import io.onedev.server.manager.ProjectManager;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.support.issue.workflow.IssueWorkflow;
-import io.onedev.server.model.support.issue.workflow.StateSpec;
+import io.onedev.server.manager.SettingManager;
+import io.onedev.server.model.support.issue.StateSpec;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.editable.PathSegment;
-import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;
@SuppressWarnings("serial")
@@ -31,18 +29,13 @@ abstract class StateEditPanel extends Panel {
this.stateIndex = stateIndex;
}
- private Project getProject() {
- ProjectPage page = (ProjectPage) getPage();
- return page.getProject();
- }
-
@Override
protected void onInitialize() {
super.onInitialize();
StateSpec state;
if (stateIndex != -1)
- state = SerializationUtils.clone(getWorkflow().getStateSpecs().get(stateIndex));
+ state = SerializationUtils.clone(getSetting().getStateSpecs().get(stateIndex));
else
state = new StateSpec();
@@ -80,29 +73,28 @@ abstract class StateEditPanel extends Panel {
super.onSubmit(target, form);
if (stateIndex != -1) {
- StateSpec oldState = getWorkflow().getStateSpecs().get(stateIndex);
- if (!state.getName().equals(oldState.getName()) && getWorkflow().getStateSpec(state.getName()) != null) {
+ StateSpec oldState = getSetting().getStateSpecs().get(stateIndex);
+ if (!state.getName().equals(oldState.getName()) && getSetting().getStateSpec(state.getName()) != null) {
editor.getErrorContext(new PathSegment.Property("name"))
.addError("This name has already been used by another state");
}
- } else if (getWorkflow().getStateSpec(state.getName()) != null) {
+ } else if (getSetting().getStateSpec(state.getName()) != null) {
editor.getErrorContext(new PathSegment.Property("name"))
.addError("This name has already been used by another state");
}
if (!editor.hasErrors(true)) {
if (stateIndex != -1) {
- StateSpec oldState = getWorkflow().getStateSpecs().get(stateIndex);
+ StateSpec oldState = getSetting().getStateSpecs().get(stateIndex);
+ getSetting().getStateSpecs().set(stateIndex, state);
if (!state.getName().equals(oldState.getName())) {
- getWorkflow().onRenameState(oldState.getName(), state.getName());
- getWorkflow().setReconciled(false);
+ getSetting().onRenameState(oldState.getName(), state.getName());
+ getSetting().setReconciled(false);
}
- getWorkflow().getStateSpecs().set(stateIndex, state);
} else {
- getWorkflow().getStateSpecs().add(state);
+ getSetting().getStateSpecs().add(state);
}
- getProject().setIssueWorkflow(getWorkflow());
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ OneDev.getInstance(SettingManager.class).saveIssueSetting(getSetting());
onSave(target);
} else {
target.add(form);
@@ -130,7 +122,7 @@ abstract class StateEditPanel extends Panel {
add(form);
}
- protected abstract IssueWorkflow getWorkflow();
+ protected abstract GlobalIssueSetting getSetting();
protected abstract void onSave(AjaxRequestTarget target);
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issue-setting.css b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issue-setting.css
new file mode 100644
index 0000000000..3454a0aac1
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/issue-setting.css
@@ -0,0 +1,49 @@
+.floating.field-spec td.name {
+ min-width: 150px !important;
+}
+
+.floating.field-spec .property-showCondition .property-inputName td.name,
+.floating.field-spec .property-choicesProvider .property-inputName td.name,
+.floating.field-spec .property-defaultValueProvider .property-inputName td.name {
+ border-right: none;
+ text-align: left;
+}
+
+.field-spec-edit .property-showCondition>.value label,
+.field-spec-edit .property-choicesProvider>.value label.name,
+.field-spec-edit .property-choicesProvider>.value .bean.list thead th,
+.field-spec-edit .property-nameOfEmptyValue .control-label {
+ font-weight: normal;
+}
+.floating.field-spec .property-uuid, .field-spec-edit .property-uuid {
+ display: none;
+}
+#issue-setting .issue-states table>tbody>tr>td:first-child a span {
+ border-radius: 3px;
+ padding: 2px 6px;
+ margin-right: 8px;
+}
+#issue-setting .issue-states table .color span {
+ display: block;
+ width: 24px;
+ height: 24px;
+ border-radius: 3px;
+}
+
+#issue-setting .default-queries th {
+ font-weight: bold !important;
+ padding-bottom: 12px;
+}
+#issue-setting .default-queries td {
+ padding: 8px 16px 8px 0;
+}
+#issue-setting .default-queries>.property.editor {
+ padding: 10px;
+ border-radius: 4px;
+ background: #F9F9F9;
+ border: 1px solid #E8E8E8;
+}
+#issue-setting .default-queries .editable .bean.list>thead>tr>th {
+ border-bottom: none;
+ padding-bottom: 4px;
+}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.html b/core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.html
index aeb24d766f..93d5690ba1 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/admin/systemsetting/SystemSettingPage.html
@@ -2,7 +2,7 @@
<form wicket:id="form" class="leave-confirm">
<div wicket:id="editor"></div>
<div class="actions">
- <input type="submit" class="btn btn-primary dirty-aware" value="Update setting"></input>
+ <input type="submit" class="btn btn-primary dirty-aware" value="Update setting">
</div>
</form>
</wicket:extend>
diff --git a/core/src/main/java/io/onedev/server/web/page/base/base.css b/core/src/main/java/io/onedev/server/web/page/base/base.css
index 13004f9016..e232f70456 100644
--- a/core/src/main/java/io/onedev/server/web/page/base/base.css
+++ b/core/src/main/java/io/onedev/server/web/page/base/base.css
@@ -628,4 +628,42 @@ a.disabled, a[disabled="disabled"] {
.nav.nav-tabs>li.options {
float: right;
+}
+
+.def-list table>tbody>tr>td {
+ padding: 0;
+}
+.def-list table td.norecords-td {
+ padding: 5px;
+}
+.def-list table a {
+ display: block;
+ color: #666;
+ text-decoration: none;
+ padding: 5px;
+}
+.def-list table a {
+ display: block;
+ color: #666;
+ text-decoration: none;
+ padding: 8px;
+}
+.def-list table>tbody>tr>td:first-child>div {
+ position: relative;
+ top: 0;
+}
+.def-list table>tbody>tr>td:first-child>div>.drag-handle {
+ position: absolute;
+ left: 6px;
+ top: 10px;
+}
+.def-list table>tbody>tr>td:first-child>div>a {
+ margin-left: 16px;
+}
+
+.floating.side.def-detail {
+ width: 480px;
+}
+.floating.side.def-detail .actions {
+ margin-bottom: 12px;
}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/base/base.js b/core/src/main/java/io/onedev/server/web/page/base/base.js
index c80e2c9232..d990261a0a 100644
--- a/core/src/main/java/io/onedev/server/web/page/base/base.js
+++ b/core/src/main/java/io/onedev/server/web/page/base/base.js
@@ -100,12 +100,15 @@ onedev.server = {
onedev.server.form.dirtyChanged($(this));
});
},
- trackDirty: function(form) {
- var $form = $(form);
- if ($form.find(".dirty-aware").length != 0 || $form.hasClass("leave-confirm")) {
+ trackDirty: function(container) {
+ var $form = $(container);
+ if (!$form.is("form")) {
+ $form = $form.closest("form");
+ }
+ if ($form.length != 0 && ($form.find(".dirty-aware").length != 0 || $form.hasClass("leave-confirm"))) {
var fieldSelector = ":input:not(.no-dirtytrack):not(input[type=submit]):not(input[type=button]):not(button)";
var events = "change keyup propertychange input";
- $form.find(fieldSelector).on(events, function() {
+ $(container).find(fieldSelector).on(events, function() {
onedev.server.form.markDirty($form);
});
if ($form.find(".has-error").length != 0) {
@@ -134,12 +137,10 @@ onedev.server = {
$(document).on("elementReplaced", function(event, componentId) {
var $component = $("#" + componentId);
- var $forms = $component.find("form");
- if ($component.is("form"))
- $forms = $forms.add($component);
- $forms.each(function() {
+ $component.find("form").each(function() {
onedev.server.form.trackDirty(this);
});
+ onedev.server.form.trackDirty($component[0]);
});
if (Wicket && Wicket.Ajax) {
diff --git a/core/src/main/java/io/onedev/server/web/page/error/error-page.css b/core/src/main/java/io/onedev/server/web/page/error/error-page.css
index ee93f90f59..75f240b81e 100644
--- a/core/src/main/java/io/onedev/server/web/page/error/error-page.css
+++ b/core/src/main/java/io/onedev/server/web/page/error/error-page.css
@@ -10,7 +10,7 @@ body.error .center-box>div {
}
body.error .center-box>.title {
- font-size: 20px;
+ font-size: 24px;
font-weight: bold;
border: none;
background: none;
diff --git a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
index 6544eda2fb..dddef62237 100644
--- a/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
@@ -30,6 +30,7 @@ import io.onedev.server.web.page.admin.user.UserListPage;
import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.page.my.MyPage;
import io.onedev.server.web.page.my.MyProfilePage;
+import io.onedev.server.web.page.project.NewProjectPage;
import io.onedev.server.web.page.project.ProjectListPage;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.page.security.LoginPage;
@@ -55,7 +56,7 @@ public abstract class LayoutPage extends BasePage {
WebMarkupContainer projectsContainer = new WebMarkupContainer("navProjects");
projectsContainer.add(new ViewStateAwarePageLink<Void>("link", ProjectListPage.class));
- if (getPage() instanceof ProjectListPage || getPage() instanceof ProjectPage)
+ if (getPage() instanceof ProjectListPage || getPage() instanceof ProjectPage || getPage() instanceof NewProjectPage)
projectsContainer.add(AttributeAppender.append("class", "active"));
add(projectsContainer);
diff --git a/core/src/main/java/io/onedev/server/web/page/layout/layout.css b/core/src/main/java/io/onedev/server/web/page/layout/layout.css
index 6e2aace136..d82b8b2844 100644
--- a/core/src/main/java/io/onedev/server/web/page/layout/layout.css
+++ b/core/src/main/java/io/onedev/server/web/page/layout/layout.css
@@ -45,7 +45,7 @@
.floating.side {
position: fixed;
- top: 50px;
+ top: 51px;
border-top: none;
border-bottom: none;
bottom: 0;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/builds/BuildListPage.java b/core/src/main/java/io/onedev/server/web/page/project/builds/BuildListPage.java
index 606ce7ebd6..25b6041d7f 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/builds/BuildListPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/builds/BuildListPage.java
@@ -109,7 +109,7 @@ public class BuildListPage extends ProjectPage {
getProject().setSavedBuildQueries(projectQueries);
OneDev.getInstance(ProjectManager.class).save(getProject());
}
-
+
});
PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java b/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java
index aca99bb787..290f46c9ca 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java
@@ -110,7 +110,7 @@ public class ProjectCodeCommentsPage extends ProjectPage {
getProject().setSavedCodeCommentQueries(projectQueries);
OneDev.getInstance(ProjectManager.class).save(getProject());
}
-
+
});
PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
index 7a0e9c4b17..0f552fae3e 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/commits/ProjectCommitsPage.java
@@ -263,7 +263,7 @@ public class ProjectCommitsPage extends ProjectPage {
getProject().setSavedCommitQueries(projectQueries);
OneDev.getInstance(ProjectManager.class).save(getProject());
}
-
+
});
WebMarkupContainer others = new WebMarkupContainer("others") {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.html
index da970c3762..6c2b9d8a71 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.html
@@ -1,8 +1,7 @@
<wicket:extend>
<div id="issues">
<wicket:enclosure child="reconcile">
- <div class="alert alert-warning">Issue workflow has been changed and it may
- cause issue working improperly, please
+ <div class="alert alert-warning">Issue workflow has been changed, please
<a wicket:id="reconcile">reconcile</a> existing issues with the change</div>
</wicket:enclosure>
<ul wicket:id="issuesTabs" class="nav nav-tabs"></ul>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java
index fda55cf62f..9b65264530 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/IssuesPage.java
@@ -13,7 +13,10 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.SettingManager;
import io.onedev.server.model.Project;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.modal.ModalLink;
@@ -38,6 +41,10 @@ public abstract class IssuesPage extends ProjectPage {
super(params);
}
+ protected GlobalIssueSetting getGlobalIssueSetting() {
+ return OneDev.getInstance(SettingManager.class).getIssueSetting();
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -70,7 +77,7 @@ public abstract class IssuesPage extends ProjectPage {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(!getProject().getIssueWorkflow().isReconciled());
+ setVisible(!getGlobalIssueSetting().isReconciled());
}
@Override
@@ -91,7 +98,7 @@ public abstract class IssuesPage extends ProjectPage {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(!getProject().getIssueWorkflow().isReconciled());
+ setVisible(!getGlobalIssueSetting().isReconciled());
}
});
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
index e5ee4475f4..bad7063bb4 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java
@@ -31,15 +31,17 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
import io.onedev.server.manager.IssueChangeManager;
import io.onedev.server.manager.IssueManager;
+import io.onedev.server.manager.SettingManager;
import io.onedev.server.manager.UserManager;
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.issue.IssueBoard;
-import io.onedev.server.model.support.issue.workflow.IssueWorkflow;
-import io.onedev.server.model.support.issue.workflow.TransitionSpec;
-import io.onedev.server.model.support.issue.workflow.transitiontrigger.PressButtonTrigger;
+import io.onedev.server.model.support.issue.BoardSpec;
+import io.onedev.server.model.support.issue.IssueSetting;
+import io.onedev.server.model.support.issue.TransitionSpec;
+import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.search.entity.issue.ChoiceFieldCriteria;
import io.onedev.server.search.entity.issue.FieldOperatorCriteria;
import io.onedev.server.search.entity.issue.IssueCriteria;
@@ -127,6 +129,10 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
return queryModel.getObject();
}
+ private GlobalIssueSetting getIssueSetting() {
+ return OneDev.getInstance(SettingManager.class).getIssueSetting();
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -145,11 +151,11 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
Issue issue = issueDragging.getIssue();
if (Objects.equals(issue.getMilestone(), getMilestone())) {
// move issue between board columns
- IssueWorkflow workflow = getProject().getIssueWorkflow();
+ IssueSetting workflow = getProject().getIssueSetting();
String identifyField = getBoard().getIdentifyField();
if (identifyField.equals(IssueConstants.FIELD_STATE)) {
issue = SerializationUtils.clone(issue);
- for (TransitionSpec transition: workflow.getTransitionSpecs()) {
+ for (TransitionSpec transition: workflow.getTransitionSpecs(true)) {
if (transition.canTransite(issue)
&& transition.getTrigger() instanceof PressButtonTrigger
&& ((PressButtonTrigger)transition.getTrigger()).isAuthorized()
@@ -210,14 +216,13 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
String title;
String color = null;
User user = null;
- IssueWorkflow workflow = getProject().getIssueWorkflow();
String identifyField = getBoard().getIdentifyField();
if (getColumn() != null) {
title = getColumn();
if (identifyField.equals(IssueConstants.FIELD_STATE)) {
- color = workflow.getStateSpec(getColumn()).getColor();
+ color = getIssueSetting().getStateSpec(getColumn()).getColor();
} else {
- InputSpec field = workflow.getFieldSpec(identifyField);
+ InputSpec field = getIssueSetting().getFieldSpec(identifyField);
if (field instanceof ChoiceInput) {
ChoiceProvider choiceProvider = ((ChoiceInput)field).getChoiceProvider();
OneContext.push(new ComponentContext(this));
@@ -231,7 +236,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
}
}
} else {
- title = workflow.getFieldSpec(identifyField).getNameOfEmptyValue();
+ title = getIssueSetting().getFieldSpec(identifyField).getNameOfEmptyValue();
}
WebMarkupContainer head = new WebMarkupContainer("head");
@@ -287,7 +292,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
setVisible(getQuery() != null
&& SecurityUtils.getUser() != null
&& (!getBoard().getIdentifyField().equals(IssueConstants.FIELD_STATE)
- || getColumn().equals(getProject().getIssueWorkflow().getInitialStateSpec().getName())));
+ || getColumn().equals(getIssueSetting().getInitialStateSpec().getName())));
}
});
@@ -327,9 +332,9 @@ 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)) {
- IssueWorkflow workflow = getProject().getIssueWorkflow();
+ IssueSetting workflow = getProject().getIssueSetting();
AtomicReference<TransitionSpec> transitionRef = new AtomicReference<>(null);
- for (TransitionSpec transition: workflow.getTransitionSpecs()) {
+ for (TransitionSpec transition: workflow.getTransitionSpecs(true)) {
if (transition.canTransite(issue)
&& transition.getTrigger() instanceof PressButtonTrigger
&& ((PressButtonTrigger)transition.getTrigger()).isAuthorized()
@@ -403,7 +408,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
protected abstract Project getProject();
- protected abstract IssueBoard getBoard();
+ protected abstract BoardSpec getBoard();
@Nullable
protected abstract Milestone getMilestone();
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardCountLabel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardCountLabel.java
index 8e17708494..83f038a7eb 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardCountLabel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardCountLabel.java
@@ -9,7 +9,7 @@ import org.apache.wicket.model.LoadableDetachableModel;
import com.google.common.collect.Sets;
import io.onedev.server.model.Project;
-import io.onedev.server.model.support.issue.IssueBoard;
+import io.onedev.server.model.support.issue.BoardSpec;
import io.onedev.server.web.behavior.WebSocketObserver;
@SuppressWarnings("serial")
@@ -45,7 +45,7 @@ abstract class CardCountLabel extends Label {
@Override
public Collection<String> getObservables() {
- return Sets.newHashSet(IssueBoard.getWebSocketObservable(getProject().getId()));
+ return Sets.newHashSet(BoardSpec.getWebSocketObservable(getProject().getId()));
}
});
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java
index b35f0ee414..3f5b720769 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java
@@ -30,6 +30,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.manager.CodeCommentRelationInfoManager;
import io.onedev.server.manager.CommitInfoManager;
import io.onedev.server.manager.IssueManager;
+import io.onedev.server.manager.SettingManager;
import io.onedev.server.manager.UserInfoManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
@@ -338,7 +339,7 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConte
@Override
public InputSpec getInputSpec(String inputName) {
- return getProject().getIssueWorkflow().getFieldSpec(inputName);
+ return OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldSpec(inputName);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java
index d004bd905b..3ee6317746 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardListPanel.java
@@ -19,7 +19,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.manager.IssueManager;
import io.onedev.server.model.Issue;
import io.onedev.server.model.Project;
-import io.onedev.server.model.support.issue.IssueBoard;
+import io.onedev.server.model.support.issue.BoardSpec;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.WebConstants;
@@ -125,7 +125,7 @@ abstract class CardListPanel extends Panel {
@Override
public Collection<String> getObservables() {
- return Sets.newHashSet(IssueBoard.getWebSocketObservable(getProject().getId()));
+ return Sets.newHashSet(BoardSpec.getWebSocketObservable(getProject().getId()));
}
});
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.html
index 8bd0afd667..03f85256c0 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.html
@@ -15,7 +15,7 @@
<a wicket:id="backlog" class="backlog btn btn-default"><i class="fa fa-inbox"></i> Backlog</a>
<a wicket:id="milestone"></a>
</span>
- <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control no-autofocus"></input>
+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control no-autofocus">
<span class="input-group-btn">
<button wicket:id="submit" type="submit" class="btn btn-default" title="Query"><i class="fa fa-search"></i></button>
</span>
@@ -28,7 +28,10 @@
</div>
</wicket:fragment>
<wicket:fragment wicket:id="noBoardsFrag">
- <div class="alert alert-info no-boards">No issue boards defined <a wicket:id="newBoard"><i class="fa fa-plus"></i> Add New</a></div>
+ <div class="alert alert-info no-boards">No issue boards defined
+ <a wicket:id="newBoard"><i class="fa fa-plus"></i> Add New</a>
+ <a wicket:id="useDefault"><i class="fa fa-undo"></i> Use Default</a>
+ </div>
</wicket:fragment>
<wicket:fragment wicket:id="hasMilestoneFrag">
<a wicket:id="link" title="Milestone" class="milestone-selector btn">
@@ -52,6 +55,7 @@
</tr>
</table>
<a wicket:id="newBoard" class="btn btn-default btn-sm btn-block new-board"><i class="fa fa-plus"></i> Add New Board</a>
+ <a wicket:id="useDefault" class="btn btn-default btn-sm btn-block use-global"><i class="fa fa-undo"></i> Use Default Boards</a>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="milestoneMenuFrag">
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java
index a2378a9dd4..d7ebe118f4 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java
@@ -42,7 +42,7 @@ import io.onedev.server.manager.MilestoneManager;
import io.onedev.server.manager.ProjectManager;
import io.onedev.server.model.Milestone;
import io.onedev.server.model.Project;
-import io.onedev.server.model.support.issue.IssueBoard;
+import io.onedev.server.model.support.issue.BoardSpec;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
@@ -50,6 +50,7 @@ import io.onedev.server.web.behavior.IssueQueryBehavior;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
import io.onedev.server.web.component.floating.FloatingPanel;
+import io.onedev.server.web.component.issue.board.BoardEditPanel;
import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.component.milestone.MilestoneDueLabel;
import io.onedev.server.web.component.milestone.MilestoneStatusLabel;
@@ -76,7 +77,7 @@ public class IssueBoardsPage extends IssuesPage {
private static final String PARAM_BACKLOG_QUERY = "backlog-query";
- private final ArrayList<IssueBoard> boards;
+ private final List<BoardSpec> boards;
private final int boardIndex;
@@ -158,10 +159,11 @@ public class IssueBoardsPage extends IssuesPage {
public IssueBoardsPage(PageParameters params) {
super(params);
- boards = getProject().getIssueBoards();
+ boards = getProject().getIssueSetting().getBoardSpecs(true);
+
String boardName = params.get(PARAM_BOARD).toString();
if (boardName != null) {
- boardIndex = IssueBoard.getBoardIndex(boards, boardName);
+ boardIndex = BoardSpec.getBoardIndex(boards, boardName);
if (boardIndex == -1)
throw new OneException("Can not find issue board: " + boardName);
} else if (!boards.isEmpty()) {
@@ -223,7 +225,7 @@ public class IssueBoardsPage extends IssuesPage {
}
@Nullable
- public IssueBoard getBoard() {
+ public BoardSpec getBoard() {
if (boardIndex != -1)
return boards.get(boardIndex);
else
@@ -256,12 +258,31 @@ public class IssueBoardsPage extends IssuesPage {
@Override
protected Component newContent(String id, FloatingPanel dropdown) {
Fragment menuFragment = new Fragment(id, "boardMenuFrag", IssueBoardsPage.this);
- if (SecurityUtils.canAdministrate(getProject().getFacade()))
+ if (SecurityUtils.canAdministrate(getProject().getFacade())) {
menuFragment.add(AttributeAppender.append("class", "administrative"));
- menuFragment.add(new ListView<IssueBoard>("boards", boards) {
+ }
+ menuFragment.add(new Link<Void>("useDefault") {
+
+ @Override
+ public void onClick() {
+ getProject().getIssueSetting().setBoardSpecs(null);
+ OneDev.getInstance(ProjectManager.class).save(getProject());
+ setResponsePage(IssueBoardsPage.class, IssueBoardsPage.paramsOf(getProject()));
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(SecurityUtils.canAdministrate(getProject().getFacade())
+ && getProject().getIssueSetting().getBoardSpecs(false) != null);
+ }
+
+ }.add(new ConfirmOnClick("This will discard all project specific boards, do you want to continue?")));
+
+ menuFragment.add(new ListView<BoardSpec>("boards", boards) {
@Override
- protected void populateItem(ListItem<IssueBoard> item) {
+ protected void populateItem(ListItem<BoardSpec> item) {
item.add(new WebMarkupContainer("dragHandle").setVisible(SecurityUtils.canAdministrate(getProject().getFacade())));
PageParameters params = IssueBoardsPage.paramsOf(
@@ -295,13 +316,13 @@ public class IssueBoardsPage extends IssuesPage {
@Override
public void onClick() {
- IssueBoard boardToRemove = item.getModelObject();
- IssueBoard currentBoard = getBoard();
+ BoardSpec boardToRemove = item.getModelObject();
+ BoardSpec currentBoard = getBoard();
boards.remove(boardToRemove);
- getProject().setIssueBoards(boards);
+ getProject().getIssueSetting().setBoardSpecs(boards);
OneDev.getInstance(ProjectManager.class).save(getProject());
- IssueBoard nextBoard;
+ BoardSpec nextBoard;
if (boardToRemove.getName().equals(currentBoard.getName()))
nextBoard = null;
else
@@ -322,9 +343,9 @@ public class IssueBoardsPage extends IssuesPage {
@Override
protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {
- IssueBoard board = boards.get(from.getItemIndex());
+ BoardSpec board = boards.get(from.getItemIndex());
boards.set(from.getItemIndex(), boards.set(to.getItemIndex(), board));
- getProject().setIssueBoards(boards);
+ getProject().getIssueSetting().setBoardSpecs(boards);
OneDev.getInstance(ProjectManager.class).save(getProject());
target.add(menuFragment);
}
@@ -638,7 +659,7 @@ public class IssueBoardsPage extends IssuesPage {
}
@Override
- protected IssueBoard getBoard() {
+ protected BoardSpec getBoard() {
return IssueBoardsPage.this.getBoard();
}
@@ -672,6 +693,23 @@ public class IssueBoardsPage extends IssuesPage {
setVisible(SecurityUtils.canAdministrate(getProject().getFacade()));
}
+ });
+ fragment.add(new Link<Void>("useDefault") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(SecurityUtils.canAdministrate(getProject().getFacade())
+ && getProject().getIssueSetting().getBoardSpecs(false) != null);
+ }
+
+ @Override
+ public void onClick() {
+ getProject().getIssueSetting().setBoardSpecs(null);
+ OneDev.getInstance(ProjectManager.class).save(getProject());
+ setResponsePage(IssueBoardsPage.class, IssueBoardsPage.paramsOf(getProject()));
+ }
+
});
add(fragment);
}
@@ -684,7 +722,7 @@ public class IssueBoardsPage extends IssuesPage {
response.render(OnDomReadyHeaderItem.forScript("onedev.server.issueBoards.onDomReady();"));
}
- public static PageParameters paramsOf(Project project, @Nullable IssueBoard board,
+ public static PageParameters paramsOf(Project project, @Nullable BoardSpec board,
@Nullable Milestone milestone, boolean backlog, @Nullable String query,
@Nullable String backlogQuery) {
PageParameters params = paramsOf(project);
@@ -716,7 +754,7 @@ public class IssueBoardsPage extends IssuesPage {
}
@Override
- protected void onBoardCreated(AjaxRequestTarget target, IssueBoard board) {
+ protected void onBoardCreated(AjaxRequestTarget target, BoardSpec board) {
setResponsePage(IssueBoardsPage.class, IssueBoardsPage.paramsOf(
getProject(), board, getMilestone(), backlog, query, backlogQuery));
modal.close();
@@ -806,12 +844,9 @@ public class IssueBoardsPage extends IssuesPage {
return new BoardEditPanel(id, boards, boardIndex) {
@Override
- protected Project getProject() {
- return IssueBoardsPage.this.getProject();
- }
-
- @Override
- protected void onBoardSaved(AjaxRequestTarget target, IssueBoard board) {
+ protected void onBoardSaved(AjaxRequestTarget target, BoardSpec board) {
+ getProject().getIssueSetting().setBoardSpecs(boards);
+ OneDev.getInstance(ProjectManager.class).save(getProject());
setResponsePage(IssueBoardsPage.class, IssueBoardsPage.paramsOf(
getProject(), board, getMilestone(), backlog, query, backlogQuery));
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java
index 104bbf5ec9..781c80f3b0 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/NewBoardPanel.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.page.project.issues.boards;
-import java.util.ArrayList;
+import java.util.List;
import org.apache.wicket.Session;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -13,7 +13,7 @@ import org.apache.wicket.markup.html.panel.Panel;
import io.onedev.server.OneDev;
import io.onedev.server.manager.ProjectManager;
import io.onedev.server.model.Project;
-import io.onedev.server.model.support.issue.IssueBoard;
+import io.onedev.server.model.support.issue.BoardSpec;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.editable.PathSegment;
@@ -22,9 +22,9 @@ import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;
@SuppressWarnings("serial")
abstract class NewBoardPanel extends Panel {
- private final ArrayList<IssueBoard> boards;
+ private final List<BoardSpec> boards;
- public NewBoardPanel(String id, ArrayList<IssueBoard> boards) {
+ public NewBoardPanel(String id, List<BoardSpec> boards) {
super(id);
this.boards = boards;
}
@@ -33,7 +33,7 @@ abstract class NewBoardPanel extends Panel {
protected void onInitialize() {
super.onInitialize();
- IssueBoard board = new IssueBoard();
+ BoardSpec board = new BoardSpec();
BeanEditor editor = BeanContext.editBean("editor", board);
Form<?> form = new Form<Void>("form");
@@ -43,14 +43,14 @@ abstract class NewBoardPanel extends Panel {
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
super.onSubmit(target, form);
- int indexWithSameName = IssueBoard.getBoardIndex(boards, board.getName());
+ int indexWithSameName = BoardSpec.getBoardIndex(boards, board.getName());
if (indexWithSameName != -1) {
editor.getErrorContext(new PathSegment.Property("name"))
.addError("This name has already been used by another issue board in the project");
}
if (!editor.hasErrors(true)){
boards.add(board);
- getProject().setIssueBoards(boards);
+ getProject().getIssueSetting().setBoardSpecs(boards);
OneDev.getInstance(ProjectManager.class).save(getProject());
Session.get().success("New issue board created");
onBoardCreated(target, board);
@@ -101,7 +101,7 @@ abstract class NewBoardPanel extends Panel {
protected abstract Project getProject();
- protected abstract void onBoardCreated(AjaxRequestTarget target, IssueBoard board);
+ protected abstract void onBoardCreated(AjaxRequestTarget target, BoardSpec board);
protected abstract void onCancel(AjaxRequestTarget target);
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java
index 8668e32bd5..a498879a67 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/StateTransitionPanel.java
@@ -13,9 +13,10 @@ import org.apache.wicket.markup.html.panel.Panel;
import io.onedev.server.OneDev;
import io.onedev.server.manager.IssueChangeManager;
+import io.onedev.server.manager.SettingManager;
import io.onedev.server.model.Issue;
-import io.onedev.server.model.support.issue.workflow.TransitionSpec;
-import io.onedev.server.model.support.issue.workflow.transitiontrigger.PressButtonTrigger;
+import io.onedev.server.model.support.issue.TransitionSpec;
+import io.onedev.server.model.support.issue.transitiontrigger.PressButtonTrigger;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.IssueUtils;
import io.onedev.server.util.inputspec.InputContext;
@@ -96,7 +97,7 @@ abstract class StateTransitionPanel extends Panel implements InputContext {
@Override
public InputSpec getInputSpec(String inputName) {
- return getIssue().getProject().getIssueWorkflow().getFieldSpec(inputName);
+ return OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldSpec(inputName);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
index a88b19b640..2bf7582a78 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/create/NewIssuePage.java
@@ -12,9 +12,11 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
import io.onedev.server.manager.IssueManager;
+import io.onedev.server.manager.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.setting.GlobalIssueSetting;
import io.onedev.server.search.entity.issue.IssueCriteria;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.util.inputspec.InputContext;
@@ -95,14 +97,18 @@ public class NewIssuePage extends ProjectPage implements InputContext {
response.render(CssHeaderItem.forReference(new NewIssueResourceReference()));
}
+ private GlobalIssueSetting getIssueSetting() {
+ return OneDev.getInstance(SettingManager.class).getIssueSetting();
+ }
+
@Override
public List<String> getInputNames() {
- return getProject().getIssueWorkflow().getFieldNames();
+ return getIssueSetting().getFieldNames();
}
@Override
public InputSpec getInputSpec(String inputName) {
- return getProject().getIssueWorkflow().getFieldSpec(inputName);
+ return getIssueSetting().getFieldSpec(inputName);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
index a430c9936a..f7a35d2b0f 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java
@@ -30,6 +30,7 @@ import io.onedev.server.OneDev;
import io.onedev.server.manager.CodeCommentRelationInfoManager;
import io.onedev.server.manager.CommitInfoManager;
import io.onedev.server.manager.IssueManager;
+import io.onedev.server.manager.SettingManager;
import io.onedev.server.manager.UserInfoManager;
import io.onedev.server.model.Issue;
import io.onedev.server.security.SecurityUtils;
@@ -267,7 +268,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex
@Override
public InputSpec getInputSpec(String inputName) {
- return getProject().getIssueWorkflow().getFieldSpec(inputName);
+ return OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldSpec(inputName);
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/list/IssueListPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/list/IssueListPage.java
index a3426f94df..c0d55b2133 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/list/IssueListPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/list/IssueListPage.java
@@ -19,6 +19,7 @@ import io.onedev.server.model.IssueQuerySetting;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.QuerySetting;
import io.onedev.server.model.support.issue.NamedIssueQuery;
+import io.onedev.server.model.support.issue.IssueSetting;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.web.component.issue.list.IssueListPanel;
@@ -49,7 +50,7 @@ public class IssueListPage extends IssuesPage {
for (NamedIssueQuery namedQuery: getProject().getIssueQuerySettingOfCurrentUser().getUserQueries())
queries.add(namedQuery.getQuery());
}
- for (NamedIssueQuery namedQuery: getProject().getSavedIssueQueries())
+ for (NamedIssueQuery namedQuery: getProject().getIssueSetting().getSavedQueries(true))
queries.add(namedQuery.getQuery());
for (String each: queries) {
try {
@@ -97,7 +98,7 @@ public class IssueListPage extends IssuesPage {
@Override
protected ArrayList<NamedIssueQuery> getProjectQueries() {
- return getProject().getSavedIssueQueries();
+ return (ArrayList<NamedIssueQuery>) getProject().getIssueSetting().getSavedQueries(false);
}
@Override
@@ -107,9 +108,14 @@ public class IssueListPage extends IssuesPage {
@Override
protected void onSaveProjectQueries(ArrayList<NamedIssueQuery> projectQueries) {
- getProject().setSavedIssueQueries(projectQueries);
+ getProject().getIssueSetting().setSavedQueries(projectQueries);
OneDev.getInstance(ProjectManager.class).save(getProject());
}
+
+ @Override
+ protected ArrayList<NamedIssueQuery> getDefaultProjectQueries() {
+ return (ArrayList<NamedIssueQuery>) getGlobalIssueSetting().getDefaultQueries();
+ }
});
@@ -175,10 +181,14 @@ public class IssueListPage extends IssuesPage {
@Override
protected void onSaveForAll(AjaxRequestTarget target, String name) {
- NamedIssueQuery namedQuery = getProject().getSavedIssueQuery(name);
+ IssueSetting setting = getProject().getIssueSetting();
+ if (setting.getSavedQueries(false) == null) {
+ setting.setSavedQueries(new ArrayList<>(getGlobalIssueSetting().getDefaultQueries()));
+ }
+ NamedIssueQuery namedQuery = getProject().getIssueSetting().getSavedQuery(name);
if (namedQuery == null) {
namedQuery = new NamedIssueQuery(name, query);
- getProject().getSavedIssueQueries().add(namedQuery);
+ getProject().getIssueSetting().getSavedQueries(true).add(namedQuery);
} else {
namedQuery.setQuery(query);
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.java
index 9fe50a4964..d94fc33229 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/IssueStatsPanel.java
@@ -6,8 +6,11 @@ import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.panel.GenericPanel;
import org.apache.wicket.model.IModel;
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.SettingManager;
import io.onedev.server.model.Milestone;
-import io.onedev.server.model.support.issue.workflow.StateSpec;
+import io.onedev.server.model.support.issue.StateSpec;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.search.entity.issue.IssueCriteria;
import io.onedev.server.web.component.milestone.progress.MilestoneProgressBar;
@@ -28,13 +31,14 @@ class IssueStatsPanel extends GenericPanel<Milestone> {
add(new MilestoneProgressBar("progress", getModel()));
- IssueCriteria openCriteria = getMilestone().getProject().getIssueWorkflow().getCategoryCriteria(StateSpec.Category.OPEN);
+ GlobalIssueSetting 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()));
link.add(new Label("count", getMilestone().getNumOfOpenIssues() + " open"));
add(link);
- IssueCriteria closedCriteria = getMilestone().getProject().getIssueWorkflow().getCategoryCriteria(StateSpec.Category.CLOSED);
+ IssueCriteria closedCriteria = issueSetting.getCategoryCriteria(StateSpec.Category.CLOSED);
link = new BookmarkablePageLink<Void>("closed", MilestoneDetailPage.class,
MilestoneDetailPage.paramsOf(getMilestone(), closedCriteria.toString()));
link.add(new Label("count", getMilestone().getNumOfClosedIssues() + " closed"));
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/UndefinedFieldResolution.java b/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/UndefinedFieldResolution.java
index 8e71b8dc6e..ed3de8e18a 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/UndefinedFieldResolution.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/UndefinedFieldResolution.java
@@ -8,6 +8,8 @@ import javax.validation.constraints.NotNull;
import org.hibernate.validator.constraints.NotEmpty;
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.SettingManager;
import io.onedev.server.util.OneContext;
import io.onedev.server.util.inputspec.InputSpec;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
@@ -61,7 +63,7 @@ public class UndefinedFieldResolution implements Serializable {
private static List<String> getFieldChoices() {
ProjectPage page = (ProjectPage) WicketUtils.getPage();
List<String> fields = new ArrayList<>();
- for (InputSpec field: page.getProject().getIssueWorkflow().getFieldSpecs())
+ for (InputSpec field: OneDev.getInstance(SettingManager.class).getIssueSetting().getFieldSpecs())
fields.add(field.getName());
return fields;
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/UndefinedFieldValueResolution.java b/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/UndefinedFieldValueResolution.java
index f94a5e33e6..57351d10ff 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/UndefinedFieldValueResolution.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/UndefinedFieldValueResolution.java
@@ -10,7 +10,10 @@ import org.hibernate.validator.constraints.NotEmpty;
import com.google.common.base.Preconditions;
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.SettingManager;
import io.onedev.server.model.Project;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.util.EditContext;
import io.onedev.server.util.OneContext;
import io.onedev.server.util.inputspec.InputContext;
@@ -67,8 +70,11 @@ public class UndefinedFieldValueResolution implements Serializable {
@SuppressWarnings("unused")
private static List<String> getValueChoices() {
- UndefinedFieldValueContainer container = ((ComponentContext)OneContext.get()).getComponent().findParent(UndefinedFieldValueContainer.class);
- InputSpec fieldSpec = Preconditions.checkNotNull(OneContext.get().getProject().getIssueWorkflow().getFieldSpec(container.getFieldName()));
+ UndefinedFieldValueContainer container = ((ComponentContext)OneContext.get())
+ .getComponent()
+ .findParent(UndefinedFieldValueContainer.class);
+ GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();
+ InputSpec fieldSpec = Preconditions.checkNotNull(issueSetting.getFieldSpec(container.getFieldName()));
OneContext.push(new OneContext() {
@Override
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/UndefinedStateResolution.java b/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/UndefinedStateResolution.java
index 73506cdd7d..96c1bfe841 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/UndefinedStateResolution.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/UndefinedStateResolution.java
@@ -6,11 +6,12 @@ import java.util.stream.Collectors;
import org.hibernate.validator.constraints.NotEmpty;
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.SettingManager;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
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.page.project.ProjectPage;
-import io.onedev.server.web.util.WicketUtils;
@Editable
public class UndefinedStateResolution implements Serializable {
@@ -33,8 +34,8 @@ public class UndefinedStateResolution implements Serializable {
@SuppressWarnings("unused")
private static List<String> getNewStateChoices() {
- ProjectPage projectPage = (ProjectPage) WicketUtils.getPage();
- return projectPage.getProject().getIssueWorkflow().getStateSpecs().stream().map(each->each.getName()).collect(Collectors.toList());
+ GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();
+ return issueSetting.getStateSpecs().stream().map(each->each.getName()).collect(Collectors.toList());
}
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/WorkflowReconcilePanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/WorkflowReconcilePanel.java
index d62dc50f05..4c8d17dc90 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/WorkflowReconcilePanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/workflowreconcile/WorkflowReconcilePanel.java
@@ -2,6 +2,7 @@ package io.onedev.server.web.page.project.issues.workflowreconcile;
import java.util.Collection;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Map;
import org.apache.wicket.Component;
@@ -23,9 +24,12 @@ import org.apache.wicket.request.cycle.RequestCycle;
import io.onedev.server.OneDev;
import io.onedev.server.manager.IssueManager;
-import io.onedev.server.manager.ProjectManager;
+import io.onedev.server.manager.SettingManager;
import io.onedev.server.model.Project;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
+import io.onedev.server.util.ValueSetEdit;
import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValueResolution.FixType;
import io.onedev.server.web.util.ajaxlistener.ChangeTextListener;
import io.onedev.server.web.util.ajaxlistener.DisableGlobalLoadingIndicatorListener;
import io.onedev.server.web.util.ajaxlistener.SelfDisableListener;
@@ -65,7 +69,7 @@ public abstract class WorkflowReconcilePanel extends Panel {
@Override
public Component getLazyLoadComponent(String markupId) {
- Collection<String> undefinedStates = getIssueManager().getUndefinedStates(getProject());
+ Collection<String> undefinedStates = getIssueManager().getUndefinedStates();
if (!undefinedStates.isEmpty()) {
Fragment fragment = new Fragment(markupId, "fixStatesFrag", WorkflowReconcilePanel.this);
Form<?> form = new Form<Void>("form") {
@@ -121,7 +125,7 @@ public abstract class WorkflowReconcilePanel extends Panel {
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
super.onSubmit(target, form);
- getIssueManager().fixUndefinedStates(getProject(), resolutions);
+ getIssueManager().fixUndefinedStates(resolutions);
Component content = checkFields(CONTENT_ID);
WorkflowReconcilePanel.this.replace(content);
target.add(content);
@@ -156,7 +160,7 @@ public abstract class WorkflowReconcilePanel extends Panel {
@Override
public Component getLazyLoadComponent(String markupId) {
- Collection<String> undefinedFields = getIssueManager().getUndefinedFields(getProject());
+ Collection<String> undefinedFields = getIssueManager().getUndefinedFields();
if (!undefinedFields.isEmpty()) {
Fragment fragment = new Fragment(markupId, "fixFieldsFrag", WorkflowReconcilePanel.this);
Form<?> form = new Form<Void>("form") {
@@ -211,7 +215,7 @@ public abstract class WorkflowReconcilePanel extends Panel {
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
super.onSubmit(target, form);
- getIssueManager().fixUndefinedFields(getProject(), resolutions);
+ getIssueManager().fixUndefinedFields(resolutions);
Component content = checkFieldValues(CONTENT_ID);
WorkflowReconcilePanel.this.replace(content);
@@ -246,7 +250,7 @@ public abstract class WorkflowReconcilePanel extends Panel {
@Override
public Component getLazyLoadComponent(String markupId) {
- Collection<UndefinedFieldValue> undefinedFieldValues = getIssueManager().getUndefinedFieldValues(getProject());
+ Collection<UndefinedFieldValue> undefinedFieldValues = getIssueManager().getUndefinedFieldValues();
if (!undefinedFieldValues.isEmpty()) {
Fragment fragment = new Fragment(markupId, "fixFieldValuesFrag", WorkflowReconcilePanel.this);
Form<?> form = new Form<Void>("form") {
@@ -300,7 +304,27 @@ public abstract class WorkflowReconcilePanel extends Panel {
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
super.onSubmit(target, form);
- getIssueManager().fixUndefinedFieldValues(getProject(), resolutions);
+
+ Map<String, ValueSetEdit> edits = new HashMap<>();
+ Collection<String> fieldNames = new HashSet<>();
+ for (UndefinedFieldValue key: resolutions.keySet())
+ fieldNames.add(key.getFieldName());
+ for (String fieldName: fieldNames) {
+ Map<String, String> renames = new HashMap<>();
+ Collection<String> deletions = new HashSet<>();
+ for (Map.Entry<UndefinedFieldValue, UndefinedFieldValueResolution> entry: resolutions.entrySet()) {
+ if (entry.getKey().getFieldName().equals(fieldName)) {
+ if (entry.getValue().getFixType() == FixType.CHANGE_TO_ANOTHER_VALUE)
+ renames.put(entry.getKey().getFieldValue(), entry.getValue().getNewValue());
+ else
+ deletions.add(entry.getKey().getFieldValue());
+ }
+ }
+ edits.put(fieldName, new ValueSetEdit(renames, deletions));
+ }
+
+ getIssueManager().fixUndefinedFieldValues(edits);
+
Component content = checkFieldValueOrders(CONTENT_ID);
WorkflowReconcilePanel.this.replace(content);
target.add(content);
@@ -335,9 +359,12 @@ public abstract class WorkflowReconcilePanel extends Panel {
@Override
public Component getLazyLoadComponent(String markupId) {
- getIssueManager().fixFieldValueOrders(getProject());
- getProject().getIssueWorkflow().setReconciled(true);
- OneDev.getInstance(ProjectManager.class).save(getProject());
+ getIssueManager().fixFieldValueOrders();
+
+ SettingManager settingManager = OneDev.getInstance(SettingManager.class);
+ GlobalIssueSetting issueSetting = settingManager.getIssueSetting();
+ issueSetting.setReconciled(true);
+ settingManager.saveIssueSetting(issueSetting);
Fragment fragment = new Fragment(markupId, "completedFrag", WorkflowReconcilePanel.this);
fragment.add(new AjaxLink<Void>("ok") {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java
index 14617db688..7cf8944417 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java
@@ -181,7 +181,7 @@ public class PullRequestListPage extends ProjectPage {
getProject().setSavedPullRequestQueries(projectQueries);
OneDev.getInstance(ProjectManager.class).save(getProject());
}
-
+
});
WebMarkupContainer others = new WebMarkupContainer("others") {
diff --git a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryPanel.html b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryPanel.html
index 6103921551..0b171b4110 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryPanel.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryPanel.html
@@ -10,7 +10,7 @@
<div wicket:id="editor"></div>
</div>
<div class="modal-footer clearfix">
- <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save as Mine"></input>
+ <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save as Mine">
<a wicket:id="saveForAll" class="dirty-aware btn btn-primary">Save for All Users</a>
<a wicket:id="cancel" class="btn btn-default">Cancel</a>
</div>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.html b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.html
index 51a34430e2..f0cd79d7de 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.html
@@ -52,7 +52,8 @@
<div wicket:id="feedback"></div>
<div wicket:id="editor"></div>
<div class="actions">
- <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save"></input>
+ <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save">
+ <a wicket:id="useDefault" class="btn btn-primary">Use Default</a>
<a wicket:id="cancel" class="btn btn-default">Cancel</a>
</div>
</form>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java
index 70a75158d2..43f41444b3 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java
@@ -45,6 +45,7 @@ import io.onedev.server.web.component.watchstatus.WatchStatusLink;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.page.project.ProjectPage;
import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;
+import io.onedev.server.web.util.ajaxlistener.ConfirmListener;
@SuppressWarnings("serial")
public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
@@ -151,15 +152,11 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- if (SecurityUtils.canAdministrate(getProject().getFacade())) {
- setVisible(!getUserQueries().isEmpty() || !getProjectQueries().isEmpty());
- } else {
- setVisible(SecurityUtils.getUser() != null && !getUserQueries().isEmpty());
- }
+ setVisible(SecurityUtils.getUser() != null);
}
private Component newUserQueriesEditor(String componentId, ModalPanel modal, ArrayList<T> userQueries) {
- return new NamedQueriesEditor(componentId, userQueries) {
+ return new NamedQueriesEditor(componentId, userQueries, null) {
@Override
protected void onSave(AjaxRequestTarget target, ArrayList<T> queries) {
@@ -175,11 +172,13 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
protected void onCancel(AjaxRequestTarget target) {
modal.close();
}
+
};
}
- private Component newProjectQueriesEditor(String componentId, ModalPanel modal, ArrayList<T> projectQueries) {
- return new NamedQueriesEditor(componentId, projectQueries) {
+ private Component newProjectQueriesEditor(String componentId, ModalPanel modal, ArrayList<T> projectQueries,
+ @Nullable UseDefaultListener useDefaultListener) {
+ return new NamedQueriesEditor(componentId, projectQueries, useDefaultListener) {
@Override
protected void onSave(AjaxRequestTarget target, ArrayList<T> queries) {
@@ -192,7 +191,7 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
protected void onCancel(AjaxRequestTarget target) {
modal.close();
}
-
+
};
}
@@ -202,28 +201,25 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
List<Tab> tabs = new ArrayList<>();
ArrayList<T> userQueries = getUserQueries();
- if (!userQueries.isEmpty()) {
- tabs.add(new AjaxActionTab(Model.of("For Mine")) {
+ tabs.add(new AjaxActionTab(Model.of("For Mine")) {
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());
- }
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());
+ }
- @Override
- protected void onSelect(AjaxRequestTarget target, Component tabLink) {
- Component editor = newUserQueriesEditor(TAB_PANEL_ID, modal, userQueries);
- fragment.replace(editor);
- target.add(editor);
- }
-
- });
- fragment.add(newUserQueriesEditor(TAB_PANEL_ID, modal, userQueries));
- }
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {
+ Component editor = newUserQueriesEditor(TAB_PANEL_ID, modal, userQueries);
+ fragment.replace(editor);
+ target.add(editor);
+ }
+
+ });
+ fragment.add(newUserQueriesEditor(TAB_PANEL_ID, modal, userQueries));
- ArrayList<T> projectQueries = getProjectQueries();
- if (SecurityUtils.canAdministrate(getProject().getFacade()) && !projectQueries.isEmpty()) {
+ if (SecurityUtils.canAdministrate(getProject().getFacade())) {
tabs.add(new AjaxActionTab(Model.of("For All Users")) {
@Override
@@ -234,14 +230,31 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
@Override
protected void onSelect(AjaxRequestTarget target, Component tabLink) {
- Component editor = newProjectQueriesEditor(TAB_PANEL_ID, modal, projectQueries);
+ ArrayList<T> projectQueries = getProjectQueries();
+ UseDefaultListener useDefaultListener;
+ if (projectQueries == null) {
+ projectQueries = new ArrayList<>(getDefaultProjectQueries());
+ useDefaultListener = null;
+ } else if (getDefaultProjectQueries() != null) {
+ useDefaultListener = new UseDefaultListener() {
+
+ @Override
+ public void onUseDefault(AjaxRequestTarget target) {
+ target.add(SavedQueriesPanel.this);
+ modal.close();
+ onSaveProjectQueries(null);
+ }
+
+ };
+ } else {
+ useDefaultListener = null;
+ }
+ Component editor = newProjectQueriesEditor(TAB_PANEL_ID, modal, projectQueries, useDefaultListener);
fragment.replace(editor);
target.add(editor);
}
});
- if (userQueries.isEmpty())
- fragment.add(newProjectQueriesEditor(TAB_PANEL_ID, modal, projectQueries));
}
fragment.add(new Tabbable("tab", tabs));
@@ -348,7 +361,7 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
@Override
protected List<T> load() {
List<T> namedQueries = new ArrayList<>();
- for (T namedQuery: getProjectQueries()) {
+ for (T namedQuery: getProjectQueries()!=null?getProjectQueries():getDefaultProjectQueries()) {
try {
if (SecurityUtils.getUser() != null || !needsLogin(namedQuery))
namedQueries.add(namedQuery);
@@ -468,10 +481,13 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
private final NamedQueriesBean<T> bean;
- public NamedQueriesEditor(String id, ArrayList<T> queries) {
+ private final UseDefaultListener useDefaultListener;
+
+ public NamedQueriesEditor(String id, ArrayList<T> queries, @Nullable UseDefaultListener useDefaultListener) {
super(id, "editSavedQueriesContentFrag", SavedQueriesPanel.this);
bean = newNamedQueriesBean();
bean.getQueries().addAll(queries);
+ this.useDefaultListener = useDefaultListener;
}
@Override
@@ -508,14 +524,30 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
}
});
- form.add(new AjaxLink<Void>("cancel") {
+ form.add(new AjaxLink<Void>("useDefault") {
@Override
protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());
+ String message = "This will discard all project specific queries, do you want to continue?";
+ attributes.getAjaxCallListeners().add(new ConfirmListener(message));
}
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ useDefaultListener.onUseDefault(target);
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(useDefaultListener != null);
+ }
+
+ });
+
+ form.add(new AjaxLink<Void>("cancel") {
+
@Override
public void onClick(AjaxRequestTarget target) {
onCancel(target);
@@ -529,6 +561,7 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
protected abstract void onSave(AjaxRequestTarget target, ArrayList<T> queries);
protected abstract void onCancel(AjaxRequestTarget target);
+
}
protected abstract NamedQueriesBean<T> newNamedQueriesBean();
@@ -540,10 +573,16 @@ public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {
@Nullable
protected abstract QuerySetting<T> getQuerySetting();
+ @Nullable
protected abstract ArrayList<T> getProjectQueries();
protected abstract void onSaveProjectQueries(ArrayList<T> projectQueries);
protected abstract void onSaveQuerySetting(QuerySetting<T> querySetting);
+ @Nullable
+ protected ArrayList<T> getDefaultProjectQueries() {
+ return null;
+ }
+
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/savedquery/UseDefaultListener.java b/core/src/main/java/io/onedev/server/web/page/project/savedquery/UseDefaultListener.java
new file mode 100644
index 0000000000..7ecf6bcb80
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/savedquery/UseDefaultListener.java
@@ -0,0 +1,11 @@
+package io.onedev.server.web.page.project.savedquery;
+
+import java.io.Serializable;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+
+interface UseDefaultListener extends Serializable {
+
+ void onUseDefault(AjaxRequestTarget target);
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/savedquery/saved-queries.css b/core/src/main/java/io/onedev/server/web/page/project/savedquery/saved-queries.css
index 85c2620be5..ddaa55976e 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/savedquery/saved-queries.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/savedquery/saved-queries.css
@@ -65,8 +65,18 @@
.edit-saved-queries th.name {
width: 30%;
}
-.edit-saved-queries tfoot {
- display: none;
+.edit-saved-queries>.property {
+ border: 1px solid #E8E8E8;
+ background: #F9F9F9;
+ border-radius: 4px;
+ padding: 10px;
+}
+.edit-saved-queries td {
+ padding: 8px 16px 8px 0 !important;
+}
+.edit-saved-queries .editable .bean.list>thead>tr>th {
+ border-bottom: none;
+ padding-bottom: 4px;
}
.query-save-support {
@@ -94,3 +104,4 @@
color: #999;
cursor: default;
}
+
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java
index 1f6866f4a7..88c2407488 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/ProjectSettingPage.java
@@ -21,9 +21,8 @@ import io.onedev.server.web.page.project.setting.configuration.ConfigurationEdit
import io.onedev.server.web.page.project.setting.configuration.ConfigurationListPage;
import io.onedev.server.web.page.project.setting.configuration.NewConfigurationPage;
import io.onedev.server.web.page.project.setting.general.GeneralSettingPage;
-import io.onedev.server.web.page.project.setting.issueworkflow.fields.IssueFieldsPage;
-import io.onedev.server.web.page.project.setting.issueworkflow.states.IssueStatesPage;
-import io.onedev.server.web.page.project.setting.issueworkflow.statetransitions.StateTransitionsPage;
+import io.onedev.server.web.page.project.setting.issue.PromptFieldsUponIssueOpenSettingPage;
+import io.onedev.server.web.page.project.setting.issue.StateTransitionsPage;
import io.onedev.server.web.page.project.setting.tagprotection.TagProtectionPage;
import io.onedev.server.web.page.project.setting.webhook.WebHooksPage;
@@ -53,10 +52,8 @@ public abstract class ProjectSettingPage extends ProjectPage {
tabs.add(new ProjectSettingTab("Authorizations", "fa fa-fw fa-user", ProjectAuthorizationsPage.class));
tabs.add(new ProjectSettingTab("Branch Protection", "fa fa-fw fa-lock", BranchProtectionPage.class));
tabs.add(new ProjectSettingTab("Tag Protection", "fa fa-fw fa-lock", TagProtectionPage.class));
+ tabs.add(new ProjectSettingTab("Issue Setting", "fa fa-fw fa-bug", StateTransitionsPage.class, PromptFieldsUponIssueOpenSettingPage.class));
tabs.add(new ProjectSettingTab("Commit Message Transform", "fa fa-fw fa-comments", CommitMessageTransformPage.class));
- tabs.add(new ProjectSettingTab("Issue Fields", "fa fa-fw fa-list-ul", IssueFieldsPage.class));
- tabs.add(new ProjectSettingTab("Issue States", "fa fa-fw fa-check", IssueStatesPage.class));
- tabs.add(new ProjectSettingTab("Issue State Transitions", "fa fa-fw fa-exchange", StateTransitionsPage.class));
tabs.add(new ProjectSettingTab("Web Hooks", "fa fa-fw fa-volume-up", WebHooksPage.class));
tabs.add(new ProjectSettingTab("Build Configurations", "fa fa-fw fa-cube", ConfigurationListPage.class,
NewConfigurationPage.class, ConfigurationEditPage.class));
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.html b/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.html
index e5e0c1483c..9428e7de32 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/configuration/ConfigurationListPage.html
@@ -2,7 +2,7 @@
<div class="configuration list">
<div class="head clearfix">
<div class="pull-left clearable-wrapper">
- <input wicket:id="filterConfigurations" class="form-control search" placeholder="Filter by name"></input>
+ <input wicket:id="filterConfigurations" class="form-control search" placeholder="Filter by name">
</div>
<div class="pull-left">
<a wicket:id="addNew" class="btn btn-default"><i class="fa fa-plus"></i> Add New Configuration</a>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java
index f23ba912c9..09be145734 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/general/GeneralSettingPage.java
@@ -12,7 +12,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
import io.onedev.server.manager.ProjectManager;
import io.onedev.server.model.Project;
-import io.onedev.server.web.component.confirmdelete.ConfirmDeleteProjectModal;
+import io.onedev.server.web.component.project.ConfirmDeleteProjectModal;
import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.editable.BeanEditor;
import io.onedev.server.web.editable.PathSegment;
@@ -96,6 +96,11 @@ public class GeneralSettingPage extends ProjectSettingPage {
protected Project getProject() {
return GeneralSettingPage.this.getProject();
}
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ }
+
};
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issue/IssueSettingPage.html b/core/src/main/java/io/onedev/server/web/page/project/setting/issue/IssueSettingPage.html
new file mode 100644
index 0000000000..80b1004641
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issue/IssueSettingPage.html
@@ -0,0 +1,6 @@
+<wicket:extend>
+ <div class="issue-setting">
+ <ul wicket:id="issueSettingTabs" class="nav nav-tabs"></ul>
+ <wicket:child></wicket:child>
+ </div>
+</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issue/IssueSettingPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issue/IssueSettingPage.java
new file mode 100644
index 0000000000..5f19a9e1e9
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issue/IssueSettingPage.java
@@ -0,0 +1,76 @@
+package io.onedev.server.web.page.project.setting.issue;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.Page;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.SettingManager;
+import io.onedev.server.model.support.issue.IssueSetting;
+import io.onedev.server.model.support.setting.GlobalIssueSetting;
+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.setting.ProjectSettingPage;
+
+@SuppressWarnings("serial")
+public abstract class IssueSettingPage extends ProjectSettingPage {
+
+ public IssueSettingPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ List<Tab> tabs = new ArrayList<>();
+ tabs.add(new PageTab(Model.of("State Transitions"), StateTransitionsPage.class) {
+
+ @Override
+ public Component render(String componentId) {
+ return new TabLink(componentId, this);
+ }
+
+ });
+
+ tabs.add(new PageTab(Model.of("Prompt Fields Upon Issue Open"), PromptFieldsUponIssueOpenSettingPage.class) {
+
+ @Override
+ public Component render(String componentId) {
+ return new TabLink(componentId, this);
+ }
+
+ });
+ add(new Tabbable("issueSettingTabs", tabs));
+ }
+
+ protected IssueSetting getSetting() {
+ return getProject().getIssueSetting();
+ }
+
+ protected GlobalIssueSetting getGlobalSetting() {
+ return OneDev.getInstance(SettingManager.class).getIssueSetting();
+ }
+
+ private class TabLink extends PageTabLink {
+
+ public TabLink(String id, PageTab tab) {
+ super(id, tab);
+ }
+
+ @Override
+ protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {
+ return new BookmarkablePageLink<Void>(linkId, pageClass, ProjectPage.paramsOf(getProject()));
+ }
+
+ }
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issue/PromptFieldsUponIssueOpenSettingPage.html b/core/src/main/java/io/onedev/server/web/page/project/setting/issue/PromptFieldsUponIssueOpenSettingPage.html
new file mode 100644
index 0000000000..c6ae7a8ad1
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issue/PromptFieldsUponIssueOpenSettingPage.html
@@ -0,0 +1,9 @@
+<wicket:extend>
+ <form wicket:id="form" class="prompt-fields-upon-issue-open-setting">
+ <input wicket:id="fields" type="hidden" class="form-control">
+ <div class="actions">
+ <input type="submit" class="btn btn-primary dirty-aware" value="Save">
+ <a wicket:id="useDefault" class="btn btn-primary">Use Default</a>
+ </div>
+ </form>
+</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issue/PromptFieldsUponIssueOpenSettingPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issue/PromptFieldsUponIssueOpenSettingPage.java
new file mode 100644
index 0000000000..2f1ba83de4
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issue/PromptFieldsUponIssueOpenSettingPage.java
@@ -0,0 +1,84 @@
+package io.onedev.server.web.page.project.setting.issue;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.apache.wicket.Session;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.ProjectManager;
+import io.onedev.server.web.component.stringchoice.StringMultiChoice;
+
+@SuppressWarnings("serial")
+public class PromptFieldsUponIssueOpenSettingPage extends IssueSettingPage {
+
+ private Set<String> fieldSet;
+
+ public PromptFieldsUponIssueOpenSettingPage(PageParameters params) {
+ super(params);
+ fieldSet = getSetting().getPromptFieldsUponIssueOpen(true);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ Form<?> form = new Form<Void>("form") {
+
+ @Override
+ protected void onSubmit() {
+ super.onSubmit();
+ getSetting().setPromptFieldsUponIssueOpen(fieldSet);
+ OneDev.getInstance(ProjectManager.class).save(getProject());
+ setResponsePage(PromptFieldsUponIssueOpenSettingPage.class, PromptFieldsUponIssueOpenSettingPage.paramsOf(getProject()));
+ Session.get().success("Setting saved");
+ }
+
+ };
+
+ form.add(new StringMultiChoice("fields", new IModel<Collection<String>>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Collection<String> getObject() {
+ return fieldSet;
+ }
+
+ @Override
+ public void setObject(Collection<String> object) {
+ fieldSet = new HashSet<>(object);
+ }
+
+ }, getGlobalSetting().getFieldNames()));
+
+ form.add(new Link<Void>("useDefault") {
+
+ @Override
+ public void onClick() {
+ getSetting().setPromptFieldsUponIssueOpen(null);
+ OneDev.getInstance(ProjectManager.class).save(getProject());
+ setResponsePage(PromptFieldsUponIssueOpenSettingPage.class, PromptFieldsUponIssueOpenSettingPage.paramsOf(getProject()));
+ Session.get().success("Reset to default setting");
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(getSetting().getPromptFieldsUponIssueOpen(false) != null);
+ }
+
+ });
+ add(form);
+
+ form.setOutputMarkupId(true);
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issue/StateTransitionsPage.html b/core/src/main/java/io/onedev/server/web/page/project/setting/issue/StateTransitionsPage.html
new file mode 100644
index 0000000000..03e5294e35
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issue/StateTransitionsPage.html
@@ -0,0 +1,3 @@
+<wicket:extend>
+ <div wicket:id="transitions" class="state-transitions"></div>
+</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issue/StateTransitionsPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issue/StateTransitionsPage.java
new file mode 100644
index 0000000000..72d61e390b
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issue/StateTransitionsPage.java
@@ -0,0 +1,57 @@
+package io.onedev.server.web.page.project.setting.issue;
+
+import java.util.List;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.manager.ProjectManager;
+import io.onedev.server.model.support.issue.TransitionSpec;
+import io.onedev.server.web.component.issue.statetransition.StateTransitionListPanel;
+import io.onedev.server.web.component.issue.statetransition.UseDefaultListener;
+
+@SuppressWarnings("serial")
+public class StateTransitionsPage extends IssueSettingPage {
+
+ private List<TransitionSpec> transitions;
+
+ public StateTransitionsPage(PageParameters params) {
+ super(params);
+ transitions = getSetting().getTransitionSpecs(true);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new StateTransitionListPanel("transitions", transitions) {
+
+ @Override
+ protected void onChanged(AjaxRequestTarget target) {
+ getSetting().setTransitionSpecs(transitions);
+ OneDev.getInstance(ProjectManager.class).save(getProject());
+ }
+
+ @Override
+ protected UseDefaultListener getUseDefaultListener() {
+ if (getSetting().getTransitionSpecs(false) != null) {
+ return new UseDefaultListener() {
+
+ @Override
+ public void onUseDefault() {
+ getSetting().setTransitionSpecs(null);
+ OneDev.getInstance(ProjectManager.class).save(getProject());
+ setResponsePage(StateTransitionsPage.class, StateTransitionsPage.paramsOf(getProject()));
+ }
+
+ };
+ } else {
+ return null;
+ }
+ }
+
+ });
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/IssueWorkflowPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/IssueWorkflowPage.java
deleted file mode 100644
index 27df6c4ca7..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/IssueWorkflowPage.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package io.onedev.server.web.page.project.setting.issueworkflow;
-
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import io.onedev.server.model.support.issue.workflow.IssueWorkflow;
-import io.onedev.server.web.page.project.setting.ProjectSettingPage;
-
-@SuppressWarnings("serial")
-public class IssueWorkflowPage extends ProjectSettingPage {
-
- private final IssueWorkflow workflow;
-
- public IssueWorkflowPage(PageParameters params) {
- super(params);
-
- workflow = getProject().getIssueWorkflow();
- }
-
- public IssueWorkflow getWorkflow() {
- return workflow;
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldEditPanel.java
deleted file mode 100644
index 4e1286bb05..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldEditPanel.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package io.onedev.server.web.page.project.setting.issueworkflow.fields;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.commons.lang3.SerializationUtils;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-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.OneDev;
-import io.onedev.server.manager.ProjectManager;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.support.issue.workflow.IssueWorkflow;
-import io.onedev.server.util.IssueConstants;
-import io.onedev.server.util.inputspec.InputContext;
-import io.onedev.server.util.inputspec.InputSpec;
-import io.onedev.server.web.editable.BeanContext;
-import io.onedev.server.web.editable.BeanEditor;
-import io.onedev.server.web.editable.PathSegment;
-import io.onedev.server.web.page.project.ProjectPage;
-import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;
-
-@SuppressWarnings("serial")
-abstract class FieldEditPanel extends Panel implements InputContext {
-
- private final int fieldIndex;
-
- public FieldEditPanel(String id, int fieldIndex) {
- super(id);
-
- this.fieldIndex = fieldIndex;
- }
-
- private Project getProject() {
- ProjectPage page = (ProjectPage) getPage();
- return page.getProject();
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- FieldBean bean = new FieldBean();
- if (fieldIndex != -1)
- bean.setField(SerializationUtils.clone(getWorkflow().getFieldSpecs().get(fieldIndex)));
-
- Form<?> form = new Form<Void>("form") {
-
- @Override
- protected void onError() {
- super.onError();
- RequestCycle.get().find(AjaxRequestTarget.class).add(this);
- }
-
- };
-
- form.add(new AjaxLink<Void>("close") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(FieldEditPanel.this));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onCancel(target);
- }
-
- });
-
- BeanEditor editor = BeanContext.editBean("editor", bean);
- form.add(editor);
- form.add(new AjaxButton("save") {
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
-
- InputSpec field = bean.getField();
- if (fieldIndex != -1) {
- InputSpec oldField = getWorkflow().getFieldSpecs().get(fieldIndex);
- if (!field.getName().equals(oldField.getName()) && getWorkflow().getFieldSpec(field.getName()) != null) {
- editor.getErrorContext(new PathSegment.Property("field"))
- .getErrorContext(new PathSegment.Property("name"))
- .addError("This name has already been used by another field");
- }
- } else if (getWorkflow().getFieldSpec(field.getName()) != null) {
- editor.getErrorContext(new PathSegment.Property("field"))
- .getErrorContext(new PathSegment.Property("name"))
- .addError("This name has already been used by another field");
- }
-
- if (!editor.hasErrors(true)) {
- if (fieldIndex != -1) {
- InputSpec oldField = getWorkflow().getFieldSpecs().get(fieldIndex);
- if (!field.getName().equals(oldField.getName()))
- getWorkflow().onRenameField(oldField.getName(), field.getName());
- getWorkflow().getFieldSpecs().set(fieldIndex, bean.getField());
- getWorkflow().getPromptFieldsUponIssueOpen().remove(oldField.getName());
- getWorkflow().setReconciled(false);
- } else {
- getWorkflow().getFieldSpecs().add(field);
- }
- if (bean.isPromptUponIssueOpen())
- getWorkflow().getPromptFieldsUponIssueOpen().add(field.getName());
- getProject().setIssueWorkflow(getWorkflow());
- OneDev.getInstance(ProjectManager.class).save(getProject());
- onSave(target);
- } else {
- target.add(form);
- }
- }
-
- });
-
- form.add(new AjaxLink<Void>("cancel") {
-
- @Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(FieldEditPanel.this));
- }
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onCancel(target);
- }
-
- });
- form.setOutputMarkupId(true);
-
- add(form);
- }
-
- protected abstract IssueWorkflow getWorkflow();
-
- protected abstract void onSave(AjaxRequestTarget target);
-
- protected abstract void onCancel(AjaxRequestTarget target);
-
- @Override
- public List<String> getInputNames() {
- List<String> inputNames = new ArrayList<>();
- int currentIndex = 0;
- for (InputSpec field: getWorkflow().getFieldSpecs()) {
- if (currentIndex != fieldIndex)
- inputNames.add(field.getName());
- currentIndex++;
- }
- return inputNames;
- }
-
- @Override
- public InputSpec getInputSpec(String inputName) {
- return getWorkflow().getFieldSpec(inputName);
- }
-
- @Override
- public boolean isReservedName(String inputName) {
- return IssueConstants.ALL_FIELDS.contains(inputName);
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsResourceReference.java
deleted file mode 100644
index 2165ef0e51..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/IssueFieldsResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.page.project.setting.issueworkflow.fields;
-
-import org.apache.wicket.request.resource.CssResourceReference;
-
-public class IssueFieldsResourceReference extends CssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public IssueFieldsResourceReference() {
- super(IssueFieldsResourceReference.class, "issue-fields.css");
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/issue-fields.css b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/issue-fields.css
deleted file mode 100644
index b7a6a6af7c..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/issue-fields.css
+++ /dev/null
@@ -1,47 +0,0 @@
-.fieldspec-edit .property-showCondition>.value label {
- font-weight: normal;
-}
-
-#project-setting .issue-fields table td {
- padding: 0;
-}
-#project-setting .issue-fields table td.norecords-td {
- padding: 5px;
-}
-#project-setting .issue-fields table a {
- display: block;
- color: #666;
- text-decoration: none;
- padding: 5px;
-}
-#project-setting .issue-fields table>tbody>tr>td:first-child>div {
- position: relative;
- top: 0;
-}
-#project-setting .issue-fields table>tbody>tr>td:first-child>div>.drag-handle {
- position: absolute;
- top: 8px;
-}
-#project-setting .issue-fields table>tbody>tr>td:first-child>div>a {
- margin-left: 16px;
-}
-
-.floating.field-view {
- width: 600px;
-}
-.floating.field-view .actions {
- margin-bottom: 12px;
-}
-
-.floating.field-view .property-showCondition .property-inputName td.name,
-.floating.field-view .property-choicesProvider .property-inputName td.name,
-.floating.field-view .property-defaultValueProvider .property-inputName td.name {
- border-right: none;
- text-align: left;
-}
-
-.field-edit .property-choicesProvider>.value label.name,
-.field-edit .property-choicesProvider>.value .bean.list thead th,
-.property-nameOfEmptyValue .control-label {
- font-weight: normal;
-}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesResourceReference.java
deleted file mode 100644
index b2d65df30f..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/IssueStatesResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.page.project.setting.issueworkflow.states;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class IssueStatesResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public IssueStatesResourceReference() {
- super(IssueStatesResourceReference.class, "issue-states.css");
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/issue-states.css b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/issue-states.css
deleted file mode 100644
index 757f9874b7..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/states/issue-states.css
+++ /dev/null
@@ -1,40 +0,0 @@
-#project-setting .issue-states table td {
- padding: 0;
-}
-#project-setting .issue-states table td.norecords-td {
- padding: 5px;
-}
-#project-setting .issue-states table a {
- display: block;
- color: #666;
- text-decoration: none;
- padding: 5px;
-}
-#project-setting .issue-states table>tbody>tr>td:first-child>div {
- position: relative;
- top: 0;
-}
-#project-setting .issue-states table>tbody>tr>td:first-child>div>.drag-handle {
- position: absolute;
- top: 8px;
-}
-#project-setting .issue-states table>tbody>tr>td:first-child a span {
- border-radius: 3px;
- padding: 2px 6px;
- margin-right: 8px;
-}
-#project-setting .issue-states table>tbody>tr>td:first-child>div>a {
- margin-left: 16px;
-}
-#project-setting .issue-states table .color span {
- display: block;
- width: 24px;
- height: 24px;
- border-radius: 3px;
-}
-.floating.state-spec {
- width: 600px;
-}
-.floating.state-spec .actions {
- margin-bottom: 12px;
-}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/StateTransitionsResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/StateTransitionsResourceReference.java
deleted file mode 100644
index 74bc11897a..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/StateTransitionsResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.page.project.setting.issueworkflow.statetransitions;
-
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-
-public class StateTransitionsResourceReference extends BaseDependentCssResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public StateTransitionsResourceReference() {
- super(StateTransitionsResourceReference.class, "state-transitions.css");
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/state-transitions.css b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/state-transitions.css
deleted file mode 100644
index e9391fbc56..0000000000
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/statetransitions/state-transitions.css
+++ /dev/null
@@ -1,36 +0,0 @@
-#project-setting .state-transitions table td {
- padding: 0;
-}
-#project-setting .state-transitions table td.norecords-td {
- padding: 5px;
-}
-#project-setting .state-transitions table a {
- display: block;
- color: #666;
- text-decoration: none;
- padding: 5px;
-}
-
-.state-transition-edit .property-prerequisite>.value .control-label,
-.state-transition-edit .property-onAction>.value .control-label {
- font-weight: normal;
-}
-.floating.state-transition {
- width: 600px;
-}
-.floating.state-transition .actions {
- margin-bottom: 12px;
-}
-.floating.state-transition .property-authorized .name {
- border-right: none;
- text-align: left;
-}
-.floating.state-transition .property-authorized .value {
- white-space: nowrap;
-}
-.floating.state-transition .property-prerequisite .property-inputName td.name,
-.floating.state-transition .property-buttonLabel td.name,
-.floating.state-transition .property-promptFields td.name {
- border-right: none;
- text-align: left;
-}
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.html b/core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.html
index ff32fe8c27..466a8bc005 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/webhook/WebHooksPage.html
@@ -7,7 +7,7 @@
<i class="fa fa-info-circle"></i> OneDev will post event data in JSON format to specified URLs when subscribed events happen
</div>
<div class="actions">
- <input type="submit" value="Save" class="btn btn-primary"></input>
+ <input type="submit" value="Save" class="btn btn-primary">
</div>
</form>
</div>
diff --git a/core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.java b/core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.java
index d6f3996f82..93e76d19e8 100644
--- a/core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.java
+++ b/core/src/main/java/io/onedev/server/web/websocket/IssueEventBroadcaster.java
@@ -7,7 +7,7 @@ import io.onedev.launcher.loader.Listen;
import io.onedev.server.event.issue.IssueDeleted;
import io.onedev.server.event.issue.IssueEvent;
import io.onedev.server.model.Issue;
-import io.onedev.server.model.support.issue.IssueBoard;
+import io.onedev.server.model.support.issue.BoardSpec;
import io.onedev.server.web.util.WicketUtils;
@Singleton
@@ -25,7 +25,7 @@ public class IssueEventBroadcaster {
if (!(event instanceof IssueDeleted))
webSocketManager.notifyObservableChange(Issue.getWebSocketObservable(event.getIssue().getId()), WicketUtils.getPageKey());
if (event.affectsBoards())
- webSocketManager.notifyObservableChange(IssueBoard.getWebSocketObservable(event.getIssue().getProject().getId()), null);
+ webSocketManager.notifyObservableChange(BoardSpec.getWebSocketObservable(event.getIssue().getProject().getId()), null);
}
}
\ No newline at end of file
diff --git a/core/src/main/java/org/apache/wicket/page/RequestAdapter.java b/core/src/main/java/org/apache/wicket/page/RequestAdapter.java
new file mode 100644
index 0000000000..f8be83cb4b
--- /dev/null
+++ b/core/src/main/java/org/apache/wicket/page/RequestAdapter.java
@@ -0,0 +1,180 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.wicket.page;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * Request scoped helper class for {@link IPageManager}.
+ *
+ * @author Matej Knopp
+ */
+public abstract class RequestAdapter
+{
+ private final IPageManagerContext context;
+
+ private final List<IManageablePage> touchedPages = new ArrayList<IManageablePage>();
+
+ /**
+ * Construct.
+ *
+ * @param context
+ * The page manager context
+ */
+ public RequestAdapter(final IPageManagerContext context)
+ {
+ this.context = context;
+ }
+
+ /**
+ * Returns the page with specified id. The page is then cached by {@link RequestAdapter} during
+ * the rest of request processing.
+ *
+ * @param id
+ * @return page instance or <code>null</code> if the page does not exist.
+ */
+ protected abstract IManageablePage getPage(int id);
+
+ /**
+ * Store the list of stateful pages.
+ *
+ * @param touchedPages
+ */
+ protected abstract void storeTouchedPages(List<IManageablePage> touchedPages);
+
+ /**
+ * Notification on new session being created.
+ */
+ protected abstract void newSessionCreated();
+
+ /**
+ * Bind the session
+ *
+ * @see IPageManagerContext#bind()
+ */
+ protected void bind()
+ {
+ context.bind();
+ }
+
+ /**
+ * @see IPageManagerContext#setSessionAttribute(String, Serializable)
+ *
+ * @param key
+ * @param value
+ */
+ public void setSessionAttribute(String key, Serializable value)
+ {
+ context.setSessionAttribute(key, value);
+ }
+
+ /**
+ * @see IPageManagerContext#getSessionAttribute(String)
+ *
+ * @param key
+ * @return the session attribute
+ */
+ public Serializable getSessionAttribute(final String key)
+ {
+ return context.getSessionAttribute(key);
+ }
+
+ /**
+ * @see IPageManagerContext#getSessionId()
+ *
+ * @return session id
+ */
+ public String getSessionId()
+ {
+ return context.getSessionId();
+ }
+
+ /**
+ *
+ * @param id
+ * @return null, if not found
+ */
+ protected IManageablePage findPage(final int id)
+ {
+ for (IManageablePage page : touchedPages)
+ {
+ if (page.getPageId() == id)
+ {
+ return page;
+ }
+ }
+ return null;
+ }
+
+ /**
+ * Touches a page, so it will be stored in the page stores
+ * at the end of the request cycle
+ *
+ * @param page The page to mark as dirty
+ */
+ protected void touch(final IManageablePage page)
+ {
+ if (findPage(page.getPageId()) == null)
+ {
+ touchedPages.add(page);
+ }
+ }
+
+ /**
+ * @param page The page to unmark as dirty, so it won't be stored
+ * at the end of the request cycle
+ */
+ protected void untouch(final IManageablePage page)
+ {
+ Iterator<IManageablePage> iterator = touchedPages.iterator();
+ while (iterator.hasNext())
+ {
+ IManageablePage touchedPage = iterator.next();
+ if (touchedPage.getPageId() == page.getPageId())
+ {
+ iterator.remove();
+ break;
+ }
+ }
+ }
+
+ /**
+ * Modified by Robin to remove the logic to check stateless page as otherwise Wicket reports error
+ * when a page containing "wicket:enclosure" is accessed anonymously and is redirected to signin page
+ */
+ protected void commitRequest()
+ {
+ // store pages that are not stateless
+ if (touchedPages.isEmpty() == false)
+ {
+ List<IManageablePage> statefulPages = new ArrayList<IManageablePage>(
+ touchedPages.size());
+ for (IManageablePage page : touchedPages)
+ {
+ statefulPages.add(page);
+ }
+
+ if (statefulPages.isEmpty() == false)
+ {
+ storeTouchedPages(statefulPages);
+ }
+ }
+ }
+}