Fix edit-label form init (#14337)

diff --git a/templates/repo/issue/labels/edit_delete_label.tmpl b/templates/repo/issue/labels/edit_delete_label.tmpl
index 4ffa20ef174ceb9d2ce973ee99d46db296ba7b31..6c087523368ae24923da32c83e81984741dfabca 100644 (file)
--- a/templates/repo/issue/labels/edit_delete_label.tmpl
+++ b/templates/repo/issue/labels/edit_delete_label.tmpl
@@ -23,7 +23,7 @@
                {{.i18n.Tr "repo.issues.label_modify"}}
        </div>
        <div class="content">
-               <form class="ui edit-label form" action="{{$.Link}}/edit" method="post">
+               <form class="ui edit-label form ignore-dirty" action="{{$.Link}}/edit" method="post">
                        {{.CsrfTokenHtml}}
                        <input id="label-modal-id" name="id" type="hidden">
                        <div class="ui grid">

diff --git a/web_src/js/index.js b/web_src/js/index.js
index 8499904bf9c1c66b5b85fb9c57e3ea3973c54898..8917ffda6fff119bebc628b84cb647b199f51495 100644 (file)
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -163,12 +163,12 @@ function initLabelEdit() {
     $('.minicolors-swatch-color').css('background-color', color_hex);
   });
   $('.edit-label-button').on('click', function () {
-    $('.color-picker').minicolors('value', $(this).data('color'));
+    $('.edit-label .color-picker').minicolors('value', $(this).data('color'));
     $('#label-modal-id').val($(this).data('id'));
     $('.edit-label .new-label-input').val($(this).data('title'));
     $('.edit-label .new-label-desc-input').val($(this).data('description'));
     $('.edit-label .color-picker').val($(this).data('color'));
-    $('.minicolors-swatch-color').css('background-color', $(this).data('color'));
+    $('.edit-label .minicolors-swatch-color').css('background-color', $(this).data('color'));
     $('.edit-label.modal').modal({
       onApprove() {
         $('.edit-label.form').trigger('submit');