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

fix: include disabled maetadata on metadata sections list #184

This commit is contained in:
vnmedeiros 2022-08-16 12:12:46 -03:00
parent 3c6ba76964
commit 73679153b2
3 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/classes/api/endpoints/class-tainacan-rest-metadata-sections-controller.php
View File

@ -149,9 +149,12 @@ class REST_Metadata_Sections_Controller extends REST_Controller {
$item_arr['enabled'] = $item->get_enabled_for_collection(); $item_arr['enabled'] = $item->get_enabled_for_collection();
} }
$metadata_list = $item->get_id() == \Tainacan\Entities\Metadata_Section::$default_section_slug $args = [];
? $this->metadata_sections_repository->get_default_section_metadata_object_list($item->get_collection()) if ($request['include_disabled'] === 'true') {
: $item->get_metadata_object_list(); $args['include_disabled'] = true;
}
$metadata_list = $item->get_metadata_object_list($args);
$item_arr['metadata_object_list'] = []; $item_arr['metadata_object_list'] = [];
if($metadata_list != false) { if($metadata_list != false) {
foreach($metadata_list as $metadata) { foreach($metadata_list as $metadata) {

6
src/classes/entities/class-tainacan-metadata-section.php
View File

@ -84,14 +84,14 @@ class Metadata_Section extends Entity {
* *
* @return [int] * @return [int]
*/ */
function get_metadata_object_list() { function get_metadata_object_list($args = []) {
$tainacan_metadata_sections = \Tainacan\Repositories\Metadata_Sections::get_instance(); $tainacan_metadata_sections = \Tainacan\Repositories\Metadata_Sections::get_instance();
$metadata_section_id = $this->get_id(); $metadata_section_id = $this->get_id();
if ($metadata_section_id == static::$default_section_slug) if ($metadata_section_id == static::$default_section_slug)
return $tainacan_metadata_sections->get_default_section_metadata_object_list($this->get_collection()); return $tainacan_metadata_sections->get_default_section_metadata_object_list($this->get_collection(), $args);
return $tainacan_metadata_sections->get_metadata_object_list($this->get_id()); return $tainacan_metadata_sections->get_metadata_object_list($this->get_id(), $args);
} }
/** /**

11
src/classes/repositories/class-tainacan-metadata-sections.php
View File

@ -366,19 +366,21 @@ class Metadata_Sections extends Repository {
return false; return false;
} }
public function get_metadata_object_list($metadata_section_id) { public function get_metadata_object_list($metadata_section_id, $args = []) {
$metadata_section = $this->fetch($metadata_section_id); $metadata_section = $this->fetch($metadata_section_id);
if ($metadata_section) { if ($metadata_section) {
$metadata_repository = \Tainacan\Repositories\Metadata::get_instance(); $metadata_repository = \Tainacan\Repositories\Metadata::get_instance();
$metadata_list = $metadata_repository->fetch_by_metadata_section($metadata_section); $metadata_list = $metadata_repository->fetch_by_metadata_section($metadata_section, $args);
return $metadata_list; return $metadata_list;
} }
return false; return false;
} }
public function get_default_section_metadata_object_list (Entities\Collection $collection) { public function get_default_section_metadata_object_list (Entities\Collection $collection, $args = []) {
$metadata_sections_ids = $this->fetch_ids(); $metadata_sections_ids = $this->fetch_ids();
$args = array( $args = array_merge(
$args,
array(
'meta_query' => array( 'meta_query' => array(
array( array(
'relation' => 'OR', 'relation' => 'OR',
@ -400,6 +402,7 @@ class Metadata_Sections extends Repository {
), ),
) )
) )
)
); );
$metadata_repository = \Tainacan\Repositories\Metadata::get_instance(); $metadata_repository = \Tainacan\Repositories\Metadata::get_instance();
$metadata_list = $metadata_repository->fetch_by_collection($collection, $args); $metadata_list = $metadata_repository->fetch_by_collection($collection, $args);