subtask: Show option menus case by case

yona-projects · Mar 13, 2017 · 890f3b5 · 890f3b5
1 parent 81a4a61
commit 890f3b5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/app/views/issue/create.scala.html b/app/views/issue/create.scala.html
@@ -44,9 +44,9 @@
     							</div>
     						}
                             @if(StringUtils.isNotEmpty(parentIssueId)) {
-                                @partial_select_subtask(project, Long.parseLong(parentIssueId), false)
+                                @partial_select_subtask(project, Long.parseLong(parentIssueId), null)
                             } else {
-                                @partial_select_subtask(project, null, false)
+                                @partial_select_subtask(project, null, null)
                             }
     					}
                     </dd>

diff --git a/app/views/issue/edit.scala.html b/app/views/issue/edit.scala.html
@@ -51,7 +51,7 @@
     							}
     							</div>
     						}
-                          @partial_select_subtask(project, parentIssueId, parentIssueId != null)
+                          @partial_select_subtask(project, parentIssueId, issue.id)
     					}
                     </dd>
                 </dl>

diff --git a/app/views/issue/partial_select_subtask.scala.html b/app/views/issue/partial_select_subtask.scala.html
@@ -4,8 +4,9 @@
 * Copyright Yona & Yobi Authors & NAVER Corp.
 * https://yona.io
 **@
-@(project:Project, parentIssueId:Long, showOption:Boolean = false)
+@(project:Project, parentIssueId:Long, currentIssueId:Long)
 
+@showOption = @{Option(parentIssueId).isDefined && Option(currentIssueId).isDefined}
 @import utils.TemplateHelper._
 
 <div class="subtask-wrap @if(showOption){show}">
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,7 +51,7 @@ @@
         							}
         							</div>
         						}
-                              @partial_select_subtask(project, parentIssueId, parentIssueId != null)
+                              @partial_select_subtask(project, parentIssueId, issue.id)
         					}
                         </dd>
                     </dl>
@@ Expand Down @@