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

Merge branch 'develop' of https://github.com/tainacan/tainacan into develop

This commit is contained in:
mateuswetah 2021-07-01 15:32:11 -03:00
parent 7723a2ff0e 319a621a95
commit 13c5ed3ee0
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/classes/api/endpoints/class-tainacan-rest-items-controller.php
View File

@ -569,6 +569,8 @@ class REST_Items_Controller extends REST_Controller {
private function get_items_permissions_check_for_taxonomy($taxonomies) { private function get_items_permissions_check_for_taxonomy($taxonomies) {
foreach ($taxonomies as $tax) { foreach ($taxonomies as $tax) {
if( !isset($tax['taxonomy']) )
return false;
$taxonomy = \tainacan_taxonomies()->fetch_by_db_identifier( $tax['taxonomy'] ); $taxonomy = \tainacan_taxonomies()->fetch_by_db_identifier( $tax['taxonomy'] );
if( $taxonomy instanceof Entities\Taxonomy ) { if( $taxonomy instanceof Entities\Taxonomy ) {

9
src/views/admin/components/search/filters-items-list.vue
View File

@ -384,9 +384,7 @@
this.prepareFilters(); this.prepareFilters();
}); });
if (this.isUsingElasticSearch) { if (this.isUsingElasticSearch) {
this.$eventBusSearch.$on('isLoadingItems', isLoadingItems => { this.$eventBusSearch.$on('isLoadingItems', this.updateIsLoadingItems);
this.isLoadingItems = isLoadingItems;
});
} }
}, },
beforeDestroy() { beforeDestroy() {
@ -405,7 +403,7 @@
this.$eventBusSearch.$off('hasToPrepareMetadataAndFilters'); this.$eventBusSearch.$off('hasToPrepareMetadataAndFilters');
if (this.isUsingElasticSearch) if (this.isUsingElasticSearch)
this.$eventBusSearch.$off('isLoadingItems'); this.$eventBusSearch.$off('isLoadingItems', this.updateIsLoadingItems);
}, },
methods: { methods: {
@ -482,6 +480,9 @@
this.repositoryFiltersSearchCancel = source; this.repositoryFiltersSearchCancel = source;
}); });
} }
},
updateIsLoadingItems(isLoadingItems) {
this.isLoadingItems = isLoadingItems
} }
} }
} }