- {{svg "octicon-x" 16 "close icon"}}
- {{ctx.Locale.Tr "repo.issues.due_date_invalid"}}
-
-
- {{svg "octicon-calendar" 16 "tw-mr-2"}}
- {{DateUtils.AbsoluteLong .Issue.DeadlineUnix}}
-
-
+
diff --git a/tests/integration/api_issue_milestone_test.go b/tests/integration/api_issue_milestone_test.go
index 38f36d27a74c1..2d00752302ff2 100644
--- a/tests/integration/api_issue_milestone_test.go
+++ b/tests/integration/api_issue_milestone_test.go
@@ -7,7 +7,6 @@ import (
"fmt"
"net/http"
"testing"
- "time"
auth_model "code.gitea.io/gitea/models/auth"
issues_model "code.gitea.io/gitea/models/issues"
@@ -60,7 +59,7 @@ func TestAPIIssuesMilestone(t *testing.T) {
DecodeJSON(t, resp, &apiMilestone)
assert.Equal(t, "wow", apiMilestone.Title)
assert.Equal(t, structs.StateClosed, apiMilestone.State)
- assert.Equal(t, (*time.Time)(nil), apiMilestone.Deadline)
+ assert.Nil(t, apiMilestone.Deadline)
var apiMilestones []structs.Milestone
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/milestones?state=%s", owner.Name, repo.Name, "all")).
@@ -68,7 +67,7 @@ func TestAPIIssuesMilestone(t *testing.T) {
resp = MakeRequest(t, req, http.StatusOK)
DecodeJSON(t, resp, &apiMilestones)
assert.Len(t, apiMilestones, 4)
- assert.Equal(t, (*time.Time)(nil), apiMilestones[0].Deadline)
+ assert.Nil(t, apiMilestones[0].Deadline)
req = NewRequest(t, "GET", fmt.Sprintf("/api/v1/repos/%s/%s/milestones/%s", owner.Name, repo.Name, apiMilestones[2].Title)).
AddTokenAuth(token)
diff --git a/web_src/js/features/repo-issue-sidebar.ts b/web_src/js/features/repo-issue-sidebar.ts
index f33e192f291a4..478dafa81974a 100644
--- a/web_src/js/features/repo-issue-sidebar.ts
+++ b/web_src/js/features/repo-issue-sidebar.ts
@@ -3,6 +3,7 @@ import {POST} from '../modules/fetch.ts';
import {updateIssuesMeta} from './repo-common.ts';
import {svg} from '../svg.ts';
import {htmlEscape} from 'escape-goat';
+import {initRepoIssueDue} from './repo-issue.ts';
// if there are draft comments, confirm before reloading, to avoid losing comments
function reloadConfirmDraftComment() {
@@ -260,6 +261,7 @@ function selectItem(select_id, input_id) {
export function initRepoIssueSidebar() {
initBranchSelector();
+ initRepoIssueDue();
// Init labels and assignees
initListSubmits('select-label', 'labels');
diff --git a/web_src/js/features/repo-issue.ts b/web_src/js/features/repo-issue.ts
index a9a65cdc819bc..552feb0617158 100644
--- a/web_src/js/features/repo-issue.ts
+++ b/web_src/js/features/repo-issue.ts
@@ -43,49 +43,16 @@ export function initRepoIssueTimeTracking() {
});
}
-async function updateDeadline(deadlineString) {
- hideElem('#deadline-err-invalid-date');
- document.querySelector('#deadline-loader')?.classList.add('is-loading');
-
- let realDeadline = null;
- if (deadlineString !== '') {
- const newDate = Date.parse(deadlineString);
-
- if (Number.isNaN(newDate)) {
- document.querySelector('#deadline-loader')?.classList.remove('is-loading');
- showElem('#deadline-err-invalid-date');
- return false;
- }
- realDeadline = new Date(newDate);
- }
-
- try {
- const response = await POST(document.querySelector('#update-issue-deadline-form').getAttribute('action'), {
- data: {due_date: realDeadline},
- });
-
- if (response.ok) {
- window.location.reload();
- } else {
- throw new Error('Invalid response');
- }
- } catch (error) {
- console.error(error);
- document.querySelector('#deadline-loader').classList.remove('is-loading');
- showElem('#deadline-err-invalid-date');
- }
-}
-
export function initRepoIssueDue() {
- $(document).on('click', '.issue-due-edit', () => {
- toggleElem('#deadlineForm');
- });
- $(document).on('click', '.issue-due-remove', () => {
- updateDeadline('');
+ const form = document.querySelector
('.issue-due-form');
+ if (!form) return;
+ const deadline = form.querySelector('input[name=deadline]');
+ document.querySelector('.issue-due-edit')?.addEventListener('click', () => {
+ toggleElem(form);
});
- $(document).on('submit', '.issue-due-form', () => {
- updateDeadline($('#deadlineDate').val());
- return false;
+ document.querySelector('.issue-due-remove')?.addEventListener('click', () => {
+ deadline.value = '';
+ form.dispatchEvent(new Event('submit', {cancelable: true, bubbles: true}));
});
}
diff --git a/web_src/js/features/repo-milestone.ts b/web_src/js/features/repo-milestone.ts
index ddef723b48c85..ee704ea2e06a4 100644
--- a/web_src/js/features/repo-milestone.ts
+++ b/web_src/js/features/repo-milestone.ts
@@ -1,11 +1,9 @@
-import $ from 'jquery';
-
export function initRepoMilestone() {
- // Milestones
- if ($('.repository.new.milestone').length > 0) {
- $('#clear-date').on('click', () => {
- $('#deadline').val('');
- return false;
- });
- }
+ const page = document.querySelector('.repository.new.milestone');
+ if (!page) return;
+
+ const deadline = page.querySelector('form input[name=deadline]');
+ document.querySelector('#milestone-clear-deadline').addEventListener('click', () => {
+ deadline.value = '';
+ });
}
diff --git a/web_src/js/index.ts b/web_src/js/index.ts
index 08d8997fd1816..487aac97aa3a5 100644
--- a/web_src/js/index.ts
+++ b/web_src/js/index.ts
@@ -25,7 +25,6 @@ import {initPdfViewer} from './render/pdf.ts';
import {initUserAuthOauth2, initUserCheckAppUrl} from './features/user-auth.ts';
import {
- initRepoIssueDue,
initRepoIssueReferenceRepositorySearch,
initRepoIssueTimeTracking,
initRepoIssueWipTitle,
@@ -181,7 +180,6 @@ onDomReady(() => {
initRepoEditor,
initRepoGraphGit,
initRepoIssueContentHistory,
- initRepoIssueDue,
initRepoIssueList,
initRepoIssueSidebarList,
initArchivedLabelHandler,