Commit b00a8ec

moesohacubercsl

authored and

committed

Fix #2279: get associated ContestProblem with Clarification entity

(cherry picked from commit affacb4)

1 parent 8f28862 commit b00a8ecCopy full SHA for b00a8ec

File tree

+11

-3

lines changed

+11

-3

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -267,6 +267,14 @@ public function getProblem(): ?Problem`
`267`	`267`	`return $this->problem;`
`268`	`268`	`}`
`269`	`269`
	`270`	`+ public function getContestProblem(): ?ContestProblem`
	`271`	`+ {`
	`272`	`+ if (!$this->problem) {`
	`273`	`+ return null;`
	`274`	`+ }`
	`275`	`+ return $this->contest->getContestProblem($this->problem);`
	`276`	`+ }`
	`277`	`+`
`270`	`278`	`/**`
`271`	`279`	`* @Serializer\VirtualProperty()`
`272`	`280`	`* @Serializer\SerializedName("problem_id")`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@`
`71`	`71`
`72`	`72`	`<td><a href="{{ link }}">`
`73`	`73`	`{%- if clarification.problem -%}`
`74`		`- problem {{ clarification.problem.contestProblems.first \| problemBadge -}}`
	`74`	`+ problem {{ clarification.contestProblem \| problemBadge -}}`
`75`	`75`	`{%- elseif clarification.category -%}`
`76`	`76`	`{{- categories[clarification.category]\|default('general') -}}`
`77`	`77`	`{%- else -%}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`<div class="col-sm">`
`5`	`5`	`Subject:`
`6`	`6`	`{% if clarification.problem %}`
`7`		`- Problem {{ clarification.problem.contestProblems.first.shortname }}: {{ clarification.problem.name }}`
	`7`	`+ Problem {{ clarification.contestProblem.shortname }}: {{ clarification.problem.name }}`
`8`	`8`	`{% elseif clarification.category %}`
`9`	`9`	`{{ categories[clarification.category]\|default('general') }}`
`10`	`10`	`{% else %}`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@`
`44`	`44`	`<td>`
`45`	`45`	`<a data-ajax-modal data-ajax-modal-after="markSeen" href="{{ link }}">`
`46`	`46`	`{%- if clarification.problem -%}`
`47`		`- problem {{ clarification.problem.contestProblems.first \| problemBadge -}}`
	`47`	`+ problem {{ clarification.contestProblem \| problemBadge -}}`
`48`	`48`	`{%- elseif clarification.category -%}`
`49`	`49`	`{{- categories[clarification.category]\|default('general') -}}`
`50`	`50`	`{%- else -%}`

Comments

(0)