From e72290fd9aeb77a47311483d1d565e428ce40cd9 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Sun, 12 Mar 2023 20:09:20 +0900 Subject: [PATCH] Sync the class change of Edit Column Button to JS code (#23400) In #22767, we changed the class of `Edit Column` button from `red` to `primary` But `red` is used to find this button in js..... --------- Co-authored-by: techknowlogick Co-authored-by: zeripath --- templates/projects/view.tmpl | 2 +- web_src/js/features/repo-projects.js | 46 +++++++++++++--------------- 2 files changed, 22 insertions(+), 26 deletions(-) diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index 474b22a2f..06192f630 100644 --- a/templates/projects/view.tmpl +++ b/templates/projects/view.tmpl @@ -128,7 +128,7 @@
{{$.locale.Tr "settings.cancel"}}
- +
diff --git a/web_src/js/features/repo-projects.js b/web_src/js/features/repo-projects.js index 534f51785..a1e177e46 100644 --- a/web_src/js/features/repo-projects.js +++ b/web_src/js/features/repo-projects.js @@ -95,39 +95,35 @@ export function initRepoProject() { $('.edit-project-board').each(function () { const projectHeader = $(this).closest('.board-column-header'); const projectTitleLabel = projectHeader.find('.board-label'); - const projectTitleInput = $(this).find( - '.content > .form > .field > .project-board-title', - ); - const projectColorInput = $(this).find('.content > .form > .field #new_board_color'); + const projectTitleInput = $(this).find('.project-board-title'); + const projectColorInput = $(this).find('#new_board_color'); const boardColumn = $(this).closest('.board-column'); if (boardColumn.css('backgroundColor')) { setLabelColor(projectHeader, rgbToHex(boardColumn.css('backgroundColor'))); } - $(this) - .find('.content > .form > .actions > .red') - .on('click', function (e) { - e.preventDefault(); + $(this).find('.edit-column-button').on('click', function (e) { + e.preventDefault(); - $.ajax({ - url: $(this).data('url'), - data: JSON.stringify({title: projectTitleInput.val(), color: projectColorInput.val()}), - headers: { - 'X-Csrf-Token': csrfToken, - }, - contentType: 'application/json', - method: 'PUT', - }).done(() => { - projectTitleLabel.text(projectTitleInput.val()); - projectTitleInput.closest('form').removeClass('dirty'); - if (projectColorInput.val()) { - setLabelColor(projectHeader, projectColorInput.val()); - } - boardColumn.attr('style', `background: ${projectColorInput.val()}!important`); - $('.ui.modal').modal('hide'); - }); + $.ajax({ + url: $(this).data('url'), + data: JSON.stringify({title: projectTitleInput.val(), color: projectColorInput.val()}), + headers: { + 'X-Csrf-Token': csrfToken, + }, + contentType: 'application/json', + method: 'PUT', + }).done(() => { + projectTitleLabel.text(projectTitleInput.val()); + projectTitleInput.closest('form').removeClass('dirty'); + if (projectColorInput.val()) { + setLabelColor(projectHeader, projectColorInput.val()); + } + boardColumn.attr('style', `background: ${projectColorInput.val()}!important`); + $('.ui.modal').modal('hide'); }); + }); }); $(document).on('click', '.set-default-project-board', async function (e) {