Commit @2e533ad71f961585a6111f05ebe1f50a67dd7962

doortts 2018-04-11

subtask: Extract similar code blocks to file

@2e533ad71f961585a6111f05ebe1f50a67dd7962

2e533ad

app/views/issue/partial_view_child.scala.html (added)

+++ app/views/issue/partial_view_child.scala.html

...	...	@@ -0,0 +1,15 @@
	1	+@**
	2	+* Yona, 21st Century Project Hosting SW
	3	+*
	4	+* Copyright Yona & Yobi Authors & NAVER Corp. & NAVER LABS Corp.
	5	+* https://yona.io
	6	+**@
	7	+@(state: String, childIssue: Issue, parentIssue: Issue)
	8	+
	9	+<div class="issue-item @if(childIssue.id == parentIssue.id){selected-child}">
	10	+ <span class="state-label @state">@if(state == "closed"){<i class=" yobicon-checkmark">}</i></span>
	11	+ <a href="@routes.IssueApp.issue(childIssue.project.owner, childIssue.project.name, childIssue.getNumber)">
	12	+ <span class="item-name"><span class="subtask-number">#@childIssue.getNumber</span> @childIssue.title@if(childIssue.assignee != null) { - @childIssue.assignee.user.getPureNameOnly}</span></a>
	13	+ <span class="font12 no-border-at-child">@common.commentAndVoterPairDisplay(childIssue, parentIssue.project)</span>
	14	+</div>
	15	+

c224e28

2e533ad

app/views/issue/partial_view_childIssueList.scala.html

--- app/views/issue/partial_view_childIssueList.scala.html

+++ app/views/issue/partial_view_childIssueList.scala.html


                             <span class="@if(percentage == 100){txt-green}">@if(percentage != 100){@closedChildIssues.size/}@(openChildIssues.size + closedChildIssues.size)</span>
                             <span class="parent-issue-state @parentIssue.state.state">@Messages("issue.state." + parentIssue.state.state)</span>
                         </div>
-                }
+                    }
                 }
                 <hr class="parent-issue-delimeter"/>
-                @for(childIssue <- openChildIssues) {
-                    <div class="issue-item @if(childIssue.id == issue.id){selected-child}">
-                        <span class="state-label open"></span>
-                        <a href="@routes.IssueApp.issue(childIssue.project.owner, childIssue.project.name, childIssue.getNumber)">
-                            <span class="item-name"><span class="subtask-number">#@childIssue.getNumber</span> @childIssue.title@if(childIssue.assignee != null) { - @childIssue.assignee.user.getPureNameOnly}</span></a>
-                        <span class="font12 no-border-at-child">@common.commentAndVoterPairDisplay(childIssue, project)</span>
-                    </div>
-                }
-                @for(childIssue <- closedChildIssues) {
-                    <div class="issue-item @if(childIssue.id == issue.id){selected-child}">
-                        <span class="state-label closed"><i class=" yobicon-checkmark"></i></span>
-                        <a href="@routes.IssueApp.issue(childIssue.project.owner, childIssue.project.name, childIssue.getNumber)">
-                            <span class="item-name"><span class="subtask-number">#@childIssue.getNumber</span> @childIssue.title@if(childIssue.assignee != null){ - @childIssue.assignee.user.getPureNameOnly}</span></a>
-                        <span class="font12 no-border-at-child">@common.commentAndVoterPairDisplay(childIssue, project)</span>
+                @if(!openChildIssues.isEmpty || !closedChildIssues.isEmpty) {
+                    <div class="child-issues">
+                        @for(childIssue <- openChildIssues) {
+                            @partial_view_child("open", childIssue, issue)
+                        }
+                        @for(childIssue <- closedChildIssues) {
+                            @partial_view_child("closed", childIssue, issue)
+                        }
                     </div>
                 }
             </div>

Add a comment

Open 0
Closed 0

List

...	...	@@ -30,23 +30,17 @@
30	30	<span class="@if(percentage == 100){txt-green}">@if(percentage != 100){@closedChildIssues.size/}@(openChildIssues.size + closedChildIssues.size)</span>
31	31	<span class="parent-issue-state @parentIssue.state.state">@Messages("issue.state." + parentIssue.state.state)</span>
32	32	</div>
33		- }
	33	+ }
34	34	}
35	35	<hr class="parent-issue-delimeter"/>
36		- @for(childIssue <- openChildIssues) {
37		- <div class="issue-item @if(childIssue.id == issue.id){selected-child}">
38		- <span class="state-label open"></span>
39		- <a href="@routes.IssueApp.issue(childIssue.project.owner, childIssue.project.name, childIssue.getNumber)">
40		- <span class="item-name"><span class="subtask-number">#@childIssue.getNumber</span> @childIssue.title@if(childIssue.assignee != null) { - @childIssue.assignee.user.getPureNameOnly}</span></a>
41		- <span class="font12 no-border-at-child">@common.commentAndVoterPairDisplay(childIssue, project)</span>
42		- </div>
43		- }
44		- @for(childIssue <- closedChildIssues) {
45		- <div class="issue-item @if(childIssue.id == issue.id){selected-child}">
46		- <span class="state-label closed"><i class=" yobicon-checkmark"></i></span>
47		- <a href="@routes.IssueApp.issue(childIssue.project.owner, childIssue.project.name, childIssue.getNumber)">
48		- <span class="item-name"><span class="subtask-number">#@childIssue.getNumber</span> @childIssue.title@if(childIssue.assignee != null){ - @childIssue.assignee.user.getPureNameOnly}</span></a>
49		- <span class="font12 no-border-at-child">@common.commentAndVoterPairDisplay(childIssue, project)</span>
	36	+ @if(!openChildIssues.isEmpty \|\| !closedChildIssues.isEmpty) {
	37	+ <div class="child-issues">
	38	+ @for(childIssue <- openChildIssues) {
	39	+ @partial_view_child("open", childIssue, issue)
	40	+ }
	41	+ @for(childIssue <- closedChildIssues) {
	42	+ @partial_view_child("closed", childIssue, issue)
	43	+ }
50	44	</div>
51	45	}
52	46	</div>

Delete comment