Skip to content

Commit 8bb1870

Browse files
yp05327yp05327
committed
improve
1 parent 57e8393 commit 8bb1870

File tree

3 files changed

+47
-71
lines changed

3 files changed

+47
-71
lines changed

‎templates/projects/view.tmpl

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,22 @@
9595
{{$.locale.Tr "repo.projects.column.edit"}}
9696
</a>
9797
{{if not .Default}}
98-
<a class="item show-modal button" data-modal="#set-default-project-board-modal-{{.ID}}">
98+
<a class="item show-modal button default-project-board-show"
99+
data-modal="#default-project-board-modal-{{.ID}}"
100+
data-modal-default-project-board-header="{{$.locale.Tr "repo.projects.column.set_default"}}"
101+
data-modal-default-project-board-content="{{$.locale.Tr "repo.projects.column.set_default_desc"}}"
102+
data-modal-default-project-board-submit="{{$.locale.Tr "repo.projects.column.set_default"}}"
103+
data-url="{{$.Link}}/{{.ID}}/default">
99104
{{svg "octicon-pin"}}
100105
{{$.locale.Tr "repo.projects.column.set_default"}}
101106
</a>
102107
{{else}}
103-
<a class="item show-modal button" data-modal="#unset-default-project-board-modal-{{.ID}}">
108+
<a class="item show-modal button default-project-board-show"
109+
data-modal="#default-project-board-modal-{{.ID}}"
110+
data-modal-default-project-board-header="{{$.locale.Tr "repo.projects.column.unset_default"}}"
111+
data-modal-default-project-board-content="{{$.locale.Tr "repo.projects.column.unset_default_desc"}}"
112+
data-modal-default-project-board-submit="{{$.locale.Tr "repo.projects.column.unset_default"}}"
113+
data-url="{{$.Link}}/{{.ID}}/unsetdefault">
104114
{{svg "octicon-pin"}}
105115
{{$.locale.Tr "repo.projects.column.unset_default"}}
106116
</a>
@@ -139,33 +149,16 @@
139149
</div>
140150
</div>
141151

142-
<div class="ui basic modal" id="set-default-project-board-modal-{{.ID}}">
152+
<div class="ui basic modal default-project-board-modal" id="default-project-board-modal-{{.ID}}">
143153
<div class="ui icon header">
144-
{{$.locale.Tr "repo.projects.column.set_default"}}
154+
<span id="default-project-board-header"></span>
145155
</div>
146156
<div class="content center">
147-
<label>
148-
{{$.locale.Tr "repo.projects.column.set_default_desc"}}
149-
</label>
150-
</div>
151-
<div class="text right actions">
152-
<button class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</button>
153-
<button class="ui primary button set-default-project-board" data-url="{{$.Link}}/{{.ID}}/default">{{$.locale.Tr "repo.projects.column.set_default"}}</button>
154-
</div>
155-
</div>
156-
157-
<div class="ui basic modal" id="unset-default-project-board-modal-{{.ID}}">
158-
<div class="ui icon header">
159-
{{$.locale.Tr "repo.projects.column.unset_default"}}
160-
</div>
161-
<div class="content center">
162-
<label>
163-
{{$.locale.Tr "repo.projects.column.unset_default_desc"}}
164-
</label>
157+
<label id="default-project-board-content"></label>
165158
</div>
166159
<div class="text right actions">
167160
<button class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</button>
168-
<button class="ui red button unset-default-project-board" data-url="{{$.Link}}/{{.ID}}/unsetdefault">{{$.locale.Tr "repo.projects.column.unset_default"}}</button>
161+
<button class="ui primary button default-project-board-button" id="default-project-board-submit"></button>
169162
</div>
170163
</div>
171164

‎templates/repo/projects/view.tmpl

