Skip to content
Extraits de code Groupes Projets
Valider 09a859a1 rédigé par Thomas Steur's avatar Thomas Steur
Parcourir les fichiers

always disable generic filters as we apply them later in the visualization

parent c4369139
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -61,7 +61,7 @@ class Visualization extends ViewDataTable ...@@ -61,7 +61,7 @@ class Visualization extends ViewDataTable
$this->beforeLoadDataTable(); $this->beforeLoadDataTable();
$this->loadDataTableFromAPI(); $this->loadDataTableFromAPI(array('disable_generic_filters' => 1));
$this->postDataTableLoadedFromAPI(); $this->postDataTableLoadedFromAPI();
$requestPropertiesAfterLoadDataTable = $this->requestConfig->getProperties(); $requestPropertiesAfterLoadDataTable = $this->requestConfig->getProperties();
......
...@@ -38,11 +38,15 @@ class Request ...@@ -38,11 +38,15 @@ class Request
* It builds the API request string and uses Request to call the API. * It builds the API request string and uses Request to call the API.
* The requested DataTable object is stored in $this->dataTable. * The requested DataTable object is stored in $this->dataTable.
*/ */
public function loadDataTableFromAPI() public function loadDataTableFromAPI($fixedRequestParams = array())
{ {
// we build the request (URL) to call the API // we build the request (URL) to call the API
$requestArray = $this->getRequestArray(); $requestArray = $this->getRequestArray();
foreach ($fixedRequestParams as $key => $value) {
$requestArray[$key] = $value;
}
// we make the request to the API // we make the request to the API
$request = new ApiRequest($requestArray); $request = new ApiRequest($requestArray);
...@@ -62,9 +66,8 @@ class Request ...@@ -62,9 +66,8 @@ class Request
// - we request the method to call to get this specific DataTable // - we request the method to call to get this specific DataTable
// - the format = original specifies that we want to get the original DataTable structure itself, not rendered // - the format = original specifies that we want to get the original DataTable structure itself, not rendered
$requestArray = array( $requestArray = array(
'method' => $this->requestConfig->apiMethodToRequestDataTable, 'method' => $this->requestConfig->apiMethodToRequestDataTable,
'format' => 'original', 'format' => 'original'
'disable_generic_filters' => Common::getRequestVar('disable_generic_filters', 1, 'int')
); );
$toSetEventually = array( $toSetEventually = array(
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter