Nail/ipwhitelist-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: preserve form values on error + rename Дата→Добавлена, Изменён→Изменена + bump 0.5.1

Browse Source
This commit is contained in:
naeel
2026-05-31 12:48:08 +03:00
parent bfeae74e71
commit 0abaa65bf8
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/routes/entries.js
+15 -3
View File
@@ -76,6 +76,8 @@ function createRouter() {
selectedCompany,
error: req.query.error || null,
success: req.query.success || null,
lastValue: req.query.lastValue || '',
lastComment: req.query.lastComment || '',
csrfToken: '',
});
} catch (e) {
@@ -84,7 +86,7 @@ function createRouter() {
user: req.user, isAdmin: req.user.isAdmin,
companies: [], selectedCompany: null,
error: 'Ошибка загрузки: ' + e.message,
success: null, csrfToken: '',
success: null, lastValue: '', lastComment: '', csrfToken: '',
});
}
});
@@ -103,7 +105,12 @@ function createRouter() {
: 'Запись добавлена';
return res.redirect(back + (back.includes('?') ? '&' : '?') + 'success=' + encodeURIComponent(msg));
}
res.redirect(back + (back.includes('?') ? '&' : '?') + 'error=' + encodeURIComponent((r.data && r.data.error) || 'Ошибка'));
// Ошибка — возвращаем введённые значения чтобы не перепечатывать
const err = (r.data && r.data.error) || 'Ошибка';
res.redirect(back + (back.includes('?') ? '&' : '?') +
'error=' + encodeURIComponent(err) +
'&lastValue=' + encodeURIComponent(value || '') +
'&lastComment=' + encodeURIComponent(comment || ''));
} catch (e) {
res.redirect(back + (back.includes('?') ? '&' : '?') + 'error=' + encodeURIComponent(e.message));
}
@@ -120,7 +127,12 @@ function createRouter() {
if (r.status === 200) {
return res.redirect(back + (back.includes('?') ? '&' : '?') + 'success=' + encodeURIComponent('Запись обновлена'));
}
res.redirect(back + (back.includes('?') ? '&' : '?') + 'error=' + encodeURIComponent((r.data && r.data.error) || 'Ошибка'));
// Ошибка — возвращаем введённые значения в модалку
const err = (r.data && r.data.error) || 'Ошибка';
res.redirect(back + (back.includes('?') ? '&' : '?') +
'error=' + encodeURIComponent(err) +
'&lastValue=' + encodeURIComponent(value || '') +
'&lastComment=' + encodeURIComponent(comment || ''));
} catch (e) {
res.redirect(back + (back.includes('?') ? '&' : '?') + 'error=' + encodeURIComponent(e.message));
}