Sang Jun Lee
2017-08-26
[#271] 닫힌 이슈에 기한지남 표시 버그 수정
@4dc1f5efce2fd89efa7a460adabbf1405cbafae1
--- app/models/Issue.java
+++ app/models/Issue.java
... | ... | @@ -593,7 +593,7 @@ |
| 593 | 593 |
} |
| 594 | 594 |
|
| 595 | 595 |
public Boolean isOverDueDate(){
|
| 596 |
- return (JodaDateUtil.ago(dueDate).getMillis() > 0); |
|
| 596 |
+ return isOpen() && (JodaDateUtil.ago(dueDate).getMillis() > 0); |
|
| 597 | 597 |
} |
| 598 | 598 |
|
| 599 | 599 |
public String until(){
|
--- app/views/issue/my_partial_list.scala.html
+++ app/views/issue/my_partial_list.scala.html
... | ... | @@ -92,11 +92,15 @@ |
| 92 | 92 |
} |
| 93 | 93 |
@if(issue.dueDate != null) {
|
| 94 | 94 |
<div class="mr20 mt10 pull-right @if(issue.isOverDueDate) {overdue}" data-toggle="tooltip" data-placement="top" title="@issue.getDueDateString">
|
| 95 |
- <i class="yobicon-clock2"></i> |
|
| 96 |
- @if(issue.isOverDueDate) {
|
|
| 97 |
- @Messages("issue.dueDate.overdue")
|
|
| 95 |
+ <i class="yobicon-clock2"></i> |
|
| 96 |
+ @if(issue.isOpen) {
|
|
| 97 |
+ @if(issue.isOverDueDate) {
|
|
| 98 |
+ @Messages("issue.dueDate.overdue")
|
|
| 99 |
+ } else {
|
|
| 100 |
+ @issue.until |
|
| 101 |
+ } |
|
| 98 | 102 |
} else {
|
| 99 |
- @issue.until |
|
| 103 |
+ @issue.getDueDateString |
|
| 100 | 104 |
} |
| 101 | 105 |
</div> |
| 102 | 106 |
} |
--- app/views/issue/view.scala.html
+++ app/views/issue/view.scala.html
... | ... | @@ -327,7 +327,7 @@ |
| 327 | 327 |
<dt> |
| 328 | 328 |
@Messages("issue.dueDate")
|
| 329 | 329 |
<span class="duedate-status @if(issue.isOverDueDate) {overdue}">
|
| 330 |
- @if(issue.dueDate != null) {
|
|
| 330 |
+ @if(issue.dueDate != null && issue.isOpen) {
|
|
| 331 | 331 |
@if(issue.isOverDueDate) {
|
| 332 | 332 |
(@Messages("issue.dueDate.overdue"))
|
| 333 | 333 |
} else {
|
--- app/views/organization/group_issue_list_partial.scala.html
+++ app/views/organization/group_issue_list_partial.scala.html
... | ... | @@ -99,11 +99,15 @@ |
| 99 | 99 |
</div> |
| 100 | 100 |
@if(issue.dueDate != null) {
|
| 101 | 101 |
<div class="mr20 mt10 pull-right @if(issue.isOverDueDate) {overdue}" data-toggle="tooltip" data-placement="top" title="@issue.getDueDateString">
|
| 102 |
- <i class="yobicon-clock2"></i> |
|
| 103 |
- @if(issue.isOverDueDate) {
|
|
| 104 |
- @Messages("issue.dueDate.overdue")
|
|
| 102 |
+ <i class="yobicon-clock2"></i> |
|
| 103 |
+ @if(issue.isOpen) {
|
|
| 104 |
+ @if(issue.isOverDueDate) {
|
|
| 105 |
+ @Messages("issue.dueDate.overdue")
|
|
| 106 |
+ } else {
|
|
| 107 |
+ @issue.until |
|
| 108 |
+ } |
|
| 105 | 109 |
} else {
|
| 106 |
- @issue.until |
|
| 110 |
+ @issue.getDueDateString |
|
| 107 | 111 |
} |
| 108 | 112 |
</div> |
| 109 | 113 |
} |
--- app/views/user/partial_issues.scala.html
+++ app/views/user/partial_issues.scala.html
... | ... | @@ -94,10 +94,14 @@ |
| 94 | 94 |
@if(issue.dueDate != null) {
|
| 95 | 95 |
<div class="mr20 mt10 pull-right @if(issue.isOverDueDate) {overdue}" data-toggle="tooltip" data-placement="top" title="@issue.getDueDateString">
|
| 96 | 96 |
<i class="yobicon-clock2"></i> |
| 97 |
- @if(issue.isOverDueDate) {
|
|
| 98 |
- @Messages("issue.dueDate.overdue")
|
|
| 97 |
+ @if(issue.isOpen) {
|
|
| 98 |
+ @if(issue.isOverDueDate) {
|
|
| 99 |
+ @Messages("issue.dueDate.overdue")
|
|
| 100 |
+ } else {
|
|
| 101 |
+ @issue.until |
|
| 102 |
+ } |
|
| 99 | 103 |
} else {
|
| 100 |
- @issue.until |
|
| 104 |
+ @issue.getDueDateString |
|
| 101 | 105 |
} |
| 102 | 106 |
</div> |
| 103 | 107 |
</div> |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?