From 67224c3a23481f123afc9347990cb569591c626d Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Fri, 10 Mar 2023 01:49:37 +0000 Subject: [PATCH 1/4] fix --- web_src/js/features/repo-projects.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_src/js/features/repo-projects.js b/web_src/js/features/repo-projects.js index 534f517853359..62e6f018f1c0c 100644 --- a/web_src/js/features/repo-projects.js +++ b/web_src/js/features/repo-projects.js @@ -106,7 +106,7 @@ export function initRepoProject() { } $(this) - .find('.content > .form > .actions > .red') + .find('.content > .form > .actions > .primary') .on('click', function (e) { e.preventDefault(); From 6e223c5cd6cf8cb2e149366f9ad36b7f55274ae9 Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Sat, 11 Mar 2023 08:10:16 +0900 Subject: [PATCH 2/4] add edit-column-button class --- templates/projects/view.tmpl | 2 +- web_src/js/features/repo-projects.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/projects/view.tmpl b/templates/projects/view.tmpl index 474b22a2f14ca..06192f630bec7 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 62e6f018f1c0c..bb658bbe89abf 100644 --- a/web_src/js/features/repo-projects.js +++ b/web_src/js/features/repo-projects.js @@ -106,7 +106,7 @@ export function initRepoProject() { } $(this) - .find('.content > .form > .actions > .primary') + .find('.content > .form > .actions > .edit-column-button') .on('click', function (e) { e.preventDefault(); From e3eb17fcef448f591a0094b1a4633eed6c946c8e Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Sat, 11 Mar 2023 08:14:55 +0900 Subject: [PATCH 3/4] change the others --- web_src/js/features/repo-projects.js | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/web_src/js/features/repo-projects.js b/web_src/js/features/repo-projects.js index bb658bbe89abf..665227899b652 100644 --- a/web_src/js/features/repo-projects.js +++ b/web_src/js/features/repo-projects.js @@ -95,19 +95,15 @@ 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 > .edit-column-button') - .on('click', function (e) { + $(this).find('.edit-column-button').on('click', function (e) { e.preventDefault(); $.ajax({ From cc69ae7d98307af870550d1b0ae4f5b2da331f0a Mon Sep 17 00:00:00 2001 From: yp05327 <576951401@qq.com> Date: Sat, 11 Mar 2023 08:55:35 +0900 Subject: [PATCH 4/4] remove space --- web_src/js/features/repo-projects.js | 38 ++++++++++++++-------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/web_src/js/features/repo-projects.js b/web_src/js/features/repo-projects.js index 665227899b652..a1e177e4617c3 100644 --- a/web_src/js/features/repo-projects.js +++ b/web_src/js/features/repo-projects.js @@ -104,26 +104,26 @@ export function initRepoProject() { } $(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'); - }); + 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'); }); + }); }); $(document).on('click', '.set-default-project-board', async function (e) {