tmdinosaurcenter
/
tainacan
mirror of https://github.com/tainacan/tainacan
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Avoids null strings passed to fetch_only query params #478

This commit is contained in:
mateuswetah 2021-01-26 10:14:16 -03:00
parent d06e5bd74c
commit 90efaf4a57
2 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/views/admin/pages/lists/items-page.vue
View File

@ -948,12 +948,14 @@
let descriptionMetadatum = this.localDisplayedMetadata.find(metadatum => metadatum.metadata_type_object != undefined ? metadatum.metadata_type_object.related_mapped_prop == 'description' : false);
// Updates Search
this.$eventBusSearch.addFetchOnly(
((thumbnailMetadatum != undefined && thumbnailMetadatum.display) ? 'thumbnail' : null) + ',' +
((creationDateMetadatum != undefined && creationDateMetadatum.display) ? 'creation_date' : null) + ',' +
((authorNameMetadatum != undefined && authorNameMetadatum.display) ? 'author_name': null) + ',' +
(this.isRepositoryLevel ? 'title' : null) + ',' +
(this.isRepositoryLevel && descriptionMetadatum.display ? 'description' : null), false, fetchOnlyMetadatumIds.toString());
let fetchOnlyArray = [
((thumbnailMetadatum != undefined && thumbnailMetadatum.display) ? 'thumbnail' : null),
((creationDateMetadatum != undefined && creationDateMetadatum.display) ? 'creation_date' : null),
((authorNameMetadatum != undefined && authorNameMetadatum.display) ? 'author_name': null),
(this.isRepositoryLevel ? 'title' : null),
(this.isRepositoryLevel && descriptionMetadatum.display ? 'description' : null)
];
this.$eventBusSearch.addFetchOnly(fetchOnlyArray.filter((fetchOnly) => fetchOnly != null).toString() , false, fetchOnlyMetadatumIds.toString());
// Closes dropdown
this.$refs.displayedMetadataDropdown.toggle();
@ -1098,13 +1100,14 @@
display: authorNameMetadatumDisplay
});
this.$eventBusSearch.addFetchOnly(
(thumbnailMetadatumDisplay ? 'thumbnail' : null) +','+
(creationDateMetadatumDisplay ? 'creation_date' : null) +','+
(authorNameMetadatumDisplay ? 'author_name' : null) +','+
(this.isRepositoryLevel ? 'title' : null) +','+
let fetchOnlyArray = [
(thumbnailMetadatumDisplay ? 'thumbnail' : null),
(creationDateMetadatumDisplay ? 'creation_date' : null),
(authorNameMetadatumDisplay ? 'author_name' : null),
(this.isRepositoryLevel ? 'title' : null),
(this.isRepositoryLevel ? 'description' : null)
, false, fetchOnlyMetadatumIds.toString());
];
this.$eventBusSearch.addFetchOnly(fetchOnlyArray.filter((fetchOnly) => fetchOnly != null).toString() , false, fetchOnlyMetadatumIds.toString());
// Sorting metadata
if (this.isRepositoryLevel) {

23
src/views/theme-search/pages/theme-items-page.vue
View File

@ -933,11 +933,13 @@
let descriptionMetadatum = this.localDisplayedMetadata.find(metadatum => metadatum.metadata_type_object != undefined ? metadatum.metadata_type_object.related_mapped_prop == 'description' : false);
// Updates Search
this.$eventBusSearch.addFetchOnly(
((thumbnailMetadatum != undefined && thumbnailMetadatum.display) ? 'thumbnail' : null) + ',' +
((creationDateMetadatum != undefined && creationDateMetadatum.display) ? 'creation_date' : null) + ',' +
(this.isRepositoryLevel ? 'title' : null) + ',' +
(this.isRepositoryLevel && descriptionMetadatum.display ? 'description' : null), false, fetchOnlyMetadatumIds.toString());
let fetchOnlyArray = [
((thumbnailMetadatum != undefined && thumbnailMetadatum.display) ? 'thumbnail' : null),
((creationDateMetadatum != undefined && creationDateMetadatum.display) ? 'creation_date' : null),
(this.isRepositoryLevel ? 'title' : null),
(this.isRepositoryLevel && descriptionMetadatum.display ? 'description' : null)
];
this.$eventBusSearch.addFetchOnly(fetchOnlyArray.filter((fetchOnly) => fetchOnly != null).toString(), false, fetchOnlyMetadatumIds.toString());
// Closes dropdown
this.$refs.displayedMetadataDropdown.toggle();
@ -1064,12 +1066,13 @@
let creationDateMetadatumDisplay = prefsFetchOnlyObject ? (prefsFetchOnlyObject[1] != 'null') : true;
this.$eventBusSearch.addFetchOnly(
(thumbnailMetadatumDisplay ? 'thumbnail' : null) +','+
(creationDateMetadatumDisplay ? 'creation_date' : null) +','+
(this.isRepositoryLevel ? 'title' : null) +','+
let fetchOnlyArray = [
(thumbnailMetadatumDisplay ? 'thumbnail' : null),
(creationDateMetadatumDisplay ? 'creation_date' : null),
(this.isRepositoryLevel ? 'title' : null),
(this.isRepositoryLevel ? 'description' : null)
, false, fetchOnlyMetadatumIds.toString());
];
this.$eventBusSearch.addFetchOnly(fetchOnlyArray.filter((fetchOnly) => fetchOnly != null).toString(), false, fetchOnlyMetadatumIds.toString());
// Sorting metadata
if (this.isRepositoryLevel) {