]> source.dussan.org Git - gitea.git/commitdiff
fix branch selector on new issue page (#14194) (#14207)
authora1012112796 <1012112796@qq.com>
Fri, 1 Jan 2021 14:14:49 +0000 (22:14 +0800)
committerGitHub <noreply@github.com>
Fri, 1 Jan 2021 14:14:49 +0000 (16:14 +0200)
fix #14185

Signed-off-by: a1012112796 <1012112796@qq.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
templates/repo/issue/branch_selector_field.tmpl
web_src/js/index.js

index b59c57cb56f46d7a4c6276adb346522834f67213..76759890ce5d163714a540483e6fddf3eab8ced9 100644 (file)
@@ -31,7 +31,7 @@
                                </div>
                        </div>
                </div>
-               <div id="branch-list" class="scrolling menu reference-list-menu">
+               <div id="branch-list" class="scrolling menu reference-list-menu {{if not .Issue}}new-issue{{end}}">
                        {{if .Issue.Ref}}
                                <div class="item text small" data-id="" data-id-selector="#ref_selector"><strong><a href="#">{{$.i18n.Tr "repo.clear_ref"}}</a></strong></div>
                        {{end}} 
@@ -39,7 +39,7 @@
                                <div class="item" data-id="refs/heads/{{.}}" data-name="{{.}}" data-id-selector="#ref_selector">{{.}}</div>
                        {{end}}
                </div>
-               <div id="tag-list" class="scrolling menu reference-list-menu" style="display: none">
+               <div id="tag-list" class="scrolling menu reference-list-menu {{if not .Issue}}new-issue{{end}}" style="display: none">
                        {{if .Issue.Ref}}
                                <div class="item text small" data-id="" data-id-selector="#ref_selector"><strong><a href="#">{{.i18n.Tr "repo.clear_ref"}}</a></strong></div>
                        {{end}} 
index f007f32fb0d172ce75a7406aacda46f0aa37e14f..8499904bf9c1c66b5b85fb9c57e3ea3973c54898 100644 (file)
@@ -112,10 +112,15 @@ function initEditForm() {
 function initBranchSelector() {
   const $selectBranch = $('.ui.select-branch');
   const $branchMenu = $selectBranch.find('.reference-list-menu');
+  const $isNewIssue = $branchMenu.hasClass('new-issue');
   $branchMenu.find('.item:not(.no-select)').click(function () {
     const selectedValue = $(this).data('id');
     const editMode = $('#editing_mode').val();
     $($(this).data('id-selector')).val(selectedValue);
+    if ($isNewIssue) {
+      $selectBranch.find('.ui .branch-name').text($(this).data('name'));
+      return;
+    }
 
     if (editMode === 'true') {
       const form = $('#update_issueref_form');