[#271] 닫힌 이슈에 기한지남 표시 버그 수정

yona-projects · Aug 26, 2017 · 4dc1f5e · 4dc1f5e
1 parent 3f4fcd0
commit 4dc1f5e
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 13 deletions.
diff --git a/app/models/Issue.java b/app/models/Issue.java
@@ -593,7 +593,7 @@ public String getDueDateString() {
     }
 
     public Boolean isOverDueDate(){
-        return (JodaDateUtil.ago(dueDate).getMillis() > 0);
+        return isOpen() && (JodaDateUtil.ago(dueDate).getMillis() > 0);
     }
 
     public String until(){

diff --git a/app/views/issue/my_partial_list.scala.html b/app/views/issue/my_partial_list.scala.html
@@ -92,11 +92,15 @@
             }
             @if(issue.dueDate != null) {
             <div class="mr20 mt10 pull-right @if(issue.isOverDueDate) {overdue}" data-toggle="tooltip" data-placement="top" title="@issue.getDueDateString">
-                <i class="yobicon-clock2"></i> 
-                @if(issue.isOverDueDate) {
-                    @Messages("issue.dueDate.overdue")
+                <i class="yobicon-clock2"></i>
+                @if(issue.isOpen) {
+                    @if(issue.isOverDueDate) {
+                        @Messages("issue.dueDate.overdue")
+                    } else {
+                        @issue.until
+                    }
                 } else {
-                    @issue.until
+                    @issue.getDueDateString
                 }
             </div>
             }

diff --git a/app/views/issue/view.scala.html b/app/views/issue/view.scala.html
@@ -327,7 +327,7 @@
                             <dt>
                                 @Messages("issue.dueDate")
                                 <span class="duedate-status @if(issue.isOverDueDate) {overdue}">
-                                @if(issue.dueDate != null) {
+                                @if(issue.dueDate != null && issue.isOpen) {
                                     @if(issue.isOverDueDate) {
                                         (@Messages("issue.dueDate.overdue"))
                                     } else {

diff --git a/app/views/organization/group_issue_list_partial.scala.html b/app/views/organization/group_issue_list_partial.scala.html
@@ -99,11 +99,15 @@
             </div>
             @if(issue.dueDate != null) {
             <div class="mr20 mt10 pull-right @if(issue.isOverDueDate) {overdue}" data-toggle="tooltip" data-placement="top" title="@issue.getDueDateString">
-                <i class="yobicon-clock2"></i> 
-                @if(issue.isOverDueDate) {
-                    @Messages("issue.dueDate.overdue")
+                <i class="yobicon-clock2"></i>
+                @if(issue.isOpen) {
+                    @if(issue.isOverDueDate) {
+                        @Messages("issue.dueDate.overdue")
+                    } else {
+                        @issue.until
+                    }
                 } else {
-                    @issue.until
+                    @issue.getDueDateString
                 }
             </div>
             }

diff --git a/app/views/user/partial_issues.scala.html b/app/views/user/partial_issues.scala.html
@@ -94,10 +94,14 @@
             @if(issue.dueDate != null) {
             <div class="mr20 mt10 pull-right @if(issue.isOverDueDate) {overdue}" data-toggle="tooltip" data-placement="top" title="@issue.getDueDateString">
                 <i class="yobicon-clock2"></i>
-                @if(issue.isOverDueDate) {
-                    @Messages("issue.dueDate.overdue")
+                @if(issue.isOpen) {
+                    @if(issue.isOverDueDate) {
+                        @Messages("issue.dueDate.overdue")
+                    } else {
+                        @issue.until
+                    }
                 } else {
-                    @issue.until
+                    @issue.getDueDateString
                 }
             </div>
         </div>