Skip to content

Commit d2237b9

Browse files
committed
Fix multi-actions in PR page
1 parent ef3792f commit d2237b9

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

routers/repo/issue.go

+8
Original file line numberDiff line numberDiff line change
@@ -728,6 +728,10 @@ func GetActionIssue(ctx *context.Context) *models.Issue {
728728
ctx.Handle(404, "UnitEnabled", nil)
729729
return nil
730730
}
731+
if err = issue.LoadAttributes(); err != nil {
732+
ctx.Handle(500, "LoadAttributes", nil)
733+
return nil
734+
}
731735
return issue
732736
}
733737

@@ -758,6 +762,10 @@ func getActionIssues(ctx *context.Context) []*models.Issue {
758762
ctx.Handle(404, "UnitEnabled", nil)
759763
return nil
760764
}
765+
if err = issue.LoadAttributes(); err != nil {
766+
ctx.Handle(500, "LoadAttributes", nil)
767+
return nil
768+
}
761769
}
762770
return issues
763771
}

templates/repo/issue/list.tmpl

+5-5
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@
103103
</div>
104104
<div class="issue-actions">
105105
<div class="ui basic status buttons">
106-
<div class="ui green active basic button issue-action" data-action="open" data-url="{{$.Link}}/status">{{.i18n.Tr "repo.issues.action_open"}}</div>
107-
<div class="ui red active basic button issue-action" data-action="close" data-url="{{$.Link}}/status">{{.i18n.Tr "repo.issues.action_close"}}</div>
106+
<div class="ui green active basic button issue-action" data-action="open" data-url="{{$.RepoLink}}/issues/status">{{.i18n.Tr "repo.issues.action_open"}}</div>
107+
<div class="ui red active basic button issue-action" data-action="close" data-url="{{$.RepoLink}}/issues/status">{{.i18n.Tr "repo.issues.action_close"}}</div>
108108
</div>
109109

110110
<div class="ui secondary filter menu floated right">
@@ -116,7 +116,7 @@
116116
</span>
117117
<div class="menu">
118118
{{range .Labels}}
119-
<div class="item issue-action" data-action="toggle" data-element-id="{{.ID}}" data-url="{{$.Link}}/labels">
119+
<div class="item issue-action" data-action="toggle" data-element-id="{{.ID}}" data-url="{{$.RepoLink}}/issues/labels">
120120
<span class="octicon {{if eq $.SelectLabels .ID}}octicon-check{{end}}"></span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name | Sanitize}}
121121
</div>
122122
{{end}}
@@ -134,7 +134,7 @@
134134
{{.i18n.Tr "repo.issues.action_milestone_no_select"}}
135135
</div>
136136
{{range .Milestones}}
137-
<div class="item issue-action" data-element-id="{{.ID}}" data-url="{{$.Link}}/milestone">
137+
<div class="item issue-action" data-element-id="{{.ID}}" data-url="{{$.RepoLink}}/issues/milestone">
138138
{{.Name | Sanitize}}
139139
</div>
140140
{{end}}
@@ -152,7 +152,7 @@
152152
{{.i18n.Tr "repo.issues.action_assignee_no_select"}}
153153
</div>
154154
{{range .Assignees}}
155-
<div class="item issue-action" data-element-id="{{.ID}}" data-url="{{$.Link}}/assignee">
155+
<div class="item issue-action" data-element-id="{{.ID}}" data-url="{{$.RepoLink}}/issues/assignee">
156156
<img src="{{.RelAvatarLink}}"> {{.Name}}
157157
</div>
158158
{{end}}

0 commit comments

Comments
 (0)