The Unified and Autonomous Development Platform
Fix issue #593 - Can not query issue by comparing custom field of DateTime type to some date
Robin Shen553ef48467ee
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.javaindex 86e9ae9aaa..729eccd259 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java@@ -32,6 +32,7 @@ import io.onedev.server.model.support.issue.field.spec.BuildChoiceField;import io.onedev.server.model.support.issue.field.spec.ChoiceField;import io.onedev.server.model.support.issue.field.spec.CommitField;import io.onedev.server.model.support.issue.field.spec.DateField;+import io.onedev.server.model.support.issue.field.spec.DateTimeField;import io.onedev.server.model.support.issue.field.spec.FieldSpec;import io.onedev.server.model.support.issue.field.spec.GroupChoiceField;import io.onedev.server.model.support.issue.field.spec.IntegerField;@@ -340,7 +341,8 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>if (validate && !Issue.ORDER_FIELDS.containsKey(fieldName)) {FieldSpec fieldSpec = getGlobalIssueSetting().getFieldSpec(fieldName);if (validate && !(fieldSpec instanceof ChoiceField) && !(fieldSpec instanceof DateField)- && !(fieldSpec instanceof IntegerField) && !(fieldSpec instanceof MilestoneChoiceField)) {+ && !(fieldSpec instanceof DateTimeField) && !(fieldSpec instanceof IntegerField)+ && !(fieldSpec instanceof MilestoneChoiceField)) {throw new ExplicitException("Can not order by field: " + fieldName);}}@@ -400,7 +402,8 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>case IssueQueryLexer.IsSince:if (!fieldName.equals(Issue.NAME_SUBMIT_DATE)&& !fieldName.equals(Issue.NAME_UPDATE_DATE)- && !(fieldSpec instanceof DateField)) {+ && !(fieldSpec instanceof DateField)+ && !(fieldSpec instanceof DateTimeField)) {throw newOperatorException(fieldName, operator);}break;diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.javaindex d5b02eacb5..99ff1ec217 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java@@ -60,6 +60,7 @@ import io.onedev.server.model.support.issue.field.spec.BuildChoiceField;import io.onedev.server.model.support.issue.field.spec.ChoiceField;import io.onedev.server.model.support.issue.field.spec.CommitField;import io.onedev.server.model.support.issue.field.spec.DateField;+import io.onedev.server.model.support.issue.field.spec.DateTimeField;import io.onedev.server.model.support.issue.field.spec.FieldSpec;import io.onedev.server.model.support.issue.field.spec.GroupChoiceField;import io.onedev.server.model.support.issue.field.spec.IntegerField;@@ -128,7 +129,8 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {candidates.remove(Issue.NAME_PROJECT);for (FieldSpec field: issueSetting.getFieldSpecs()) {if (field instanceof IntegerField || field instanceof ChoiceField- || field instanceof DateField || field instanceof MilestoneChoiceField) {+ || field instanceof DateField || field instanceof DateTimeField+ || field instanceof MilestoneChoiceField) {candidates.add(field.getName());}}@@ -173,8 +175,8 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {return SuggestionUtils.suggestIssues(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);} else {FieldSpec fieldSpec = issueSetting.getFieldSpec(fieldName);- if (fieldSpec instanceof DateField || fieldName.equals(NAME_SUBMIT_DATE)- || fieldName.equals(NAME_UPDATE_DATE)) {+ if (fieldSpec instanceof DateField || fieldSpec instanceof DateTimeField+ || fieldName.equals(NAME_SUBMIT_DATE) || fieldName.equals(NAME_UPDATE_DATE)) {List<InputSuggestion> suggestions = SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, matchWith);return !suggestions.isEmpty()? suggestions: null;} else if (fieldSpec instanceof UserChoiceField) {