diff --git a/app/modules/project/templates/project/inbox.html b/app/modules/project/templates/project/inbox.html index 7715b85..6a94e88 100644 --- a/app/modules/project/templates/project/inbox.html +++ b/app/modules/project/templates/project/inbox.html @@ -45,5 +45,5 @@ {% endif %} - + {% endblock %} diff --git a/app/modules/project/templates/project/index.html b/app/modules/project/templates/project/index.html index 2948e8a..fc5c19e 100644 --- a/app/modules/project/templates/project/index.html +++ b/app/modules/project/templates/project/index.html @@ -429,5 +429,5 @@ window.PJ_COLORS = {{ ["#4573d2","#37a3a3","#62a420","#e8a33d","#e8384f","#aa62e3","#f06a6a","#5a6772"] | tojson }}; window.PJ_STAGE_COLORS = {{ ["#4573d2","#37a3a3","#62a420","#e8a33d","#e8384f","#aa62e3","#f06a6a","#5a6772","#e8398a","#a15c43"] | tojson }}; - + {% endblock %} diff --git a/app/modules/project/templates/project/project.html b/app/modules/project/templates/project/project.html index bd73555..86c16ab 100644 --- a/app/modules/project/templates/project/project.html +++ b/app/modules/project/templates/project/project.html @@ -543,5 +543,5 @@ - + {% endblock %} diff --git a/app/static/project.js b/app/static/project.js index 676cbaf..bacbb74 100644 --- a/app/static/project.js +++ b/app/static/project.js @@ -504,7 +504,11 @@ } async function deleteProjectCard(card) { if (!canDelete(card.dataset.creator)) { alert("삭제는 만든 사람만 할 수 있습니다."); return; } - if (!confirm("이 프로젝트를 삭제할까요? 안의 업무도 모두 삭제됩니다.")) return; + const ok = await window.erpConfirm( + "이 프로젝트를 삭제할까요? 안의 업무도 모두 삭제됩니다.", + { okText: "삭제", cancelText: "취소" } + ); + if (!ok) return; try { await api("DELETE", "/project/api/projects/" + card.dataset.id); card.remove(); @@ -972,7 +976,11 @@ const id = el("pj-e-id").value; const card = document.querySelector('.pj-project-card[data-id="' + id + '"]'); if (card && !canDelete(card.dataset.creator)) { alert("삭제는 만든 사람만 할 수 있습니다."); return; } - if (!confirm("이 프로젝트를 삭제할까요? 안의 업무도 모두 삭제됩니다.")) return; + const ok = await window.erpConfirm( + "이 프로젝트를 삭제할까요? 안의 업무도 모두 삭제됩니다.", + { okText: "삭제", cancelText: "취소" } + ); + if (!ok) return; try { await api("DELETE", "/project/api/projects/" + id); if (card) card.remove(); @@ -3282,7 +3290,11 @@ } async function deleteTreeProject(id, name, createdBy) { if (!canDelete(createdBy)) { alert(DELETE_DENIED); return; } - if (!confirm("'" + (name || "") + "' 프로젝트를 삭제할까요? 안의 업무도 모두 삭제됩니다.")) return; + const ok = await window.erpConfirm( + "'" + (name || "") + "' 프로젝트를 삭제할까요? 안의 업무도 모두 삭제됩니다.", + { okText: "삭제", cancelText: "취소" } + ); + if (!ok) return; try { await api("DELETE", "/project/api/projects/" + id); if (String(id) === String(projectId)) { location.href = "/project/"; return; }