Skip to content
Permalink
Browse files

Hot fixes for comments on proposals and evaluation results, also badg…

…es on user profiles
  • Loading branch information...
carlosbpf committed Oct 8, 2019
1 parent c22d774 commit c4b65f8548ec50681096ba0d298596eb5813e97e
@@ -47,6 +47,7 @@

void setIsQuiet(Boolean isQuiet);

@JsonIgnore
default int getCommentsCount() {
return StaticCommentContext.getCommentClient().countComments(getId());
}
@@ -341,7 +341,7 @@ boolean forcePromotionOfProposalInPhase(@PathVariable("contestPhaseId") Long con
default List<ContestWrapper> getContests(Boolean contestActive, Boolean contestPrivate,
Long contestTypeId) {
String lang = LocaleContextHolder.getLocale().getLanguage();
return getContests(null, null, null, lang, null, null, contestActive, null, null, null,
return getContests(null, Integer.MAX_VALUE, null, lang, null, null, contestActive, null, null, null,
null, null, null,
Collections.singletonList(contestTypeId), contestPrivate, null);
}
@@ -336,7 +336,7 @@ public long getDiscussionIdOrCreate() {

@JsonIgnore
public long getResultsDiscussionIdOrCreate() {
Long discussionId = getDiscussionId();
Long discussionId = getResultsDiscussionId();
if (discussionId == null) {
discussionId = createDiscussionThread(" results discussion", true);
setResultsDiscussionId(discussionId);
@@ -169,7 +169,7 @@ ProposalWrapper createProposal(@RequestParam("authorUserId") Long authorUserId,
try {
final ProposalWrapper proposal = getProposal(proposalReference.getProposalId());
if (!linkingProposals.contains(proposal)) {
linkingProposals.add(proposal);
linkingProposals.add(new ProposalWrapper(proposal));
}
} catch (ProposalNotFoundException ignored) {

@@ -60,7 +60,7 @@ public BadgeBean(long userId) {

private IProposalContestPhaseAttribute getRibbonAttribute(long proposalId, long phaseId) {
return StaticProposalContext.getProposalPhaseClient()
.getProposalContestPhaseAttribute(proposalId, phaseId,
.getProposalContestPhaseAttribute( phaseId,proposalId,
ProposalContestPhaseAttributeKeys.RIBBON);
}

0 comments on commit c4b65f8

Please sign in to comment.
You can’t perform that action at this time.