Skip to content

Commit 067b922

Browse files
zjjhotzjjhot
committed
Merge remote-tracking branch 'giteaofficial/main'
* giteaofficial/main: Use Vue to refactor pull merge UI (go-gitea#19650) [skip ci] Updated translations via Crowdin
2 parents 7ac964a + 368baf9 commit 067b922

File tree

8 files changed

+220
-232
lines changed

8 files changed

+220
-232
lines changed

‎integrations/pull_merge_test.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,8 @@ func testPullMerge(t *testing.T, session *TestSession, user, repo, pullnum strin
3737
req := NewRequest(t, "GET", path.Join(user, repo, "pulls", pullnum))
3838
resp := session.MakeRequest(t, req, http.StatusOK)
3939

40-
// Click the little green button to create a pull
4140
htmlDoc := NewHTMLParser(t, resp.Body)
42-
link, exists := htmlDoc.doc.Find(".ui.form." + string(mergeStyle) + "-fields > form").Attr("action")
43-
assert.True(t, exists, "The template has changed")
41+
link := path.Join(user, repo, "pulls", pullnum, "merge")
4442
req = NewRequestWithValues(t, "POST", link, map[string]string{
4543
"_csrf": htmlDoc.GetCSRF(),
4644
"do": string(mergeStyle),
@@ -57,7 +55,7 @@ func testPullCleanUp(t *testing.T, session *TestSession, user, repo, pullnum str
5755
// Click the little green button to create a pull
5856
htmlDoc := NewHTMLParser(t, resp.Body)
5957
link, exists := htmlDoc.doc.Find(".timeline-item .delete-button").Attr("data-url")
60-
assert.True(t, exists, "The template has changed")
58+
assert.True(t, exists, "The template has changed, can not find delete button url")
6159
req = NewRequestWithValues(t, "POST", link, map[string]string{
6260
"_csrf": htmlDoc.GetCSRF(),
6361
})

‎models/repo/repo_unit.go‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -150,24 +150,6 @@ func (cfg *PullRequestsConfig) GetDefaultMergeStyle() MergeStyle {
150150
return MergeStyleMerge
151151
}
152152

153-
// AllowedMergeStyleCount returns the total count of allowed merge styles for the PullRequestsConfig
154-
func (cfg *PullRequestsConfig) AllowedMergeStyleCount() int {
155-
count := 0
156-
if cfg.AllowMerge {
157-
count++
158-
}
159-
if cfg.AllowRebase {
160-
count++
161-
}
162-
if cfg.AllowRebaseMerge {
163-
count++
164-
}
165-
if cfg.AllowSquash {
166-
count++
167-
}
168-
return count
169-
}
170-
171153
// BeforeSet is invoked from XORM before setting the value of a field of this object.
172154
func (r *RepoUnit) BeforeSet(colName string, val xorm.Cell) {
173155
switch colName {

‎options/locale/locale_pt-PT.ini‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ hidden_comment_types=Tipos de comentários ocultos
559559
comment_type_group_reference=Referência
560560
comment_type_group_label=Rótulo
561561
comment_type_group_milestone=Etapa
562-
comment_type_group_assignee=Responsável
562+
comment_type_group_assignee=Encarregado
563563
comment_type_group_title=Título
564564
comment_type_group_branch=Ramo
565565
comment_type_group_time_tracking=Contagem de tempo
@@ -1188,7 +1188,7 @@ projects.close=Fechar
11881188
projects.board.assigned_to=Atribuído a
11891189

11901190
issues.desc=Organize relatórios de erros, tarefas e etapas.
1191-
issues.filter_assignees=Filtrar responsável
1191+
issues.filter_assignees=Filtrar encarregado
11921192
issues.filter_milestones=Filtrar etapa
11931193
issues.filter_projects=Filtrar planeamento
11941194
issues.filter_labels=Filtrar rótulo
@@ -1212,10 +1212,10 @@ issues.new.no_milestone=Sem etapa
12121212
issues.new.clear_milestone=Limpar etapa
12131213
issues.new.open_milestone=Etapas abertas
12141214
issues.new.closed_milestone=Etapas fechadas
1215-
issues.new.assignees=Responsáveis
1216-
issues.new.add_assignees_title=Definir responsáveis
1217-
issues.new.clear_assignees=Limpar responsáveis
1218-
issues.new.no_assignees=Sem responsáveis
1215+
issues.new.assignees=Encarregados
1216+
issues.new.add_assignees_title=Definir encarregados
1217+
issues.new.clear_assignees=Retirar todos os encarregados
1218+
issues.new.no_assignees=Sem encarregados
12191219
issues.new.no_reviewers=Sem revisores
12201220
issues.new.add_reviewer_title=Solicitar revisão
12211221
issues.choose.get_started=Começar
@@ -1261,8 +1261,7 @@ issues.filter_label_exclude=`Use <code>alt</code> + <code>clique/enter</code> pa
12611261
issues.filter_label_no_select=Todos os rótulos
12621262
issues.filter_milestone=Etapa
12631263
issues.filter_milestone_no_select=Todas as etapas
1264-
issues.filter_assignee=Responsável
1265-
issues.filter_assginee_no_select=Todos os responsáveis
1264+
issues.filter_assignee=Encarregado
12661265
issues.filter_type=Tipo
12671266
issues.filter_type.all_issues=Todas as questões
12681267
issues.filter_type.assigned_to_you=Atribuídas a si
@@ -1288,8 +1287,8 @@ issues.action_close=Fechar
12881287
issues.action_label=Rótulo
12891288
issues.action_milestone=Etapa
12901289
issues.action_milestone_no_select=Sem etapa
1291-
issues.action_assignee=Responsável
1292-
issues.action_assignee_no_select=Sem responsável
1290+
issues.action_assignee=Encarregado
1291+
issues.action_assignee_no_select=Sem encarregado
12931292
issues.opened_by=aberta %[1]s por <a href="%[2]s">%[3]s</a>
12941293
pulls.merged_by=por <a href="%[2]s">%[3]s</a> foi executado %[1]s
12951294
pulls.merged_by_fake=por %[2]s foi executado %[1]s
@@ -1461,6 +1460,7 @@ issues.review.add_review_request=solicitou revisão de %s %s
14611460
issues.review.remove_review_request=removeu a solicitação de revisão para %s %s
14621461
issues.review.remove_review_request_self=recusou-se a rever %s
14631462
issues.review.pending=Pendente
1463+
issues.review.pending.tooltip=Este comentário não está visível para os outros utilizadores, neste momento. Para submeter os seus comentários pendentes, escolha '%s' -> '%s/%s/%s' no topo da página.
14641464
issues.review.review=Revisão
14651465
issues.review.reviewers=Revisores
14661466
issues.review.outdated=Obsoleta
@@ -1471,7 +1471,7 @@ issues.review.hide_resolved=Ocultar os concluídos
14711471
issues.review.resolve_conversation=Passar diálogo ao estado de resolvido
14721472
issues.review.un_resolve_conversation=Passar diálogo ao estado de não resolvido
14731473
issues.review.resolved_by=marcou este diálogo como estando concluído
1474-
issues.assignee.error=Nem todos os responsáveis foram adicionados devido a um erro inesperado.
1474+
issues.assignee.error=Nem todos os encarregados foram adicionados devido a um erro inesperado.
14751475
issues.reference_issue.body=Conteúdo
14761476
issues.content_history.deleted=eliminado
14771477
issues.content_history.edited=editado
@@ -1954,7 +1954,7 @@ settings.event_header_issue=Eventos da questão
19541954
settings.event_issues=Questões
19551955
settings.event_issues_desc=Questão aberta, fechada, reaberta ou editada.
19561956
settings.event_issue_assign=Questão atribuída
1957-
settings.event_issue_assign_desc=Responsável atribuído ou retirado à questão.
1957+
settings.event_issue_assign_desc=Encarregado atribuído ou retirado à questão.
19581958
settings.event_issue_label=Questão com rótulo
19591959
settings.event_issue_label_desc=Rótulos modificados ou retirados às questões.
19601960
settings.event_issue_milestone=Questão com etapa atribuída
@@ -1964,8 +1964,8 @@ settings.event_issue_comment_desc=Comentário da questão criado, editado ou eli
19641964
settings.event_header_pull_request=Eventos de pedidos de integração
19651965
settings.event_pull_request=Pedido de integração
19661966
settings.event_pull_request_desc=Pedido de integração aberto, fechado, reaberto ou editado.
1967-
settings.event_pull_request_assign=Responsável atribuído ao pedido de integração
1968-
settings.event_pull_request_assign_desc=Responsável atribuído ou retirado ao pedido de integração.
1967+
settings.event_pull_request_assign=Encarregado atribuído ao pedido de integração
1968+
settings.event_pull_request_assign_desc=Encarregado atribuído ou retirado ao pedido de integração.
19691969
settings.event_pull_request_label=Rótulo atribuído ao pedido de integração
19701970
settings.event_pull_request_label_desc=Rótulos modificados ou retirados aos pedidos de integração.
19711971
settings.event_pull_request_milestone=Etapa atribuída ao pedido de integração

‎templates/repo/issue/view_content/pull.tmpl‎

Lines changed: 61 additions & 168 deletions
Original file line numberDiff line numberDiff line change
@@ -322,176 +322,69 @@
322322
{{$prUnit := .Repository.MustGetUnit $.UnitTypePullRequests}}
323323
{{$approvers := .Issue.PullRequest.GetApprovers}}
324324
{{if or $prUnit.PullRequestsConfig.AllowMerge $prUnit.PullRequestsConfig.AllowRebase $prUnit.PullRequestsConfig.AllowRebaseMerge $prUnit.PullRequestsConfig.AllowSquash}}
325+
325326
<div class="ui divider"></div>
326-
{{if $prUnit.PullRequestsConfig.AllowMerge}}
327-
<div class="ui form merge-fields" style="display: none">
328-
<form action="{{.Link}}/merge" method="post">
329-
{{.CsrfTokenHtml}}
330-
<input type="hidden" name="head_commit_id" value="{{.PullHeadCommitID}}">
331-
<div class="field">
332-
<input type="text" name="merge_title_field" value="{{.DefaultMergeMessage}}">
333-
</div>
334-
<div class="field">
335-
<textarea name="merge_message_field" rows="5" placeholder="{{$.i18n.Tr "repo.editor.commit_message_desc"}}">Reviewed-on: {{$.Issue.HTMLURL}}&#13;&#10;{{$approvers}}</textarea>
336-
</div>
337-
<button class="ui green button" type="submit" name="do" value="merge">
338-
{{$.i18n.Tr "repo.pulls.merge_pull_request"}}
339-
</button>
340-
<button class="ui button merge-cancel">
341-
{{$.i18n.Tr "cancel"}}
342-
</button>
343-
{{if .IsPullBranchDeletable}}
344-
<div class="ui checkbox ml-2">
345-
<input name="delete_branch_after_merge" type="checkbox" {{if $prUnit.PullRequestsConfig.DefaultDeleteBranchAfterMerge}}checked{{end}}>
346-
<label>{{$.i18n.Tr "repo.branch.delete" .HeadTarget}}</label>
347-
</div>
348-
{{end}}
349-
</form>
350-
</div>
351-
{{end}}
352-
{{if $prUnit.PullRequestsConfig.AllowRebase}}
353-
<div class="ui form rebase-fields" style="display: none">
354-
<form action="{{.Link}}/merge" method="post">
355-
{{.CsrfTokenHtml}}
356-
<input type="hidden" name="head_commit_id" value="{{.PullHeadCommitID}}">
357-
<button class="ui green button" type="submit" name="do" value="rebase">
358-
{{$.i18n.Tr "repo.pulls.rebase_merge_pull_request"}}
359-
</button>
360-
<button class="ui button merge-cancel">
361-
{{$.i18n.Tr "cancel"}}
362-
</button>
363-
{{if .IsPullBranchDeletable}}
364-
<div class="ui checkbox ml-2">
365-
<input name="delete_branch_after_merge" type="checkbox" {{if $prUnit.PullRequestsConfig.DefaultDeleteBranchAfterMerge}}checked{{end}}>
366-
<label>{{$.i18n.Tr "repo.branch.delete" .HeadTarget}}</label>
367-
</div>
368-
{{end}}
369-
</form>
370-
</div>
371-
{{end}}
372-
{{if $prUnit.PullRequestsConfig.AllowRebaseMerge}}
373-
<div class="ui form rebase-merge-fields" style="display: none">
374-
<form action="{{.Link}}/merge" method="post">
375-
{{.CsrfTokenHtml}}
376-
<input type="hidden" name="head_commit_id" value="{{.PullHeadCommitID}}">
377-
<div class="field">
378-
<input type="text" name="merge_title_field" value="{{.DefaultMergeMessage}}">
379-
</div>
380-
<div class="field">
381-
<textarea name="merge_message_field" rows="5" placeholder="{{$.i18n.Tr "repo.editor.commit_message_desc"}}">Reviewed-on: {{$.Issue.HTMLURL}}&#13;&#10;{{$approvers}}</textarea>
382-
</div>
383-
<button class="ui green button" type="submit" name="do" value="rebase-merge">
384-
{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}}
385-
</button>
386-
<button class="ui button merge-cancel">
387-
{{$.i18n.Tr "cancel"}}
388-
</button>
389-
{{if .IsPullBranchDeletable}}
390-
<div class="ui checkbox ml-2">
391-
<input name="delete_branch_after_merge" type="checkbox" {{if $prUnit.PullRequestsConfig.DefaultDeleteBranchAfterMerge}}checked{{end}}>
392-
<label>{{$.i18n.Tr "repo.branch.delete" .HeadTarget}}</label>
393-
</div>
394-
{{end}}
395-
</form>
396-
</div>
397-
{{end}}
398-
{{if $prUnit.PullRequestsConfig.AllowSquash}}
399-
<div class="ui form squash-fields" style="display: none">
400-
<form action="{{.Link}}/merge" method="post">
401-
{{.CsrfTokenHtml}}
402-
<input type="hidden" name="head_commit_id" value="{{.PullHeadCommitID}}">
403-
<div class="field">
404-
<input type="text" name="merge_title_field" value="{{.DefaultSquashMergeMessage}}">
405-
</div>
406-
<div class="field">
407-
<textarea name="merge_message_field" rows="5" placeholder="{{$.i18n.Tr "repo.editor.commit_message_desc"}}">{{.GetCommitMessages}}Reviewed-on: {{$.Issue.HTMLURL}}&#13;&#10;{{$approvers}}</textarea>
408-
</div>
409-
<button class="ui green button" type="submit" name="do" value="squash">
410-
{{$.i18n.Tr "repo.pulls.squash_merge_pull_request"}}
411-
</button>
412-
<button class="ui button merge-cancel">
413-
{{$.i18n.Tr "cancel"}}
414-
</button>
415-
{{if .IsPullBranchDeletable}}
416-
<div class="ui checkbox ml-2">
417-
<input name="delete_branch_after_merge" type="checkbox" {{if $prUnit.PullRequestsConfig.DefaultDeleteBranchAfterMerge}}checked{{end}}>
418-
<label>{{$.i18n.Tr "repo.branch.delete" .HeadTarget}}</label>
419-
</div>
420-
{{end}}
421-
</form>
422-
</div>
423-
{{end}}
424-
{{if and $prUnit.PullRequestsConfig.AllowManualMerge $.IsRepoAdmin}}
425-
<div class="ui form manually-merged-fields" style="display: none">
426-
<form action="{{.Link}}/merge" method="post">
427-
{{.CsrfTokenHtml}}
428-
<input type="hidden" name="head_commit_id" value="{{.PullHeadCommitID}}">
429-
<div class="field">
430-
<input type="text" name="merge_commit_id" placeholder="{{$.i18n.Tr "repo.pulls.merge_commit_id"}}">
431-
</div>
432-
<button class="ui red button" type="submit" name="do" value="manually-merged">
433-
{{$.i18n.Tr "repo.pulls.merge_manually"}}
434-
</button>
435-
<button class="ui button merge-cancel">
436-
{{$.i18n.Tr "cancel"}}
437-
</button>
438-
{{if .IsPullBranchDeletable}}
439-
<div class="ui checkbox ml-2">
440-
<input name="delete_branch_after_merge" type="checkbox" {{if $prUnit.PullRequestsConfig.DefaultDeleteBranchAfterMerge}}checked{{end}}>
441-
<label>{{$.i18n.Tr "repo.branch.delete" .HeadTarget}}</label>
442-
</div>
443-
{{end}}
444-
</form>
445-
</div>
446-
{{end}}
447-
<div class="dib">
448-
<div class="ui {{if $notAllOverridableChecksOk}}red{{else}}green{{end}} buttons merge-button">
449-
<button class="ui button" data-do="{{.MergeStyle}}">
450-
{{svg "octicon-git-merge"}}
451-
<span class="button-text">
452-
{{if eq .MergeStyle "merge"}}
453-
{{$.i18n.Tr "repo.pulls.merge_pull_request"}}
454-
{{end}}
455-
{{if eq .MergeStyle "rebase"}}
456-
{{$.i18n.Tr "repo.pulls.rebase_merge_pull_request"}}
457-
{{end}}
458-
{{if eq .MergeStyle "rebase-merge"}}
459-
{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}}
460-
{{end}}
461-
{{if eq .MergeStyle "squash"}}
462-
{{$.i18n.Tr "repo.pulls.squash_merge_pull_request"}}
463-
{{end}}
464-
{{if eq .MergeStyle "manually-merged"}}
465-
{{$.i18n.Tr "repo.pulls.merge_manually"}}
466-
{{end}}
467-
</span>
468-
</button>
469-
{{if gt $prUnit.PullRequestsConfig.AllowedMergeStyleCount 1}}
470-
<div class="ui dropdown icon button no-text">
471-
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
472-
<div class="menu">
473-
{{if $prUnit.PullRequestsConfig.AllowMerge}}
474-
<div class="item{{if eq .MergeStyle "merge"}} active selected{{end}}" data-do="merge">{{$.i18n.Tr "repo.pulls.merge_pull_request"}}</div>
475-
{{end}}
476-
{{if $prUnit.PullRequestsConfig.AllowRebase}}
477-
<div class="item{{if eq .MergeStyle "rebase"}} active selected{{end}}" data-do="rebase">{{$.i18n.Tr "repo.pulls.rebase_merge_pull_request"}}</div>
478-
{{end}}
479-
{{if $prUnit.PullRequestsConfig.AllowRebaseMerge}}
480-
<div class="item{{if eq .MergeStyle "rebase-merge"}} active selected{{end}}" data-do="rebase-merge">{{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}}</div>
481-
{{end}}
482-
{{if $prUnit.PullRequestsConfig.AllowSquash}}
483-
<div class="item{{if eq .MergeStyle "squash"}} active selected{{end}}" data-do="squash">{{$.i18n.Tr "repo.pulls.squash_merge_pull_request"}}</div>
484-
{{end}}
485-
{{if and $prUnit.PullRequestsConfig.AllowManualMerge $.IsRepoAdmin}}
486-
<div class="item{{if eq .MergeStyle "manually-merged"}} active selected{{end}}" data-do="manually-merged">{{$.i18n.Tr "repo.pulls.merge_manually"}}</div>
487-
{{end}}
488-
</div>
489-
</div>
490-
{{end}}
491-
</div>
492-
</div>
327+
328+
<script>
329+
<!-- /* eslint-disable */ -->
330+
(() => {
331+
const defaultMergeTitle = {{.DefaultMergeMessage}};
332+
const defaultSquashMergeTitle = {{.DefaultSquashMergeMessage}};
333+
const defaultMergeMessage = 'Reviewed-on: ' + {{$.Issue.HTMLURL}} + '\n' + {{$approvers}};
334+
const mergeForm = {
335+
'baseLink': {{.Link}},
336+
'textCancel': {{$.i18n.Tr "cancel"}},
337+
'textDeleteBranch': {{$.i18n.Tr "repo.branch.delete" .HeadTarget}},
338+
339+
'allOverridableChecksOk': {{not $notAllOverridableChecksOk}},
340+
'pullHeadCommitID': {{.PullHeadCommitID}},
341+
'isPullBranchDeletable': {{.IsPullBranchDeletable}},
342+
'defaultDeleteBranchAfterMerge': {{$prUnit.PullRequestsConfig.DefaultDeleteBranchAfterMerge}},
343+
'mergeMessageFieldPlaceHolder': {{$.i18n.Tr "repo.editor.commit_message_desc"}},
344+
};
345+
mergeForm['mergeStyles'] = [
346+
{
347+
'name': 'merge',
348+
'allowed': {{$prUnit.PullRequestsConfig.AllowMerge}},
349+
'textDoMerge': {{$.i18n.Tr "repo.pulls.merge_pull_request"}},
350+
'mergeTitleFieldText': defaultMergeTitle,
351+
'mergeMessageFieldText': defaultMergeMessage,
352+
},
353+
{
354+
'name': 'rebase',
355+
'allowed': {{$prUnit.PullRequestsConfig.AllowRebase}},
356+
'textDoMerge': {{$.i18n.Tr "repo.pulls.rebase_merge_pull_request"}},
357+
'hideMergeMessageTexts': true,
358+
},
359+
{
360+
'name': 'rebase-merge',
361+
'allowed': {{$prUnit.PullRequestsConfig.AllowRebaseMerge}},
362+
'textDoMerge': {{$.i18n.Tr "repo.pulls.rebase_merge_commit_pull_request"}},
363+
'mergeTitleFieldText': defaultMergeTitle,
364+
'mergeMessageFieldText': defaultMergeMessage,
365+
},
366+
{
367+
'name': 'squash',
368+
'allowed': {{$prUnit.PullRequestsConfig.AllowSquash}},
369+
'textDoMerge': {{$.i18n.Tr "repo.pulls.squash_merge_pull_request"}},
370+
'mergeTitleFieldText': defaultSquashMergeTitle,
371+
'mergeMessageFieldText': defaultMergeMessage,
372+
},
373+
{
374+
'name': 'manually-merged',
375+
'allowed': {{and $prUnit.PullRequestsConfig.AllowManualMerge $.IsRepoAdmin}},
376+
'textDoMerge': {{$.i18n.Tr "repo.pulls.merge_manually"}},
377+
'hideMergeMessageTexts': true,
378+
}
379+
];
380+
window.config.pageData.pullRequestMergeForm = mergeForm;
381+
})();
382+
</script>
383+
384+
<div id="pull-request-merge-form"></div>
385+
493386
{{if .ShowMergeInstructions}}
494-
<div class="instruct-toggle ml-3"> {{$.i18n.Tr "repo.pulls.merge_instruction_hint" | Safe}} </div>
387+
<div class="instruct-toggle mt-3"> {{$.i18n.Tr "repo.pulls.merge_instruction_hint" | Safe}} </div>
495388
<div class="instruct-content" style="display:none">
496389
<div class="ui divider"></div>
497390
<div><h3 class="di">{{$.i18n.Tr "step1"}} </h3>{{$.i18n.Tr "repo.pulls.merge_instruction_step1_desc"}}</div>

0 commit comments

Comments
 (0)