|
@@ -55,12 +55,13 @@ abstract class RESTController extends VoryxController
|
|
|
$tenancyService = $this->getTenancyService();
|
|
|
$tenancyService->setTenancy($filters['tenancyId']);
|
|
|
unset($filters['tenancyId']);
|
|
|
- }
|
|
|
- if (isset($filters['disableTenancy'])) {
|
|
|
+ } else {
|
|
|
$disableTenancy = true;
|
|
|
// tengo que buscar por tenencia.
|
|
|
$tenancyService = $this->getTenancyService();
|
|
|
$tenancyService->disableFilter();
|
|
|
+ // dejar esta linea para los casos en que no se modificaron las url de los otros modulos
|
|
|
+ // que hacen referencia a este filtro
|
|
|
unset($filters['disableTenancy']);
|
|
|
}
|
|
|
$orWhere = false;
|
|
@@ -71,7 +72,6 @@ abstract class RESTController extends VoryxController
|
|
|
}
|
|
|
if (isset($filters['qb-criteria'])) {
|
|
|
try {
|
|
|
-
|
|
|
unset($filters['qb-criteria']);
|
|
|
$criteria = new \Doctrine\Common\Collections\Criteria();
|
|
|
|
|
@@ -103,15 +103,15 @@ abstract class RESTController extends VoryxController
|
|
|
$repo = $em->getRepository($this->getRepository());
|
|
|
$entities = $repo->matching($criteria)->toArray();
|
|
|
|
|
|
- if ($disableTenancy) $tenancyService->enableFilter();
|
|
|
+ if ($disableTenancy) {
|
|
|
+ $tenancyService->enableFilter();
|
|
|
+ }
|
|
|
if ($entities) {
|
|
|
return $entities;
|
|
|
}
|
|
|
-
|
|
|
} catch (\Exception $e) {
|
|
|
return FOSView::create($e->getMessage(), Codes::HTTP_INTERNAL_SERVER_ERROR);
|
|
|
}
|
|
|
-
|
|
|
} else {
|
|
|
try {
|
|
|
$offset = $paramFetcher->get('offset');
|
|
@@ -124,13 +124,10 @@ abstract class RESTController extends VoryxController
|
|
|
if ($entities) {
|
|
|
return $entities;
|
|
|
}
|
|
|
-
|
|
|
} catch (\Exception $e) {
|
|
|
return FOSView::create($e->getMessage(), Codes::HTTP_INTERNAL_SERVER_ERROR);
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
-
|
|
|
return array();
|
|
|
}
|
|
|
|