Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-08 06:55:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: closes #12123, allow setting hh:mm for pin expiry

Browse Source 
use locale for pin expiry and use short form
This commit is contained in:
Barış Soner Uşaklı
2023-10-26 11:14:58 -04:00
parent 668a355afe
commit 1f8007476c
4 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
public/src/client/topic/threadTools.js
View File

@@ -257,7 +257,6 @@ define('forum/topic/threadTools', [
title: '[[topic:thread-tools.pin]]',
message: html,
onEscape: true,
size: 'small',
buttons: {
cancel: {
label: '[[modules:bootbox.cancel]]',
@@ -267,19 +266,19 @@ define('forum/topic/threadTools', [
label: '[[global:save]]',
className: 'btn-primary',
callback: function () {
const expiryEl = modal.get(0).querySelector('#expiry');
let expiry = expiryEl.value;
const expiryDateEl = modal.get(0).querySelector('#expiry-date');
const expiryTimeEl = modal.get(0).querySelector('#expiry-time');
let expiryDate = expiryDateEl.value;
let expiryTime = expiryTimeEl.value;
// No expiry set
if (expiry === '') {
if (expiryDate === '' && expiryTime === '') {
return onSuccess();
}
// Expiration date set
expiry = new Date(expiry);
if (expiry && expiry.getTime() > Date.now()) {
body.expiry = expiry.getTime();
expiryDate = expiryDate || new Date().toDateString();
expiryTime = expiryTime || new Date().toTimeString();
const date = new Date(`${expiryDate} ${expiryTime}`);
if (date.getTime() > Date.now()) {
body.expiry = date.getTime();
onSuccess();
} else {
alerts.error('[[error:invalid-date]]');