소스 검색

Merge tag 'hotfix_402' into develop

hotfix_402
develop
Fabien Normand 2 년 전
부모
커밋
ecb2ddc4ad
1개의 변경된 파일21개의 추가작업 그리고 5개의 파일을 삭제
  1. +21
    -5
      Controller/Product/ProductFamilyAdminController.php

+ 21
- 5
Controller/Product/ProductFamilyAdminController.php 파일 보기

@@ -19,16 +19,16 @@ abstract class ProductFamilyAdminController extends AbstractAdminController
{
$crud = parent::configureCrud($crud);

if($this->getRequestCrudAction() === ActionDefinition::SORT) {
if ($this->getRequestCrudAction() === ActionDefinition::SORT) {
$crud->setDefaultSort(['position' => 'ASC']);
}else{
} else {
$crud->setDefaultSort(['id' => 'DESC']);
}

return $crud;
}

public function getRepositoryQuery() :RepositoryQueryInterface
public function getRepositoryQuery(): RepositoryQueryInterface
{
return $this->get(ProductFamilyContainer::class)->getRepositoryQuery();
}
@@ -36,8 +36,8 @@ abstract class ProductFamilyAdminController extends AbstractAdminController
public function createEntity(string $entityFqcn)
{
return $this->getProductFamilyContainer()
->getFactory()
->create($this->getMerchantCurrent());
->getFactory()
->create($this->getMerchantCurrent());
}


@@ -45,6 +45,22 @@ abstract class ProductFamilyAdminController extends AbstractAdminController
{
$responseParameters = parent::configureResponseParameters($responseParameters);

$productFamiliesDto = [];
$productFamilies = [];
if ($responseParameters->get('entities')) {
$productFamiliesDto = $responseParameters->get('entities');
} elseif ($responseParameters->get('entity')) {
$productFamiliesDto = [$responseParameters->get('entity')];
}

foreach ($productFamiliesDto as $productFamilyDto) {
$productFamilies[] = $productFamilyDto->getInstance();
}

$this->getProductFamilyContainer()->getStore()
->setSection($this->getSectionCurrentDefault())
->getWithReductions($productFamilies);

// affichage du filtre sur section
$responseParameters->set('display_switch_section', true);


Loading…
취소
저장