Skip to content

The Unified and Autonomous Development Platform

Fix the issue that board card can not be moved to columns outside of screen. Enhance StringChoiceProvider to accept Map instead of List

Robin Shen8fcac8ee332d
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 95ab0253f7..512737db93 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
@@ -252,7 +252,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
}
for (Project project: projectManager.query()) {
- project.getIssueSetting().fixUndefinedStates(project, resolutions);
+ project.getIssueSetting().fixUndefinedStates(resolutions);
}
for (IssueQuerySetting setting: issueQuerySettingManager.query()) {
@@ -357,14 +357,14 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
}
for (Project project: projectManager.query()) {
- project.getIssueSetting().fixUndefinedFields(project, resolutions);
+ project.getIssueSetting().fixUndefinedFields(resolutions);
}
for (IssueQuerySetting setting: issueQuerySettingManager.query()) {
for (Iterator<NamedIssueQuery> it = setting.getUserQueries().iterator(); it.hasNext();) {
NamedIssueQuery namedQuery = it.next();
try {
- IssueQuery query = IssueQuery.parse(setting.getProject(), namedQuery.getQuery(), false);
+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);
boolean remove = false;
for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {
UndefinedFieldResolution resolution = entry.getValue();
@@ -402,9 +402,8 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
}
}
- for (Project project: projectManager.query()) {
- undefinedFieldValues.addAll(project.getIssueSetting().getUndefinedFieldValues(project));
- }
+ for (Project project: projectManager.query())
+ undefinedFieldValues.addAll(project.getIssueSetting().getUndefinedFieldValues());
for (IssueQuerySetting setting: issueQuerySettingManager.query()) {
for (NamedIssueQuery namedQuery: setting.getUserQueries()) {
@@ -439,14 +438,14 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements
}
for (Project project: projectManager.query()) {
- project.getIssueSetting().fixUndefinedFieldValues(project, valueSetEdits);
+ project.getIssueSetting().fixUndefinedFieldValues(valueSetEdits);
}
for (IssueQuerySetting setting: issueQuerySettingManager.query()) {
for (Iterator<NamedIssueQuery> it = setting.getUserQueries().iterator(); it.hasNext();) {
NamedIssueQuery namedQuery = it.next();
try {
- IssueQuery query = IssueQuery.parse(setting.getProject(), namedQuery.getQuery(), false);
+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);
if (query.fixUndefinedFieldValues(valueSetEdits))
it.remove();
else
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 17f8e5632c..b2c2a17882 100644
--- a/core/src/main/java/io/onedev/server/model/Project.java
+++ b/core/src/main/java/io/onedev/server/model/Project.java
@@ -6,6 +6,7 @@ import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
+import java.util.Comparator;
import java.util.Date;
import java.util.HashMap;
import java.util.HashSet;
@@ -205,6 +206,8 @@ public class Project extends AbstractEntity {
@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)
private Collection<Milestone> milestones = new ArrayList<>();
+ private transient List<Milestone> sortedMilestones;
+
@Lob
@Column(length=65535)
@JsonView(DefaultView.class)
@@ -1092,6 +1095,21 @@ public class Project extends AbstractEntity {
this.milestones = milestones;
}
+ public List<Milestone> getSortedMilestones() {
+ if (sortedMilestones == null) {
+ sortedMilestones = new ArrayList<>(getMilestones());
+ Collections.sort(sortedMilestones, new Comparator<Milestone>() {
+
+ @Override
+ public int compare(Milestone o1, Milestone o2) {
+ return o1.getDueDate().compareTo(o2.getDueDate());
+ }
+
+ });
+ }
+ return sortedMilestones;
+ }
+
public ArrayList<WebHook> getWebHooks() {
if (webHooks == null)
webHooks = new ArrayList<>();
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java b/core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java
index 6f37ff4a91..1dbe311276 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java
@@ -29,6 +29,7 @@ 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.component.stringchoice.StringChoiceProvider;
import io.onedev.server.web.editable.annotation.ChoiceProvider;
import io.onedev.server.web.editable.annotation.Editable;
import io.onedev.server.web.editable.annotation.IssueQuery;
@@ -41,6 +42,8 @@ public class BoardSpec implements Serializable {
private static final long serialVersionUID = 1L;
+ public static final String NULL_COLUMN = StringChoiceProvider.SPECIAL_CHOICE_PREFIX + "Null";
+
private String name;
private String baseQuery;
@@ -52,6 +55,8 @@ public class BoardSpec implements Serializable {
private List<String> columns = new ArrayList<>();
private List<String> displayFields = Lists.newArrayList(IssueConstants.FIELD_STATE);
+
+ private List<String> editColumns;
@Editable(order=100)
@NotEmpty
@@ -97,10 +102,6 @@ public class BoardSpec implements Serializable {
this.identifyField = identifyField;
}
- @Editable(order=400, description="Specify columns of the board. Each column corresponds to "
- + "a value of the issue field specified above")
- @Size(min=2, message="At least two columns need to be defined")
- @ChoiceProvider("getColumnChoices")
public List<String> getColumns() {
return columns;
}
@@ -109,6 +110,20 @@ public class BoardSpec implements Serializable {
this.columns = columns;
}
+ @Editable(order=400, description="Specify columns of the board. Each column corresponds to "
+ + "a value of the issue field specified above")
+ @Size(min=2, message="At least two columns need to be defined")
+ @ChoiceProvider("getColumnChoices")
+ public List<String> getEditColumns() {
+ if (editColumns == null)
+ editColumns = new ArrayList<>();
+ return editColumns;
+ }
+
+ public void setEditColumns(List<String> editColumns) {
+ this.editColumns = editColumns;
+ }
+
@Editable(order=500, description="Specify fields to display in board card except issue number and title")
@ChoiceProvider("getDisplayFieldsChoices")
public List<String> getDisplayFields() {
@@ -152,10 +167,12 @@ public class BoardSpec implements Serializable {
choices.put(state.getName(), state.getName());
} else if (fieldName != null) {
InputSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(fieldName);
- for (String each: fieldSpec.getPossibleValues())
- choices.put(each, each);
- if (fieldSpec.isAllowEmpty())
- choices.put(fieldSpec.getNameOfEmptyValue(), null);
+ if (fieldSpec != null) {
+ for (String each: fieldSpec.getPossibleValues())
+ choices.put(each, each);
+ if (fieldSpec.isAllowEmpty())
+ choices.put(NULL_COLUMN, fieldSpec.getNameOfEmptyValue());
+ }
}
return choices;
}
@@ -172,11 +189,11 @@ public class BoardSpec implements Serializable {
return -1;
}
- public Set<String> getUndefinedStates(Project project) {
+ public Set<String> getUndefinedStates() {
Set<String> undefinedStates = new HashSet<>();
if (getBaseQuery() != null) {
try {
- undefinedStates.addAll(io.onedev.server.search.entity.issue.IssueQuery.parse(project, getBaseQuery(), false).getUndefinedStates());
+ undefinedStates.addAll(io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false).getUndefinedStates());
} catch (Exception e) {
}
}
@@ -189,11 +206,11 @@ public class BoardSpec implements Serializable {
return undefinedStates;
}
- public void fixUndefinedStates(Project project, Map<String, UndefinedStateResolution> resolutions) {
+ public void fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {
if (getBaseQuery() != null) {
try {
io.onedev.server.search.entity.issue.IssueQuery query =
- io.onedev.server.search.entity.issue.IssueQuery.parse(project, getBaseQuery(), false);
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false);
for (Map.Entry<String, UndefinedStateResolution> resolutionEntry: resolutions.entrySet())
query.onRenameState(resolutionEntry.getKey(), resolutionEntry.getValue().getNewState());
setBaseQuery(query.toString());
@@ -213,11 +230,11 @@ public class BoardSpec implements Serializable {
}
}
- public Set<String> getUndefinedFields(Project project) {
+ public Set<String> getUndefinedFields() {
Set<String> undefinedFields = new HashSet<>();
if (getBaseQuery() != null) {
try {
- undefinedFields.addAll(io.onedev.server.search.entity.issue.IssueQuery.parse(project, getBaseQuery(), false).getUndefinedFields());
+ undefinedFields.addAll(io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false).getUndefinedFields());
} catch (Exception e) {
}
}
@@ -236,11 +253,11 @@ public class BoardSpec implements Serializable {
return undefinedFields;
}
- public boolean fixUndefinedFields(Project project, Map<String, UndefinedFieldResolution> resolutions) {
+ public boolean fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {
if (getBaseQuery() != null) {
try {
io.onedev.server.search.entity.issue.IssueQuery query =
- io.onedev.server.search.entity.issue.IssueQuery.parse(project, getBaseQuery(), false);
+ io.onedev.server.search.entity.issue.IssueQuery.parse(null, getBaseQuery(), false);
boolean remove = false;
for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {
UndefinedFieldResolution resolution = entry.getValue();
@@ -280,26 +297,7 @@ public class BoardSpec implements Serializable {
return false;
}
- public Collection<UndefinedFieldValue> getUndefinedFieldValues(Project project) {
- Set<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();
- 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) {
+ public boolean fixUndefinedFieldValues(Map<String, ValueSetEdit> valueSetEdits) {
for (Map.Entry<String, ValueSetEdit> entry: valueSetEdits.entrySet()) {
if (onEditFieldValues(entry.getKey(), entry.getValue()))
return true;
@@ -486,17 +484,16 @@ public class BoardSpec implements Serializable {
} catch (Exception e) {
}
}
-
return getColumns().size() < 2;
}
- public Collection<UndefinedFieldValue> getUndefinedFieldValues(GlobalIssueSetting globalSetting) {
+ public Collection<UndefinedFieldValue> getUndefinedFieldValues() {
Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();
if (!identifyField.equals(IssueConstants.FIELD_STATE)) {
- SpecifiedChoices specifiedChoices = SpecifiedChoices.of(globalSetting.getFieldSpec(identifyField));
+ SpecifiedChoices specifiedChoices = SpecifiedChoices.of(getGlobalIssueSetting().getFieldSpec(identifyField));
if (specifiedChoices != null) {
- for (String column: columns) {
- if (!specifiedChoices.getChoiceValues().contains(column))
+ for (String column: getColumns()) {
+ if (column != null && !specifiedChoices.getChoiceValues().contains(column))
undefinedFieldValues.add(new UndefinedFieldValue(identifyField, column));
}
}
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
index 32433e3a1b..9c37b4bc4a 100644
--- 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
@@ -18,9 +18,9 @@ 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.issueworkflowreconcile.UndefinedFieldResolution;
+import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldResolution.FixType;
import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;
import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedStateResolution;
-import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldResolution.FixType;
public class IssueSetting implements Serializable {
@@ -199,12 +199,12 @@ public class IssueSetting implements Serializable {
}
if (boardSpecs != null) {
for (BoardSpec board: boardSpecs)
- undefinedFields.addAll(board.getUndefinedFields(project));
+ undefinedFields.addAll(board.getUndefinedFields());
}
return undefinedFields;
}
- public void fixUndefinedFields(Project project, Map<String, UndefinedFieldResolution> resolutions) {
+ public void fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {
for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {
if (listFields != null) {
listFields.remove(entry.getKey());
@@ -221,7 +221,7 @@ public class IssueSetting implements Serializable {
for (Iterator<NamedIssueQuery> it = savedQueries.iterator(); it.hasNext();) {
NamedIssueQuery namedQuery = it.next();
try {
- IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), false);
+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);
boolean remove = false;
for (Map.Entry<String, UndefinedFieldResolution> entry: resolutions.entrySet()) {
UndefinedFieldResolution resolution = entry.getValue();
@@ -250,7 +250,7 @@ public class IssueSetting implements Serializable {
if (boardSpecs != null) {
for (Iterator<BoardSpec> it = boardSpecs.iterator(); it.hasNext();) {
- if (it.next().fixUndefinedFields(project, resolutions))
+ if (it.next().fixUndefinedFields(resolutions))
it.remove();
}
}
@@ -270,7 +270,7 @@ public class IssueSetting implements Serializable {
if (boardSpecs != null) {
for (BoardSpec board: boardSpecs)
- undefinedStates.addAll(board.getUndefinedStates(project));
+ undefinedStates.addAll(board.getUndefinedStates());
}
if (transitionSpecs != null) {
@@ -281,11 +281,11 @@ public class IssueSetting implements Serializable {
return undefinedStates;
}
- public void fixUndefinedStates(Project project, Map<String, UndefinedStateResolution> resolutions) {
+ public void fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {
if (savedQueries != null) {
for (NamedIssueQuery namedQuery: savedQueries) {
try {
- IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), false);
+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);
for (Map.Entry<String, UndefinedStateResolution> resolutionEntry: resolutions.entrySet())
query.onRenameState(resolutionEntry.getKey(), resolutionEntry.getValue().getNewState());
namedQuery.setQuery(query.toString());
@@ -296,7 +296,7 @@ public class IssueSetting implements Serializable {
if (boardSpecs != null) {
for (BoardSpec board: boardSpecs)
- board.fixUndefinedStates(project, resolutions);
+ board.fixUndefinedStates(resolutions);
}
if (transitionSpecs != null) {
@@ -305,19 +305,19 @@ public class IssueSetting implements Serializable {
}
}
- public Collection<UndefinedFieldValue> getUndefinedFieldValues(Project project) {
+ public Collection<UndefinedFieldValue> getUndefinedFieldValues() {
Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();
if (savedQueries != null) {
for (NamedIssueQuery namedQuery: savedQueries) {
try {
- undefinedFieldValues.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false).getUndefinedFieldValues());
+ undefinedFieldValues.addAll(IssueQuery.parse(null, namedQuery.getQuery(), false).getUndefinedFieldValues());
} catch (Exception e) {
}
}
}
if (boardSpecs != null) {
for (BoardSpec board: boardSpecs)
- undefinedFieldValues.addAll(board.getUndefinedFieldValues(project));
+ undefinedFieldValues.addAll(board.getUndefinedFieldValues());
}
if (transitionSpecs != null) {
for (TransitionSpec transition: transitionSpecs)
@@ -326,13 +326,13 @@ public class IssueSetting implements Serializable {
return undefinedFieldValues;
}
- public void fixUndefinedFieldValues(Project project, Map<String, ValueSetEdit> valueSetEdits) {
+ public void fixUndefinedFieldValues(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);
+ IssueQuery query = IssueQuery.parse(null, namedQuery.getQuery(), false);
for (Map.Entry<String, ValueSetEdit> entry: valueSetEdits.entrySet()) {
if (query.onEditFieldValues(entry.getKey(), entry.getValue())) {
remove = true;
@@ -349,7 +349,7 @@ public class IssueSetting implements Serializable {
}
if (boardSpecs != null) {
for (Iterator<BoardSpec> it = boardSpecs.iterator(); it.hasNext();) {
- if (it.next().fixUndefinedFieldValues(project, valueSetEdits)) {
+ if (it.next().fixUndefinedFieldValues(valueSetEdits)) {
it.remove();
break;
}
@@ -357,7 +357,7 @@ public class IssueSetting implements Serializable {
}
if (transitionSpecs != null) {
for (Iterator<TransitionSpec> it = transitionSpecs.iterator(); it.hasNext();) {
- if (it.next().fixUndefinedFieldValues(project, valueSetEdits)) {
+ if (it.next().fixUndefinedFieldValues(valueSetEdits)) {
it.remove();
break;
}
diff --git a/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java b/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java
index 3ee7d23d2c..7dcd8d6ed1 100644
--- a/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java
+++ b/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java
@@ -16,7 +16,6 @@ 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.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;
@@ -320,7 +319,7 @@ public class TransitionSpec implements Serializable {
return false;
}
- public boolean fixUndefinedFieldValues(Project project, Map<String, ValueSetEdit> valueSetEdits) {
+ public boolean fixUndefinedFieldValues(Map<String, ValueSetEdit> valueSetEdits) {
for (Map.Entry<String, ValueSetEdit> entry: valueSetEdits.entrySet()) {
if (onEditFieldValues(entry.getKey(), entry.getValue()))
return true;
diff --git a/core/src/main/java/io/onedev/server/web/component/configuration/ConfigurationChoiceResourceReference.java b/core/src/main/java/io/onedev/server/web/component/configuration/ConfigurationChoiceResourceReference.java
deleted file mode 100644
index 124e95156c..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/configuration/ConfigurationChoiceResourceReference.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package io.onedev.server.web.component.configuration;
-
-import io.onedev.server.web.page.base.BaseDependentResourceReference;
-
-public class ConfigurationChoiceResourceReference extends BaseDependentResourceReference {
-
- private static final long serialVersionUID = 1L;
-
- public ConfigurationChoiceResourceReference() {
- super(ConfigurationChoiceResourceReference.class, "configuration-choice.js");
- }
-
-}
diff --git a/core/src/main/java/io/onedev/server/web/component/configuration/ConfigurationMultiChoice.java b/core/src/main/java/io/onedev/server/web/component/configuration/ConfigurationMultiChoice.java
index 713736dca2..5ffd9cfe30 100644
--- a/core/src/main/java/io/onedev/server/web/component/configuration/ConfigurationMultiChoice.java
+++ b/core/src/main/java/io/onedev/server/web/component/configuration/ConfigurationMultiChoice.java
@@ -2,11 +2,11 @@ package io.onedev.server.web.component.configuration;
import java.util.Collection;
import java.util.Collections;
+import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.model.IModel;
import io.onedev.server.web.component.select2.Select2MultiChoice;
@@ -19,15 +19,20 @@ public class ConfigurationMultiChoice extends Select2MultiChoice<String> {
private static final long serialVersionUID = 1L;
public ConfigurationMultiChoice(String id, IModel<Collection<String>> model) {
- super(id, model, new StringChoiceProvider(getConfigurationNames()));
+ super(id, model, new StringChoiceProvider(getChoices()));
}
- 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;
+ private static Map<String, String> getChoices() {
+ Map<String, String> choices = new LinkedHashMap<>();
+ if (WicketUtils.getPage() instanceof ProjectPage) {
+ ProjectPage projectPage = (ProjectPage) WicketUtils.getPage();
+ List<String> configurations = projectPage.getProject().getConfigurations()
+ .stream().map(it->it.getName()).collect(Collectors.toList());
+ Collections.sort(configurations);
+ for (String configuration: configurations)
+ choices.put(configuration, configuration);
+ }
+ return choices;
}
@Override
@@ -35,16 +40,9 @@ public class ConfigurationMultiChoice extends Select2MultiChoice<String> {
super.onInitialize();
if (isRequired())
getSettings().setPlaceholder("Choose configurations...");
- getSettings().setFormatResult("onedev.server.configurationChoiceFormatter.formatResult");
- getSettings().setFormatSelection("onedev.server.configurationChoiceFormatter.formatSelection");
- getSettings().setEscapeMarkup("onedev.server.configurationChoiceFormatter.escapeMarkup");
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- response.render(JavaScriptHeaderItem.forReference(new ConfigurationChoiceResourceReference()));
+ getSettings().setFormatResult("onedev.server.choiceFormatter.formatResult");
+ getSettings().setFormatSelection("onedev.server.choiceFormatter.formatSelection");
+ getSettings().setEscapeMarkup("onedev.server.choiceFormatter.escapeMarkup");
}
}
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 3c372e1300..1b45778c85 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,12 +1,11 @@
package io.onedev.server.web.component.configuration;
-import java.util.ArrayList;
import java.util.Collections;
+import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.model.IModel;
import io.onedev.server.web.component.select2.Select2Choice;
@@ -19,19 +18,20 @@ public class ConfigurationSingleChoice extends Select2Choice<String> {
private static final long serialVersionUID = 1L;
public ConfigurationSingleChoice(String id, IModel<String> model) {
- super(id, model, new StringChoiceProvider(getConfigurationNames()));
+ super(id, model, new StringChoiceProvider(getChoices()));
}
- private static List<String> getConfigurationNames() {
+ private static Map<String, String> getChoices() {
+ Map<String, String> choices = new LinkedHashMap<>();
if (WicketUtils.getPage() instanceof ProjectPage) {
ProjectPage projectPage = (ProjectPage) WicketUtils.getPage();
- List<String> configurationNames = projectPage.getProject().getConfigurations()
+ List<String> configurations = projectPage.getProject().getConfigurations()
.stream().map(it->it.getName()).collect(Collectors.toList());
- Collections.sort(configurationNames);
- return configurationNames;
- } else {
- return new ArrayList<>();
- }
+ Collections.sort(configurations);
+ for (String configuration: configurations)
+ choices.put(configuration, configuration);
+ }
+ return choices;
}
@Override
@@ -39,16 +39,9 @@ public class ConfigurationSingleChoice extends Select2Choice<String> {
super.onInitialize();
if (isRequired())
getSettings().setPlaceholder("Choose configuration...");
- getSettings().setFormatResult("onedev.server.configurationChoiceFormatter.formatResult");
- getSettings().setFormatSelection("onedev.server.configurationChoiceFormatter.formatSelection");
- getSettings().setEscapeMarkup("onedev.server.configurationChoiceFormatter.escapeMarkup");
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- response.render(JavaScriptHeaderItem.forReference(new ConfigurationChoiceResourceReference()));
+ getSettings().setFormatResult("onedev.server.choiceFormatter.formatResult");
+ getSettings().setFormatSelection("onedev.server.choiceFormatter.formatSelection");
+ getSettings().setEscapeMarkup("onedev.server.choiceFormatter.escapeMarkup");
}
}
diff --git a/core/src/main/java/io/onedev/server/web/component/configuration/configuration-choice.js b/core/src/main/java/io/onedev/server/web/component/configuration/configuration-choice.js
deleted file mode 100644
index 48af3a4cb5..0000000000
--- a/core/src/main/java/io/onedev/server/web/component/configuration/configuration-choice.js
+++ /dev/null
@@ -1,14 +0,0 @@
-onedev.server.configurationChoiceFormatter = {
- formatSelection: function(configuration) {
- return configuration.name;
- },
-
- formatResult: function(configuration) {
- return "<div class='configuration'>" + configuration.name + "</div>";
- },
-
- escapeMarkup: function(m) {
- return m;
- },
-
-};
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java
index 6c81df85ad..73915ab268 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/board/BoardEditPanel.java
@@ -51,6 +51,10 @@ public abstract class BoardEditPanel extends Panel {
else
board = new BoardSpec();
+ board.getEditColumns().clear();
+ for (String column: board.getColumns())
+ board.getEditColumns().add(column!=null?column:BoardSpec.NULL_COLUMN);
+
BeanEditor editor = BeanContext.editBean("editor", board);
Form<?> form = new Form<Void>("form");
@@ -72,6 +76,10 @@ public abstract class BoardEditPanel extends Panel {
.addError("This name has already been used by another board");
}
if (!editor.hasErrors(true)) {
+ board.getColumns().clear();
+ for (String column: board.getEditColumns())
+ board.getColumns().add(column.equals(BoardSpec.NULL_COLUMN)?null:column);
+
if (boardIndex != -1) {
boards.set(boardIndex, board);
} else {
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 8b263eb7d5..a9b9d131e6 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
@@ -3,8 +3,9 @@ package io.onedev.server.web.component.issue.create;
import java.io.Serializable;
import java.util.Collection;
import java.util.Date;
+import java.util.LinkedHashMap;
import java.util.List;
-import java.util.stream.Collectors;
+import java.util.Map;
import javax.annotation.Nullable;
@@ -21,6 +22,7 @@ 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.Milestone;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.search.entity.issue.IssueCriteria;
@@ -86,9 +88,13 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implement
});
- List<String> milestones = getProject().getMilestones().stream().map(it->it.getName()).collect(Collectors.toList());
- milestoneChoice = new StringSingleChoice("milestone",
- Model.of(issue.getMilestoneName()), milestones) {
+ List<Milestone> milestones = getProject().getSortedMilestones();
+
+ Map<String, String> choices = new LinkedHashMap<>();
+ for (Milestone milestone: milestones)
+ choices.put(milestone.getName(), milestone.getName());
+
+ milestoneChoice = new StringSingleChoice("milestone", Model.of(issue.getMilestoneName()), choices) {
@Override
protected void onInitialize() {
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 cab29c2328..84a7330ea2 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
@@ -4,7 +4,9 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import javax.annotation.Nullable;
@@ -258,6 +260,9 @@ public abstract class IssueListPanel extends GenericPanel<String> {
Fragment fragment = new Fragment(id, "listFieldsFrag", IssueListPanel.this);
Form<?> form = new Form<Void>("form");
fieldSet = getProject().getIssueSetting().getListFields(true);
+ Map<String, String> choices = new LinkedHashMap<>();
+ for (String fieldName: getGlobalIssueSetting().getFieldNames())
+ choices.put(fieldName, fieldName);
form.add(new StringMultiChoice("fields", new IModel<Collection<String>>() {
@Override
@@ -274,7 +279,7 @@ public abstract class IssueListPanel extends GenericPanel<String> {
fieldSet = new HashSet<>(object);
}
- }, getGlobalIssueSetting().getFieldNames()));
+ }, choices));
form.add(new AjaxLink<Void>("close") {
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/side/IssueInfoPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/side/IssueInfoPanel.java
index 4c11388a4c..8c5e95846d 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/side/IssueInfoPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/side/IssueInfoPanel.java
@@ -6,6 +6,7 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Date;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -296,9 +297,13 @@ public abstract class IssueInfoPanel extends Panel {
Fragment fragment = new Fragment("milestone", "milestoneEditFrag", IssueInfoPanel.this);
Form<?> form = new Form<Void>("form");
- List<String> milestones = getProject().getMilestones().stream().map(it->it.getName()).collect(Collectors.toList());
- StringSingleChoice choice = new StringSingleChoice("milestone",
- new PropertyModel<String>(this, "milestoneName"), milestones) {
+ List<Milestone> milestones = getProject().getSortedMilestones();
+
+ Map<String, String> choices = new LinkedHashMap<>();
+ for (Milestone milestone: milestones)
+ choices.put(milestone.getName(), milestone.getName());
+
+ StringSingleChoice choice = new StringSingleChoice("milestone", new PropertyModel<String>(this, "milestoneName"), choices) {
@Override
protected void onInitialize() {
diff --git a/core/src/main/java/io/onedev/server/web/component/stringchoice/StringChoiceProvider.java b/core/src/main/java/io/onedev/server/web/component/stringchoice/StringChoiceProvider.java
index 53de4cadb1..c50c4e486a 100644
--- a/core/src/main/java/io/onedev/server/web/component/stringchoice/StringChoiceProvider.java
+++ b/core/src/main/java/io/onedev/server/web/component/stringchoice/StringChoiceProvider.java
@@ -3,11 +3,11 @@ package io.onedev.server.web.component.stringchoice;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
+import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.json.JSONException;
import org.json.JSONWriter;
-import org.unbescape.html.HtmlEscape;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.component.select2.ChoiceProvider;
@@ -17,25 +17,26 @@ import io.onedev.server.web.component.select2.ResponseFiller;
public class StringChoiceProvider extends ChoiceProvider<String> {
private static final long serialVersionUID = 1L;
+
+ public static final String SPECIAL_CHOICE_PREFIX = "<$OneDevSpecialChoice$>";
- private final List<String> values;
+ private final Map<String, String> choices;
- public StringChoiceProvider(List<String> values) {
- this.values = values;
+ public StringChoiceProvider(Map<String, String> choices) {
+ this.choices = choices;
}
@Override
public void toJson(String choice, JSONWriter writer) throws JSONException {
- String escapedValue = HtmlEscape.escapeHtml5(choice);
- writer.key("id").value(escapedValue).key("name").value(escapedValue);
+ String name = choices.get(choice);
+ if (name == null)
+ name = choice;
+ writer.key("id").value(choice).key("name").value(name);
}
@Override
public Collection<String> toChoices(Collection<String> ids) {
- Collection<String> choices = new ArrayList<>();
- for (String id: ids)
- choices.add(HtmlEscape.unescapeHtml(id));
- return choices;
+ return ids;
}
@Override
@@ -43,12 +44,12 @@ public class StringChoiceProvider extends ChoiceProvider<String> {
List<String> matched;
if (StringUtils.isNotBlank(term)) {
matched = new ArrayList<>();
- for (String each: values) {
- if (each.toLowerCase().startsWith(term))
- matched.add(each);
+ for (Map.Entry<String, String> entry: choices.entrySet()) {
+ if (entry.getValue().toLowerCase().startsWith(term))
+ matched.add(entry.getKey());
}
} else {
- matched = values;
+ matched = new ArrayList<>(choices.keySet());
}
new ResponseFiller<String>(response).fill(matched, page, WebConstants.PAGE_SIZE);
}
diff --git a/core/src/main/java/io/onedev/server/web/component/stringchoice/StringMultiChoice.java b/core/src/main/java/io/onedev/server/web/component/stringchoice/StringMultiChoice.java
index 1d082d4387..1b87f182e0 100644
--- a/core/src/main/java/io/onedev/server/web/component/stringchoice/StringMultiChoice.java
+++ b/core/src/main/java/io/onedev/server/web/component/stringchoice/StringMultiChoice.java
@@ -1,7 +1,7 @@
package io.onedev.server.web.component.stringchoice;
import java.util.Collection;
-import java.util.List;
+import java.util.Map;
import org.apache.wicket.model.IModel;
@@ -10,7 +10,7 @@ import io.onedev.server.web.component.select2.Select2MultiChoice;
@SuppressWarnings("serial")
public class StringMultiChoice extends Select2MultiChoice<String> {
- public StringMultiChoice(String id, IModel<Collection<String>> model, List<String> choices) {
+ public StringMultiChoice(String id, IModel<Collection<String>> model, Map<String, String> choices) {
super(id, model, new StringChoiceProvider(choices));
}
@@ -20,7 +20,6 @@ public class StringMultiChoice extends Select2MultiChoice<String> {
getSettings().setFormatResult("onedev.server.choiceFormatter.formatResult");
getSettings().setFormatSelection("onedev.server.choiceFormatter.formatSelection");
getSettings().setEscapeMarkup("onedev.server.choiceFormatter.escapeMarkup");
-
setConvertEmptyInputStringToNull(true);
}
diff --git a/core/src/main/java/io/onedev/server/web/component/stringchoice/StringSingleChoice.java b/core/src/main/java/io/onedev/server/web/component/stringchoice/StringSingleChoice.java
index 0875780b26..674c4ac717 100644
--- a/core/src/main/java/io/onedev/server/web/component/stringchoice/StringSingleChoice.java
+++ b/core/src/main/java/io/onedev/server/web/component/stringchoice/StringSingleChoice.java
@@ -1,6 +1,6 @@
package io.onedev.server.web.component.stringchoice;
-import java.util.List;
+import java.util.Map;
import org.apache.wicket.model.IModel;
@@ -9,7 +9,7 @@ import io.onedev.server.web.component.select2.Select2Choice;
@SuppressWarnings("serial")
public class StringSingleChoice extends Select2Choice<String> {
- public StringSingleChoice(String id, IModel<String> model, List<String> choices) {
+ public StringSingleChoice(String id, IModel<String> model, Map<String, String> choices) {
super(id, model, new StringChoiceProvider(choices));
}
@@ -19,7 +19,6 @@ public class StringSingleChoice extends Select2Choice<String> {
getSettings().setFormatResult("onedev.server.choiceFormatter.formatResult");
getSettings().setFormatSelection("onedev.server.choiceFormatter.formatSelection");
getSettings().setEscapeMarkup("onedev.server.choiceFormatter.escapeMarkup");
-
setConvertEmptyInputStringToNull(true);
}
diff --git a/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java
index 27ec5e584a..223398a9e1 100644
--- a/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java
@@ -1,13 +1,11 @@
package io.onedev.server.web.editable.choice;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.collections4.MapUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.model.IModel;
@@ -29,19 +27,19 @@ import io.onedev.utils.ReflectionUtils;
@SuppressWarnings("serial")
public class MultiChoiceEditor extends PropertyEditor<List<String>> {
- private final Map<String, String> choices = new LinkedHashMap<>();
-
private Select2MultiChoice<String> input;
public MultiChoiceEditor(String id, PropertyDescriptor propertyDescriptor, IModel<List<String>> propertyModel) {
super(id, propertyDescriptor, propertyModel);
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
+ @SuppressWarnings({"unchecked"})
@Override
protected void onInitialize() {
super.onInitialize();
+ Map<String, String> choices;
+
OneContext oneContext = new ComponentContext(this);
OneContext.push(oneContext);
@@ -53,28 +51,23 @@ public class MultiChoiceEditor extends PropertyEditor<List<String>> {
Preconditions.checkNotNull(choiceProvider);
Object result = ReflectionUtils.invokeStaticMethod(descriptor.getBeanClass(), choiceProvider.value());
if (result instanceof List) {
+ choices = new LinkedHashMap<>();
for (String each: (List<String>)result)
choices.put(each, each);
} else {
- choices.putAll(((Map)result));
+ choices = (Map<String, String>)result;
}
} finally {
OneContext.pop();
}
- Map<String, String> invertedChoices = MapUtils.invertMap(choices);
- Collection<String> selections = new ArrayList<>();
- if (getModelObject() != null) {
- for (String value: getModelObject()) {
- String key = invertedChoices.get(value);
- if (key != null)
- selections.add(key);
- }
- }
-
- IModel<Collection<String>> model = new Model((Serializable) selections);
-
- input = new StringMultiChoice("input", model, new ArrayList<>(choices.keySet())) {
+ List<String> selections;
+ if (getModelObject() != null)
+ selections = getModelObject();
+ else
+ selections = new ArrayList<>();
+
+ input = new StringMultiChoice("input", Model.of(selections), choices) {
@Override
protected void onInitialize() {
@@ -105,10 +98,11 @@ public class MultiChoiceEditor extends PropertyEditor<List<String>> {
@Override
protected List<String> convertInputToValue() throws ConversionException {
- List<String> values = new ArrayList<>();
- for (String each: input.getConvertedInput())
- values.add(choices.get(each));
- return values;
+ Collection<String> convertedInput = input.getConvertedInput();
+ if (convertedInput != null)
+ return new ArrayList<>(convertedInput);
+ else
+ return new ArrayList<>();
}
}
diff --git a/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java
index 31661d4574..e80a83fe7b 100644
--- a/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java
@@ -1,11 +1,9 @@
package io.onedev.server.web.editable.choice;
-import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import org.apache.commons.collections4.MapUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.markup.html.form.FormComponent;
@@ -27,19 +25,19 @@ import io.onedev.utils.ReflectionUtils;
@SuppressWarnings("serial")
public class SingleChoiceEditor extends PropertyEditor<String> {
- private Map<String, String> choices = new LinkedHashMap<>();
-
private FormComponent<String> input;
public SingleChoiceEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {
super(id, propertyDescriptor, propertyModel);
}
- @SuppressWarnings({ "unchecked", "rawtypes" })
+ @SuppressWarnings({"unchecked"})
@Override
protected void onInitialize() {
super.onInitialize();
+ Map<String, String> choices;
+
OneContext oneContext = new ComponentContext(this);
OneContext.push(oneContext);
@@ -51,18 +49,17 @@ public class SingleChoiceEditor extends PropertyEditor<String> {
Preconditions.checkNotNull(choiceProvider);
Object result = ReflectionUtils.invokeStaticMethod(descriptor.getBeanClass(), choiceProvider.value());
if (result instanceof List) {
+ choices = new LinkedHashMap<>();
for (String each: (List<String>)result)
choices.put(each, each);
} else {
- choices.putAll(((Map)result));
+ choices = ((Map<String, String>)result);
}
} finally {
OneContext.pop();
}
- String key = MapUtils.invertMap(choices).get(getModelObject());
-
- input = new StringSingleChoice("input", Model.of(key), new ArrayList<>(choices.keySet())) {
+ input = new StringSingleChoice("input", Model.of(getModelObject()), choices) {
@Override
protected void onInitialize() {
@@ -94,7 +91,7 @@ public class SingleChoiceEditor extends PropertyEditor<String> {
@Override
protected String convertInputToValue() throws ConversionException {
- return choices.get(input.getConvertedInput());
+ return input.getConvertedInput();
}
}
diff --git a/core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationMultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationMultiChoiceEditor.java
index c450ef747f..c311ddaf41 100644
--- a/core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationMultiChoiceEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/configuration/ConfigurationMultiChoiceEditor.java
@@ -1,6 +1,5 @@
package io.onedev.server.web.editable.configuration;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -25,16 +24,17 @@ public class ConfigurationMultiChoiceEditor extends PropertyEditor<List<String>>
super(id, propertyDescriptor, propertyModel);
}
- @SuppressWarnings({ "rawtypes", "unchecked" })
@Override
protected void onInitialize() {
super.onInitialize();
- List<String> configurationNames = new ArrayList<>();
+ List<String> configurations;
if (getModelObject() != null)
- configurationNames.addAll(getModelObject());
+ configurations = getModelObject();
+ else
+ configurations = new ArrayList<>();
- input = new ConfigurationMultiChoice("input", new Model((Serializable) configurationNames));
+ input = new ConfigurationMultiChoice("input", Model.of(configurations));
input.setConvertEmptyInputStringToNull(true);
input.setLabel(Model.of(getDescriptor().getDisplayName(this)));
@@ -48,11 +48,11 @@ public class ConfigurationMultiChoiceEditor extends PropertyEditor<List<String>>
@Override
protected List<String> convertInputToValue() throws ConversionException {
- List<String> configurationNames = new ArrayList<>();
- Collection<String> model = input.getConvertedInput();
- if (model != null)
- configurationNames.addAll(model);
- return configurationNames;
+ Collection<String> convertedInput = input.getConvertedInput();
+ if (convertedInput != null)
+ return new ArrayList<>(convertedInput);
+ else
+ return null;
}
}
diff --git a/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.html b/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.html
index a62a3bcf51..6bbd331b1a 100644
--- a/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.html
+++ b/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <input wicket:id="input" type="hidden" class="form-control"></input>
+ <input wicket:id="input" type="hidden" class="form-control">
</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java
index ba4bc580d8..27d387610f 100644
--- a/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/enumeration/EnumPropertyEditor.java
@@ -1,9 +1,9 @@
package io.onedev.server.web.editable.enumeration;
-import java.util.ArrayList;
import java.util.EnumSet;
import java.util.Iterator;
-import java.util.List;
+import java.util.LinkedHashMap;
+import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -39,19 +39,19 @@ public class EnumPropertyEditor extends PropertyEditor<Enum<?>> {
protected void onInitialize() {
super.onInitialize();
- List<String> choices = new ArrayList<>();
+ Map<String, String> choices = new LinkedHashMap<>();
for (Iterator<?> it = EnumSet.allOf(enumClass).iterator(); it.hasNext();) {
Enum<?> value = (Enum<?>) it.next();
- choices.add(getDisplayValue(value.toString()));
+ choices.put(value.name(), getDisplayValue(value.toString()));
}
- String stringValue;
+ String selection;
if (getModelObject() != null)
- stringValue = getDisplayValue(getModelObject().toString());
+ selection = getModelObject().name();
else
- stringValue = null;
+ selection = null;
- input = new StringSingleChoice("input", Model.of(stringValue), choices) {
+ input = new StringSingleChoice("input", Model.of(selection), choices) {
@Override
protected void onInitialize() {
@@ -83,13 +83,11 @@ public class EnumPropertyEditor extends PropertyEditor<Enum<?>> {
@Override
protected Enum<?> convertInputToValue() throws ConversionException {
- String displayValue = input.getConvertedInput();
- for (Iterator<?> it = EnumSet.allOf(enumClass).iterator(); it.hasNext();) {
- Enum<?> value = (Enum<?>) it.next();
- if (getDisplayValue(value.toString()).equals(displayValue))
- return value;
- }
- return null;
+ String convertedInput = input.getConvertedInput();
+ if (convertedInput != null)
+ return Enum.valueOf(enumClass, convertedInput);
+ else
+ return null;
}
}
diff --git a/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.html b/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.html
index f1c90cbe9e..3817227265 100644
--- a/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.html
+++ b/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <input wicket:id="input" type="hidden"></input>
+ <input wicket:id="input" type="hidden">
</wicket:panel>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java
index ebc2e710dc..04e8971878 100644
--- a/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java
+++ b/core/src/main/java/io/onedev/server/web/editable/enumlist/EnumListPropertyEditor.java
@@ -1,11 +1,11 @@
package io.onedev.server.web.editable.enumlist;
-import java.io.Serializable;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.EnumSet;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -42,20 +42,19 @@ public class EnumListPropertyEditor extends PropertyEditor<List<Enum<?>>> {
protected void onInitialize() {
super.onInitialize();
- List<String> choices = new ArrayList<>();
+ Map<String, String> choices = new LinkedHashMap<>();
for (Iterator<?> it = EnumSet.allOf(enumClass).iterator(); it.hasNext();) {
Enum<?> value = (Enum<?>) it.next();
- choices.add(getDisplayValue(value.toString()));
+ choices.put(value.name(), getDisplayValue(value.toString()));
}
List<String> selections = new ArrayList<>();
if (getModelObject() != null) {
- for (Enum<?> each: getModelObject())
- selections.add(getDisplayValue(each.toString()));
+ for (Enum<?> each: getModelObject())
+ selections.add(each.name());
}
- IModel<Collection<String>> model = new Model((Serializable) selections);
- input = new StringMultiChoice("input", model, choices) {
+ input = new StringMultiChoice("input", Model.of(selections), choices) {
@Override
protected void onInitialize() {
@@ -86,15 +85,9 @@ public class EnumListPropertyEditor extends PropertyEditor<List<Enum<?>>> {
@Override
protected List<Enum<?>> convertInputToValue() throws ConversionException {
List<Enum<?>> values = new ArrayList<>();
-
- for (String stringValue: input.getConvertedInput()) {
- for (Iterator<?> it = EnumSet.allOf(enumClass).iterator(); it.hasNext();) {
- Enum<?> value = (Enum<?>) it.next();
- if (getDisplayValue(value.toString()).equals(stringValue)) {
- values.add(value);
- break;
- }
- }
+ if (input.getConvertedInput() != null) {
+ for (String each: input.getConvertedInput())
+ values.add(Enum.valueOf(enumClass, each));
}
return values;
}
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
index b66aa9a632..ce6a317323 100644
--- 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
@@ -23,12 +23,15 @@ 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 org.unbescape.html.HtmlEscape;
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.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;
import io.onedev.server.web.component.issue.board.BoardEditPanel;
@@ -147,7 +150,18 @@ public class DefaultBoardListPage extends GlobalIssueSettingPage {
}
};
- link.add(new Label("label", StringUtils.join(rowModel.getObject().getColumns())));
+ List<String> columnsForDisplay = new ArrayList<>();
+ for (String column: rowModel.getObject().getColumns()) {
+ if (column == null) {
+ GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();
+ InputSpec field = issueSetting.getFieldSpec(board.getIdentifyField());
+ if (field != null)
+ columnsForDisplay.add("<i>" + HtmlEscape.escapeHtml5(field.getNameOfEmptyValue()) + "</i>");
+ } else {
+ columnsForDisplay.add(HtmlEscape.escapeHtml5(column));
+ }
+ }
+ link.add(new Label("label", StringUtils.join(columnsForDisplay)).setEscapeModelStrings(false));
fragment.add(link);
cellItem.add(fragment);
}
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 162adb8595..6e655180c9 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
@@ -2,6 +2,15 @@ var onedev = {};
String.prototype.escape = function() {
return (this + '').replace(/[\\"']/g, '\\$&').replace(/\u0000/g, '\\0');
};
+String.prototype.escapeHtml = function() {
+ return this
+ .replace(/&/g, "&amp;")
+ .replace(/</g, "&lt;")
+ .replace(/>/g, "&gt;")
+ .replace(/"/g, "&quot;")
+ .replace(/'/g, "&#039;");
+ };
+
onedev.server = {
setupCollapse: function(triggerId, targetId) {
var trigger = $("#" + triggerId);
@@ -360,11 +369,17 @@ onedev.server = {
choiceFormatter: {
formatSelection: function(choice) {
- return choice.id;
+ if (choice.id && choice.id.indexOf("<$OneDevSpecialChoice$>") == 0)
+ return "<i>" + choice.name.escapeHtml() + "</i>";
+ else
+ return choice.name.escapeHtml();
},
formatResult: function(choice) {
- return choice.id;
+ if (choice.id && choice.id.indexOf("<$OneDevSpecialChoice$>") == 0)
+ return "<i>" + choice.name.escapeHtml() + "</i>";
+ else
+ return choice.name.escapeHtml();
},
escapeMarkup: function(m) {
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 bad7063bb4..ebe3f56212 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
@@ -27,6 +27,7 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.unbescape.html.HtmlEscape;
import io.onedev.server.OneDev;
import io.onedev.server.manager.IssueChangeManager;
@@ -84,13 +85,11 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
String identifyField = getBoard().getIdentifyField();
if (identifyField.equals(IssueConstants.FIELD_STATE)) {
criterias.add(new StateCriteria(getColumn()));
+ } else if (getColumn() != null) {
+ criterias.add(new ChoiceFieldCriteria(identifyField,
+ getColumn(), -1, IssueQueryLexer.Is, false));
} else {
- if (getColumn() != null) {
- criterias.add(new ChoiceFieldCriteria(identifyField,
- getColumn(), -1, IssueQueryLexer.Is, false));
- } else {
- criterias.add(new FieldOperatorCriteria(identifyField, IssueQueryLexer.IsEmpty));
- }
+ criterias.add(new FieldOperatorCriteria(identifyField, IssueQueryLexer.IsEmpty));
}
return new IssueQuery(IssueCriteria.of(criterias), boardQuery.getSorts());
} else {
@@ -218,25 +217,29 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
User user = null;
String identifyField = getBoard().getIdentifyField();
if (getColumn() != null) {
- title = getColumn();
+ title = HtmlEscape.escapeHtml5(getColumn());
if (identifyField.equals(IssueConstants.FIELD_STATE)) {
color = getIssueSetting().getStateSpec(getColumn()).getColor();
} else {
- InputSpec field = getIssueSetting().getFieldSpec(identifyField);
- if (field instanceof ChoiceInput) {
- ChoiceProvider choiceProvider = ((ChoiceInput)field).getChoiceProvider();
+ InputSpec fieldSpec = getIssueSetting().getFieldSpec(identifyField);
+ if (fieldSpec instanceof ChoiceInput) {
+ ChoiceProvider choiceProvider = ((ChoiceInput)fieldSpec).getChoiceProvider();
OneContext.push(new ComponentContext(this));
try {
color = choiceProvider.getChoices(true).get(getColumn());
} finally {
OneContext.pop();
}
- } else if (field instanceof UserChoiceInput) {
+ } else if (fieldSpec instanceof UserChoiceInput) {
user = OneDev.getInstance(UserManager.class).findByName(getColumn());
}
}
} else {
- title = getIssueSetting().getFieldSpec(identifyField).getNameOfEmptyValue();
+ InputSpec fieldSpec = getIssueSetting().getFieldSpec(identifyField);
+ if (fieldSpec != null)
+ title = "<i>" + HtmlEscape.escapeHtml5(fieldSpec.getNameOfEmptyValue()) + "</i>";
+ else
+ title = "<i>No value</i>";
}
WebMarkupContainer head = new WebMarkupContainer("head");
@@ -244,7 +247,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
head.add(new WebMarkupContainer("title").setVisible(false));
head.add(new UserIdentPanel("userIdent", UserIdent.of(UserFacade.of(user)), Mode.AVATAR_AND_NAME));
} else {
- head.add(new Label("title", title));
+ head.add(new Label("title", title).setEscapeModelStrings(false));
head.add(new WebMarkupContainer("userIdent").setVisible(false));
}
@@ -413,6 +416,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {
@Nullable
protected abstract Milestone getMilestone();
+ @Nullable
protected abstract String getColumn();
@Nullable
diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.js b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.js
index ae3794f858..bc500d5c56 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.js
+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.js
@@ -51,35 +51,36 @@ onedev.server.issueBoards = {
},
onCardDomReady: function(cardId, callback) {
var $card = $("#" + cardId);
- var $body = $card.closest(".body");
- var bodyContentWidth;
+ var $body = $card.closest(".body");
+ var $container = $body.parent().closest(".body");
+ var containerContentWidth;
if (callback) {
$card.draggable({
helper: "clone",
- appendTo: $body.parent().closest(".body"),
+ appendTo: $container,
scroll: false,
start: function(event, ui) {
// pretend that we are in ajax operation to prevent websocket auto-update while dragging
onedev.server.ajaxRequests.count++;
$card.addClass("issue-dragging");
$(ui.helper).outerWidth($card.outerWidth());
- bodyContentWidth = $body.prop("scrollWidth");
+ containerContentWidth = $container.prop("scrollWidth");
callback($card.data("issue"));
},
drag: function(event, ui) {
var left = ui.position.left;
var right = left + $(ui.helper).outerWidth();
- if (left < $body.scrollLeft()) {
+ if (left < $container.scrollLeft()) {
if (left >= 0)
- $body.scrollLeft(left);
+ $container.scrollLeft(left);
else
- $body.scrollLeft(0);
+ $container.scrollLeft(0);
}
- if ($body.scrollLeft() < right - $body.outerWidth()) {
- if (right <= bodyContentWidth)
- $body.scrollLeft(right - $body.outerWidth());
+ if ($container.scrollLeft() < right - $container.outerWidth()) {
+ if (right <= containerContentWidth)
+ $container.scrollLeft(right - $container.outerWidth());
else
- $body.scrollLeft(bodyContentWidth - $body.outerWidth());
+ $container.scrollLeft(containerContentWidth - $container.outerWidth());
}
},
stop: function(event, ui) {
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
index 2f1ba83de4..0b1ffd5dec 100644
--- 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
@@ -2,6 +2,8 @@ package io.onedev.server.web.page.project.setting.issue;
import java.util.Collection;
import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.Map;
import java.util.Set;
import org.apache.wicket.Session;
@@ -41,6 +43,10 @@ public class PromptFieldsUponIssueOpenSettingPage extends IssueSettingPage {
};
+ Map<String, String> choices = new LinkedHashMap<>();
+ for (String fieldName: getGlobalSetting().getFieldNames())
+ choices.put(fieldName, fieldName);
+
form.add(new StringMultiChoice("fields", new IModel<Collection<String>>() {
@Override
@@ -57,7 +63,7 @@ public class PromptFieldsUponIssueOpenSettingPage extends IssueSettingPage {
fieldSet = new HashSet<>(object);
}
- }, getGlobalSetting().getFieldNames()));
+ }, choices));
form.add(new Link<Void>("useDefault") {
diff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.html b/core/src/main/java/io/onedev/server/web/page/test/TestPage.html
index 623b8841c4..b47194918b 100644
--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.html
@@ -1,3 +1,2 @@
<wicket:extend>
- <a wicket:id="test">test</a>
</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
index 4907f3ba53..03fa904b5e 100644
--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
@@ -3,7 +3,6 @@ package io.onedev.server.web.page.test;
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.link.Link;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.web.page.base.BasePage;
@@ -18,14 +17,6 @@ public class TestPage extends BasePage {
@Override
protected void onInitialize() {
super.onInitialize();
-
- add(new Link<Void>("test") {
-
- @Override
- public void onClick() {
- }
-
- });
}
@Override
diff --git a/core/src/main/java/io/onedev/server/web/page/test/test.css b/core/src/main/java/io/onedev/server/web/page/test/test.css
index e69de29bb2..cd160ed860 100644
--- a/core/src/main/java/io/onedev/server/web/page/test/test.css
+++ b/core/src/main/java/io/onedev/server/web/page/test/test.css
@@ -0,0 +1,4 @@
+form {
+ width: 50%;
+ margin: 50px;
+}
\ No newline at end of file