Skip to content

Commit be102f5

Browse files
committed
fine tune and add comments
1 parent 1759ea4 commit be102f5

File tree

5 files changed

+12
-8
lines changed

5 files changed

+12
-8
lines changed

routers/web/repo/compare.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -789,6 +789,9 @@ func CompareDiff(ctx *context.Context) {
789789
if !nothingToCompare {
790790
// Setup information for new form.
791791
RetrieveRepoMetas(ctx, ctx.Repo.Repository, true)
792+
if ctx.Written() {
793+
return
794+
}
792795
RetrieveRepoReviewers(ctx, ctx.Repo.Repository, nil, true)
793796
if ctx.Written() {
794797
return

routers/web/repo/issue.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ func renderMilestones(ctx *context.Context) {
556556
ctx.Data["ClosedMilestones"] = closedMilestones
557557
}
558558

559-
// RetrieveRepoMilestonesAndAssignees find all the milestones, assignees, and reviewers of a repository
559+
// RetrieveRepoMilestonesAndAssignees find all the milestones and assignees of a repository
560560
func RetrieveRepoMilestonesAndAssignees(ctx *context.Context, repo *repo_model.Repository) {
561561
var err error
562562
ctx.Data["OpenMilestones"], err = db.Find[issues_model.Milestone](ctx, issues_model.FindMilestoneOptions{
@@ -676,7 +676,7 @@ type issueSidebarReviewersData struct {
676676
CurrentPullReviewers []*repoReviewerSelection
677677
}
678678

679-
// RetrieveRepoReviewers find all reviewers of a repository
679+
// RetrieveRepoReviewers find all reviewers of a repository. If issue is nil, it means the doer is creating a new PR.
680680
func RetrieveRepoReviewers(ctx *context.Context, repo *repo_model.Repository, issue *issues_model.Issue, canChooseReviewer bool) {
681681
data := &issueSidebarReviewersData{}
682682
data.RepoLink = ctx.Repo.RepoLink

templates/repo/issue/sidebar/reviewer_list.tmpl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</div>
3838
</div>
3939

40-
<div class="ui list flex-items-block">
40+
<div class="ui relaxed list flex-items-block tw-my-4">
4141
<span class="item empty-list {{if or $data.OriginalReviews $data.CurrentPullReviewers}}tw-hidden{{end}}">
4242
{{ctx.Locale.Tr "repo.issues.new.no_reviewers"}}
4343
</span>
@@ -81,7 +81,7 @@
8181
</div>
8282
</div>
8383
{{end}}
84-
{{range .OriginalReviews}}
84+
{{range $data.OriginalReviews}}
8585
<div class="item">
8686
<div class="flex-text-inline tw-flex-1">
8787
{{$originalURLHostname := $data.Repository.GetOriginalURLHostname}}
@@ -112,8 +112,8 @@
112112
{{ctx.RootData.CsrfTokenHtml}}
113113
<input type="hidden" class="reviewer-id" name="review_id">
114114
<div class="field">
115-
<label for="message">{{ctx.Locale.Tr "action.review_dismissed_reason"}}</label>
116-
<input id="message" name="message">
115+
<label for="issue-sidebar-dismiss-review-message">{{ctx.Locale.Tr "action.review_dismissed_reason"}}</label>
116+
<input id="issue-sidebar-dismiss-review-message" name="message">
117117
</div>
118118
<div class="text right actions">
119119
<button class="ui cancel button">{{ctx.Locale.Tr "settings.cancel"}}</button>

web_src/css/repo.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
.issue-sidebar-combo .ui.dropdown .item:not(.checked) svg.octicon-check {
5454
visibility: hidden;
5555
}
56+
/* ideally, we should move these styles to ".ui.dropdown .menu.flex-items-menu > .item ...", could be done later */
5657
.issue-sidebar-combo .ui.dropdown .menu > .item > img,
5758
.issue-sidebar-combo .ui.dropdown .menu > .item > svg {
5859
margin: 0;

web_src/js/features/repo-issue-sidebar-combolist.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ export function initIssueSidebarComboList(container: HTMLElement) {
8080
async onHide() {
8181
const changedValues = collectCheckedValues(elDropdown);
8282
if (updateUrl) {
83-
await updateToBackend(changedValues);
83+
await updateToBackend(changedValues); // send requests to backend and reload the page
8484
} else {
85-
syncList(changedValues);
85+
syncList(changedValues); // only update the list in the sidebar
8686
}
8787
},
8888
});

0 commit comments

Comments
 (0)