Browse Source

Display branch name in delete branch confirmation modal. (#5654)

Fixes: #5630.
tags/v1.9.0-dev
Harshit Bansal 5 years ago
parent
commit
dd006db5a7
3 changed files with 6 additions and 6 deletions
  1. 2
    2
      public/js/index.js
  2. 2
    2
      templates/admin/repo/list.tmpl
  3. 2
    2
      templates/repo/branch/list.tmpl

+ 2
- 2
public/js/index.js View File

if ($('.repository.settings.options').length > 0) { if ($('.repository.settings.options').length > 0) {
$('#repo_name').keyup(function () { $('#repo_name').keyup(function () {
var $prompt = $('#repo-name-change-prompt'); var $prompt = $('#repo-name-change-prompt');
if ($(this).val().toString().toLowerCase() != $(this).data('repo-name').toString().toLowerCase()) {
if ($(this).val().toString().toLowerCase() != $(this).data('name').toString().toLowerCase()) {
$prompt.show(); $prompt.show();
} else { } else {
$prompt.hide(); $prompt.hide();
} }


var dialog = $('.delete.modal' + filter); var dialog = $('.delete.modal' + filter);
dialog.find('.repo-name').text($this.data('repo-name'));
dialog.find('.name').text($this.data('name'));


dialog.modal({ dialog.modal({
closable: false, closable: false,

+ 2
- 2
templates/admin/repo/list.tmpl View File

<td>{{.NumIssues}}</td> <td>{{.NumIssues}}</td>
<td>{{SizeFmt .Size}}</td> <td>{{SizeFmt .Size}}</td>
<td><span title="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</span></td> <td><span title="{{.CreatedUnix.FormatLong}}">{{.CreatedUnix.FormatShort}}</span></td>
<td><a class="delete-button" href="" data-url="{{$.Link}}/delete?page={{$.Page.Current}}" data-id="{{.ID}}" data-repo-name="{{.Name}}"><i class="trash icon text red"></i></a></td>
<td><a class="delete-button" href="" data-url="{{$.Link}}/delete?page={{$.Page.Current}}" data-id="{{.ID}}" data-name="{{.Name}}"><i class="trash icon text red"></i></a></td>
</tr> </tr>
{{end}} {{end}}
</tbody> </tbody>
</div> </div>
<div class="content"> <div class="content">
<p>{{.i18n.Tr "repo.settings.delete_desc"}}</p> <p>{{.i18n.Tr "repo.settings.delete_desc"}}</p>
{{.i18n.Tr "repo.settings.delete_notices_2" `<span class="repo-name"></span>` | Safe}}<br>
{{.i18n.Tr "repo.settings.delete_notices_2" `<span class="name"></span>` | Safe}}<br>
{{.i18n.Tr "repo.settings.delete_notices_fork_1"}}<br> {{.i18n.Tr "repo.settings.delete_notices_fork_1"}}<br>
</div> </div>
{{template "base/delete_modal_actions" .}} {{template "base/delete_modal_actions" .}}

+ 2
- 2
templates/repo/branch/list.tmpl View File

{{else if .IsDeleted}} {{else if .IsDeleted}}
<a class="undo-button" href data-url="{{$.Link}}/restore?branch_id={{.DeletedBranch.ID | urlquery}}&name={{.DeletedBranch.Name | urlquery}}"><i class="octicon octicon-reply"></i></a> <a class="undo-button" href data-url="{{$.Link}}/restore?branch_id={{.DeletedBranch.ID | urlquery}}&name={{.DeletedBranch.Name | urlquery}}"><i class="octicon octicon-reply"></i></a>
{{else}} {{else}}
<a class="delete-branch-button" href data-url="{{$.Link}}/delete?name={{.Name | urlquery}}" data-val="{{.Name}}"><i class="trash icon text red"></i></a>
<a class="delete-branch-button" href data-url="{{$.Link}}/delete?name={{.Name | urlquery}}" data-name="{{.Name}}"><i class="trash icon text red"></i></a>
{{end}} {{end}}
</td> </td>
{{end}} {{end}}
<div class="ui small basic delete modal"> <div class="ui small basic delete modal">
<div class="ui icon header"> <div class="ui icon header">
<i class="trash icon"></i> <i class="trash icon"></i>
{{.i18n.Tr "repo.branch.delete_html"}} <span class="branch-name"></span>
{{.i18n.Tr "repo.branch.delete_html"}} <span class="name"></span>
</div> </div>
<div class="content"> <div class="content">
<p>{{.i18n.Tr "repo.branch.delete_desc" | Str2html}}</p> <p>{{.i18n.Tr "repo.branch.delete_desc" | Str2html}}</p>

Loading…
Cancel
Save