scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-22 23:03:00 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix error at filtering by date on project page [SCI-9590] (#6523)

Browse source
This commit is contained in:
Alex Kriuchykhin 2023-10-24 16:00:41 +02:00 committed by GitHub
parent 060300c785
commit 1eece29f84
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/projects/index.js
View file

@ -549,6 +549,8 @@ var ProjectsIndex = (function() {
var datePicker = $field.data('DateTimePicker'); var datePicker = $field.data('DateTimePicker');
if (datePicker && datePicker.date()) { if (datePicker && datePicker.date()) {
return datePicker.date()._d.toUTCString(); return datePicker.date()._d.toUTCString();
} else if ($field.val()) {
return moment($field.val(), $field.data('dateFormat'))._d.toUTCString();
} }
return null; return null;
} }
@ -565,8 +567,8 @@ var ProjectsIndex = (function() {
let $textFilter = $('#textSearchFilterInput', $projectsFilter); let $textFilter = $('#textSearchFilterInput', $projectsFilter);
function getFilterValues() { function getFilterValues() {
createdOnFromFilter = selectDate($createdOnFromFilter) || $createdOnFromFilter.val(); createdOnFromFilter = selectDate($createdOnFromFilter);
createdOnToFilter = selectDate($createdOnToFilter) || $createdOnToFilter.val(); createdOnToFilter = selectDate($createdOnToFilter);
membersFilter = dropdownSelector.getData($('.members-filter')); membersFilter = dropdownSelector.getData($('.members-filter'));
lookInsideFolders = $foldersCB.prop('checked') || ''; lookInsideFolders = $foldersCB.prop('checked') || '';
archivedOnFromFilter = selectDate($archivedOnFromFilter) || $archivedOnFromFilter.val(); archivedOnFromFilter = selectDate($archivedOnFromFilter) || $archivedOnFromFilter.val();