onedev/server

■ ■ ■ ■ ■ ■

server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueChangeManager.java

		skipped 154 lines
155	155		&& (branches == null \|\| project.isCommitOnBranches(commitId, branches))) {
156	156		IssueQuery query = IssueQuery.parse(project, trigger.getIssueQuery(), true, false, true, false, false);
157	157		List<IssueCriteria> criterias = new ArrayList<>();
	158	+
	159	+	List<IssueCriteria> fromStateCriterias = new ArrayList<>();
158	160		for (String fromState: transition.getFromStates())
159		-	criterias.add(new StateCriteria(fromState));
	161	+	fromStateCriterias.add(new StateCriteria(fromState));
	162	+
	163	+	criterias.add(IssueCriteria.or(fromStateCriterias));
160	164		criterias.add(query.getCriteria());
161		-	query = new IssueQuery(IssueCriteria.of(criterias), new ArrayList<>());
	165	+	query = new IssueQuery(IssueCriteria.and(criterias), new ArrayList<>());
162	166		Build.push(build);
163	167		try {
164	168		for (Issue issue: issueManager.query(project, query, 0, Integer.MAX_VALUE)) {
		skipped 132 lines
297	301		if (trigger.getBranches() == null \|\| PatternSet.parse(trigger.getBranches()).matches(matcher, request.getTargetBranch())) {
298	302		IssueQuery query = IssueQuery.parse(project, trigger.getIssueQuery(), true, false, false, true, false);
299	303		List<IssueCriteria> criterias = new ArrayList<>();
	304	+
	305	+	List<IssueCriteria> fromStateCriterias = new ArrayList<>();
300	306		for (String fromState: transition.getFromStates())
301		-	criterias.add(new StateCriteria(fromState));
	307	+	fromStateCriterias.add(new StateCriteria(fromState));
	308	+
	309	+	criterias.add(IssueCriteria.or(fromStateCriterias));
302	310		criterias.add(query.getCriteria());
303		-	query = new IssueQuery(IssueCriteria.of(criterias), new ArrayList<>());
	311	+	query = new IssueQuery(IssueCriteria.and(criterias), new ArrayList<>());
304	312		PullRequest.push(request);
305	313		try {
306	314		for (Issue issue: issueManager.query(project, query, 0, Integer.MAX_VALUE)) {
		skipped 111 lines
418	426		IssueQuery query = IssueQuery.parse(project, trigger.getIssueQuery(),
419	427		true, false, false, false, true);
420	428		List<IssueCriteria> criterias = new ArrayList<>();
	429	+
	430	+	List<IssueCriteria> fromStateCriterias = new ArrayList<>();
421	431		for (String fromState: transition.getFromStates())
422		-	criterias.add(new StateCriteria(fromState));
	432	+	fromStateCriterias.add(new StateCriteria(fromState));
	433	+
	434	+	criterias.add(IssueCriteria.or(fromStateCriterias));
423	435		criterias.add(query.getCriteria());
424		-	query = new IssueQuery(IssueCriteria.of(criterias), new ArrayList<>());
	436	+	query = new IssueQuery(IssueCriteria.and(criterias), new ArrayList<>());
425	437		ProjectAwareCommit.push(commit);
426	438		try {
427	439		for (Issue issue: issueManager.query(project, query, 0, Integer.MAX_VALUE)) {
		skipped 22 lines

■ ■ ■ ■ ■ ■

server-core/src/main/java/io/onedev/server/issue/TransitionSpec.java

		skipped 196 lines
197	197
198	198		@Override
199	199		public String toString() {
200		-	return StringUtils.join(getFromStates()) + "-->" + getToState();
	200	+	return StringUtils.join(getFromStates()) + "->" + getToState();
201	201		}
202	202
203	203		public boolean canTransitManually(Issue issue, @Nullable String toState) {
		skipped 40 lines

■ ■ ■ ■ ■ ■ ■

server-core/src/main/java/io/onedev/server/search/entity/issue/IssueCriteria.java

		skipped 49 lines
50	50		}
51	51
52	52		@Nullable
53		-	public static IssueCriteria of(List<IssueCriteria> criterias) {
	53	+	public static IssueCriteria and(List<IssueCriteria> criterias) {
54	54		if (criterias.size() > 1)
55	55		return new AndIssueCriteria(criterias);
	56	+	else if (criterias.size() == 1)
	57	+	return criterias.iterator().next();
	58	+	else
	59	+	return null;
	60	+	}
	61	+
	62	+	@Nullable
	63	+	public static IssueCriteria or(List<IssueCriteria> criterias) {
	64	+	if (criterias.size() > 1)
	65	+	return new OrIssueCriteria(criterias);
56	66		else if (criterias.size() == 1)
57	67		return criterias.iterator().next();
58	68		else
		skipped 9 lines

■ ■ ■ ■ ■ ■

server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java

		skipped 505 lines
506	506		List<EntitySort> sorts = new ArrayList<>();
507	507		sorts.addAll(query1.getSorts());
508	508		sorts.addAll(query2.getSorts());
509		-	return new IssueQuery(IssueCriteria.of(criterias), sorts);
	509	+	return new IssueQuery(IssueCriteria.and(criterias), sorts);
510	510		}
511	511
512	512		}
		skipped 1 lines

■ ■ ■ ■ ■ ■

server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BacklogColumnPanel.java

		skipped 49 lines
50	50		if (backlogQuery.getCriteria() != null)
51	51		criterias.add(backlogQuery.getCriteria());
52	52		criterias.add(new MilestoneIsEmptyCriteria());
53		-	return new IssueQuery(IssueCriteria.of(criterias), backlogQuery.getSorts());
	53	+	return new IssueQuery(IssueCriteria.and(criterias), backlogQuery.getSorts());
54	54		} else {
55	55		return null;
56	56		}
		skipped 170 lines

■ ■ ■ ■ ■ ■

server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java

		skipped 89 lines
90	90		} else {
91	91		criterias.add(new FieldOperatorCriteria(identifyField, IssueQueryLexer.IsEmpty, false));
92	92		}
93		-	return new IssueQuery(IssueCriteria.of(criterias), boardQuery.getSorts());
	93	+	return new IssueQuery(IssueCriteria.and(criterias), boardQuery.getSorts());
94	94		} else {
95	95		return null;
96	96		}
		skipped 345 lines

fix issue #27: Multiple from states prevent build successful trigger to transit issues automatically