The Unified and Autonomous Development Platform
Use left join instead inner join when query issue fieds
Robin Shenb3ba50c67bea
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldUnaryManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldUnaryManager.javaindex 8e879e009e..d369025b70 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldUnaryManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueFieldUnaryManager.java@@ -117,63 +117,60 @@ public class DefaultIssueFieldUnaryManager extends AbstractEntityManager<IssueFifor (PropertyDescriptor propertyDescriptor: beanDescriptor.getPropertyDescriptors()) {String fieldName = propertyDescriptor.getDisplayName();- Object fieldValue = propertyDescriptor.getPropertyValue(fieldBean);- InputSpec fieldSpec = issue.getProject().getIssueWorkflow().getFieldSpec(fieldName);- if (fieldSpec != null) {- long ordinal = fieldSpec.getOrdinal(new OneContext() {-- @Override- public Project getProject() {- return issue.getProject();- }+ if (promptedFields.contains(fieldName)) {+ Object fieldValue = propertyDescriptor.getPropertyValue(fieldBean);+ InputSpec fieldSpec = issue.getProject().getIssueWorkflow().getFieldSpec(fieldName);+ if (fieldSpec != null) {+ long ordinal = fieldSpec.getOrdinal(new OneContext() {++ @Override+ public Project getProject() {+ return issue.getProject();+ }- @Override- public EditContext getEditContext(int level) {- return new EditContext() {+ @Override+ public EditContext getEditContext(int level) {+ return new EditContext() {- @Override- public Object getInputValue(String name) {- return beanDescriptor.getMapOfDisplayNameToPropertyDescriptor().get(name).getPropertyValue(fieldBean);- }-- };- }+ @Override+ public Object getInputValue(String name) {+ return beanDescriptor.getMapOfDisplayNameToPropertyDescriptor().get(name).getPropertyValue(fieldBean);+ }++ };+ }- @Override- public InputContext getInputContext() {- throw new UnsupportedOperationException();- }+ @Override+ public InputContext getInputContext() {+ throw new UnsupportedOperationException();+ }++ }, fieldValue);++ IssueFieldUnary field = new IssueFieldUnary();+ field.setIssue(issue);+ field.setName(fieldName);+ field.setOrdinal(ordinal);+ field.setType(EditableUtils.getDisplayName(fieldSpec.getClass()));- }, fieldValue);-- IssueFieldUnary field = new IssueFieldUnary();- field.setIssue(issue);- field.setName(fieldName);- field.setOrdinal(ordinal);- field.setType(EditableUtils.getDisplayName(fieldSpec.getClass()));- field.setPrompted(promptedFields.contains(fieldName));-- if (fieldValue != null) {- List<String> strings = fieldSpec.convertToStrings(fieldValue);- if (!strings.isEmpty()) {- for (String string: strings) {- IssueFieldUnary cloned = (IssueFieldUnary) SerializationUtils.clone(field);- cloned.setIssue(issue);- cloned.setValue(string);- save(cloned);- issue.getFieldUnaries().add(cloned);+ if (fieldValue != null) {+ List<String> strings = fieldSpec.convertToStrings(fieldValue);+ if (!strings.isEmpty()) {+ for (String string: strings) {+ IssueFieldUnary cloned = (IssueFieldUnary) SerializationUtils.clone(field);+ cloned.setIssue(issue);+ cloned.setValue(string);+ save(cloned);+ issue.getFieldUnaries().add(cloned);+ }+ } else {+ save(field);+ issue.getFieldUnaries().add(field);}} else {save(field);issue.getFieldUnaries().add(field);}- } else {- /*- * Need to add a database record for null field in order to work with- * joined field query- */- save(field);- issue.getFieldUnaries().add(field);}}}diff --git a/core/src/main/java/io/onedev/server/model/Issue.java b/core/src/main/java/io/onedev/server/model/Issue.javaindex c99e60e9a4..276a891981 100644--- a/core/src/main/java/io/onedev/server/model/Issue.java+++ b/core/src/main/java/io/onedev/server/model/Issue.java@@ -4,11 +4,9 @@ import java.util.ArrayList;import java.util.Collection;import java.util.Date;import java.util.HashMap;-import java.util.HashSet;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;-import java.util.Set;import java.util.UUID;import javax.annotation.Nullable;@@ -344,7 +342,7 @@ public class Issue extends AbstractEntity implements Referenceable {Map<String, List<IssueFieldUnary>> unaryMap = new HashMap<>();for (IssueFieldUnary unary: getFieldUnaries()) {- if (fieldNames.contains(unary.getName()) && unary.isPrompted()) {+ if (fieldNames.contains(unary.getName())) {List<IssueFieldUnary> fieldsOfName = unaryMap.get(unary.getName());if (fieldsOfName == null) {fieldsOfName = new ArrayList<>();@@ -387,15 +385,6 @@ public class Issue extends AbstractEntity implements Referenceable {return null;}- public Collection<String> getPromptedFields() {- Set<String> promptedFields = new HashSet<>();- for (IssueFieldUnary unary: getFieldUnaries()) {- if (unary.isPrompted())- promptedFields.add(unary.getName());- }- return promptedFields;- }-@Nullablepublic String getMilestoneName() {return getMilestone()!=null? getMilestone().getName():null;diff --git a/core/src/main/java/io/onedev/server/model/IssueFieldUnary.java b/core/src/main/java/io/onedev/server/model/IssueFieldUnary.javaindex e075f7d3c1..2ef7540bb2 100644--- a/core/src/main/java/io/onedev/server/model/IssueFieldUnary.java+++ b/core/src/main/java/io/onedev/server/model/IssueFieldUnary.java@@ -37,8 +37,6 @@ public class IssueFieldUnary extends AbstractEntity {@Column(nullable=false)private String type;- private boolean prompted;-private long ordinal;public Issue getIssue() {@@ -57,12 +55,6 @@ public class IssueFieldUnary extends AbstractEntity {this.name = name;}- /**- * Get issue field value- *- * @return- * a single value of the field, <tt>null</tt> if the field is not prompted yet- */@Nullablepublic String getValue() {return value;@@ -88,12 +80,4 @@ public class IssueFieldUnary extends AbstractEntity {this.ordinal = ordinal;}- public boolean isPrompted() {- return prompted;- }-- public void setPrompted(boolean prompted) {- this.prompted = prompted;- }-}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/MilestoneCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/MilestoneCriteria.javaindex 0624178ffe..30a670713b 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/MilestoneCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/MilestoneCriteria.java@@ -54,7 +54,7 @@ public class MilestoneCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(Issue.MILESTONE) + " " + IssueQuery.getOperatorName(operator);+ return IssueQuery.quote(Issue.MILESTONE) + " " + IssueQuery.getOperatorName(operator) + " " + IssueQuery.quote(value);}@Overridediff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/QueryBuildContext.java b/core/src/main/java/io/onedev/server/model/support/issue/query/QueryBuildContext.javaindex a5d69435e1..482573dafb 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/QueryBuildContext.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/QueryBuildContext.java@@ -30,7 +30,7 @@ public class QueryBuildContext {join = root.join("milestone", JoinType.LEFT);joins.put(fieldName, join);} else {- join = root.join("fieldUnaries");+ join = root.join("fieldUnaries", JoinType.LEFT);join.on(builder.equal(join.get("name"), fieldName));joins.put(fieldName, join);}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/issue/workflow/IssueWorkflow.javaindex 0849fd4ad9..2211fcf831 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/issue/workflow/IssueWorkflow.java@@ -162,7 +162,7 @@ public class IssueWorkflow implements Serializable {stateSpecs.add(open);StateSpec closed = new StateSpec();- closed.setColor("#777");+ closed.setColor("#5cb85c");closed.setName("Closed");closed.setClosed(true);closed.setFields(Lists.newArrayList("Resolution", "Duplicate With"));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.javaindex ce897cf7c7..b249b51ec5 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@@ -223,8 +223,10 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {@Overrideprotected List<String> getHints(ParentedElement expectedElement, String matchWith) {List<String> hints = super.getHints(expectedElement, matchWith);- if (expectedElement.getSpec() instanceof LiteralElementSpec)+ if (expectedElement.getSpec() instanceof LiteralElementSpec+ || expectedElement.getSpec() instanceof LexerRuleRefElementSpec) {hints.add("Input text without space to match options");+ }return hints;}diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.html b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.htmlindex 62e5cdecb0..b460bd559a 100644--- a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.html@@ -30,9 +30,7 @@<div class="state"><div wicket:id="state"></div></div><div wicket:id="fields"></div><div class="built-in">- <wicket:enclosure child="milestone">- <span title="Milestone"><i class="fa fa-ext fa-milestone"></i> <a wicket:id="milestone"><span wicket:id="name"></span></a></span>- </wicket:enclosure>+ <span title="Milestone"><i class="fa fa-ext fa-milestone"></i> <a wicket:id="milestone"><span wicket:id="name"></span></a></span><span title="Votes"><i class="fa fa-thumbs-o-up"></i> <span wicket:id="votes" class="votes"></span></span><span title="Comments"><i class="fa fa-comments"></i> <span wicket:id="comments" class="comments"></span></span></div>@@ -50,7 +48,7 @@<div class="modal-header"><button wicket:id="close" type="button" class="close">×</button><h4 id="modal-title" class="modal-title">- Fields to Display+ Custom Fields to Display</h4></div><div class="modal-body">diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.javaindex afebcb1e2b..d51e10c9b4 100644--- a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java@@ -217,6 +217,7 @@ public abstract class IssueListPanel extends GenericPanel<String> {getProject().setIssueListFields((ArrayList<String>) bean.getFields());OneDev.getInstance(ProjectManager.class).save(getProject());target.add(IssueListPanel.this);+ modal.close();}});diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.htmlindex 38de923d1f..59de37ca23 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.html@@ -105,7 +105,7 @@<div class="modal-header"><button wicket:id="close" type="button" class="close">×</button><h4 id="modal-title" class="modal-title">- Edit Fields+ Edit Custom Fields</h4></div><div class="modal-body">@@ -119,7 +119,7 @@</wicket:fragment><wicket:fragment wicket:id="milestoneViewFrag"><a wicket:id="link"><span wicket:id="label"></span></a>- <a wicket:id="edit" class="edit action"><i class="fa fa-pencil"></i></a>+ <a wicket:id="edit" title="Change milestone" class="edit action"><i class="fa fa-pencil"></i></a></wicket:fragment><wicket:fragment wicket:id="milestoneEditFrag"><form wicket:id="form">diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.javaindex f5eaf8d805..4d6dbd968f 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java@@ -318,7 +318,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexsuper.onSubmit(target, form);Map<String, IssueField> prevFields = getIssue().getEffectiveFields();- Collection<String> promptedFields = getIssue().getPromptedFields();+ Collection<String> promptedFields = getIssue().getFieldUnaries().stream().map(it->it.getName()).collect(Collectors.toSet());StateSpec toStateSpec = getProject().getIssueWorkflow().getStateSpec(transition.getToState());if (toStateSpec == null)throw new OneException("Unable to find state spec: " + transition.getToState());@@ -487,7 +487,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexint offset = position.getOffset() - 1;List<Issue> issues = getIssueManager().query(getProject(), query, offset, 1);if (!issues.isEmpty()) {- if (!query.getCriteria().matches(getIssue()))+ if (!query.matches(getIssue()))count--;QueryPosition prevPosition = new QueryPosition(position.getQuery(), count, offset);PageParameters params = IssueDetailPage.paramsOf(issues.get(0), prevPosition);@@ -518,7 +518,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexIssueQuery query = IssueQuery.parse(getProject(), position.getQuery(), true);int offset = position.getOffset();int count = position.getCount();- if (query.getCriteria().matches(getIssue()))+ if (query.matches(getIssue()))offset++;elsecount--;@@ -649,8 +649,8 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);- OneDev.getInstance(IssueChangeManager.class).changeFields(getIssue(), fieldBean, prevFields,- getIssue().getPromptedFields());+ Collection<String> promptedFields = getIssue().getFieldUnaries().stream().map(it->it.getName()).collect(Collectors.toSet());+ OneDev.getInstance(IssueChangeManager.class).changeFields(getIssue(), fieldBean, prevFields, promptedFields);modal.close();target.add(fieldsContainer);}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.javaindex 509e599713..d9a2cec060 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java@@ -77,7 +77,7 @@ public class MilestoneDetailPage extends IssuesPage {@Overridepublic String getObject() {- return "label label-" + (getMilestone().isClosed()? "default": "warning");+ return "label label-" + (getMilestone().isClosed()? "success": "warning");}})));diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/milestones.css b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/milestones.cssindex b7d5cc126f..594e936b22 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/milestones.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/milestones.css@@ -5,9 +5,11 @@margin-right: 20px;}#milestone-list>.body tbody a {- color: #444;margin-right: 8px;}+#milestone-list>.body tbody .actions a {+ color: #666;+}.issue-stats .progress {float: left;@@ -17,6 +19,9 @@float: left;margin-right: 20px;}+.issue-stats .text a:first-child {+ margin-right: 8px;+}.milestone-sort.active:before {font-family: "FontAwesome";content: "\f00c";@@ -35,10 +40,18 @@#milestone-detail>.title>* {margin-right: 20px;}+#milestone-detail>.title>.status {+ margin-right: 10px;+ font-size: 16px;+ margin-top: -2px;+}#milestone-detail>.title .due, #milestone-detail>.title a {font-weight: normal;font-size: 16px;}+#milestone-detail>.title .actions a {+ color: #666;+}#milestone-detail .description {background: #F5F5F5;border-radius: 4px;