Lines changed: 16 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,22 @@
9999
{{$.locale.Tr "repo.projects.column.edit"}}
100100
</a>
101101
{{if not .Default}}
102-
<a class="item show-modal button" data-modal="#set-default-project-board-modal-{{.ID}}">
102+
<a class="item show-modal button default-project-board-show"
103+
data-modal="#default-project-board-modal-{{.ID}}"
104+
data-modal-default-project-board-header="{{$.locale.Tr "repo.projects.column.set_default"}}"
105+
data-modal-default-project-board-content="{{$.locale.Tr "repo.projects.column.set_default_desc"}}"
106+
data-modal-default-project-board-submit="{{$.locale.Tr "repo.projects.column.set_default"}}"
107+
data-url="{{$.Link}}/{{.ID}}/default">
103108
{{svg "octicon-pin"}}
104109
{{$.locale.Tr "repo.projects.column.set_default"}}
105110
</a>
106111
{{else}}
107-
<a class="item show-modal button" data-modal="#unset-default-project-board-modal-{{.ID}}">
112+
<a class="item show-modal button default-project-board-show"
113+
data-modal="#default-project-board-modal-{{.ID}}"
114+
data-modal-default-project-board-header="{{$.locale.Tr "repo.projects.column.unset_default"}}"
115+
data-modal-default-project-board-content="{{$.locale.Tr "repo.projects.column.unset_default_desc"}}"
116+
data-modal-default-project-board-submit="{{$.locale.Tr "repo.projects.column.unset_default"}}"
117+
data-url="{{$.Link}}/{{.ID}}/unsetdefault">
108118
{{svg "octicon-pin"}}
109119
{{$.locale.Tr "repo.projects.column.unset_default"}}
110120
</a>
@@ -143,33 +153,16 @@
143153
</div>
144154
</div>
145155

146-
<div class="ui basic modal" id="set-default-project-board-modal-{{.ID}}">
156+
<div class="ui basic modal default-project-board-modal" id="default-project-board-modal-{{.ID}}">
147157
<div class="ui icon header">
148-
{{$.locale.Tr "repo.projects.column.set_default"}}
158+
<span id="default-project-board-header"></span>
149159
</div>
150160
<div class="content center">
151-
<label>
152-
{{$.locale.Tr "repo.projects.column.set_default_desc"}}
153-
</label>
154-
</div>
155-
<div class="text right actions">
156-
<button class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</button>
157-
<button class="ui primary button set-default-project-board" data-url="{{$.RepoLink}}/projects/{{$.Project.ID}}/{{.ID}}/default">{{$.locale.Tr "repo.projects.column.set_default"}}</button>
158-
</div>
159-
</div>
160-
161-
<div class="ui basic modal" id="unset-default-project-board-modal-{{.ID}}">
162-
<div class="ui icon header">
163-
{{$.locale.Tr "repo.projects.column.unset_default"}}
164-
</div>
165-
<div class="content center">
166-
<label>
167-
{{$.locale.Tr "repo.projects.column.unset_default_desc"}}
168-
</label>
161+
<label id="default-project-board-content"></label>
169162
</div>
170163
<div class="text right actions">
171164
<button class="ui cancel button">{{$.locale.Tr "settings.cancel"}}</button>
172-
<button class="ui red button unset-default-project-board" data-url="{{$.Link}}/{{.ID}}/unsetdefault">{{$.locale.Tr "repo.projects.column.unset_default"}}</button>
165+
<button class="ui primary button default-project-board-button" id="default-project-board-submit"></button>
173166
</div>
174167
</div>
175168

‎web_src/js/features/repo-projects.js

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -126,34 +126,24 @@ export function initRepoProject() {
126126
});
127127
});
128128

129-
$(document).on('click', '.set-default-project-board', async function (e) {
130-
e.preventDefault();
131-
132-
await $.ajax({
133-
method: 'POST',
134-
url: $(this).data('url'),
135-
headers: {
136-
'X-Csrf-Token': csrfToken,
137-
},
138-
contentType: 'application/json',
139-
});
140-
141-
window.location.reload();
142-
});
129+
$('.default-project-board-modal').each(function () {
130+
const boardColumn = $(this).closest('.board-column');
131+
const showButton = $(boardColumn).find('.default-project-board-show');
143132

144-
$(document).on('click', '.unset-default-project-board', async function (e) {
145-
e.preventDefault();
133+
$(this).find('.default-project-board-button').on('click', function (e) {
134+
e.preventDefault();
146135

147-
await $.ajax({
148-
method: 'POST',
149-
url: $(this).data('url'),
150-
headers: {
151-
'X-Csrf-Token': csrfToken,
152-
},
153-
contentType: 'application/json',
136+
$.ajax({
137+
method: 'POST',
138+
url: $(showButton).data('url'),
139+
headers: {
140+
'X-Csrf-Token': csrfToken,
141+
},
142+
contentType: 'application/json',
143+
}).done(() => {
144+
window.location.reload();
145+
});
154146
});
155-
156-
window.location.reload();
157147
});
158148

159149
$('.delete-project-board').each(function () {

0 commit comments

Comments
 (0)