do no longer request all idsites by default as it would otherwise load the metadata for each site and if one has 20k sites would request it 20k times!

tsteur · tsteur · commit 90695622e41f · 2015-02-02T01:53:43.000Z
diff --git a/core/API/DataTableManipulator.php b/core/API/DataTableManipulator.php
@@ -124,7 +124,7 @@ protected function loadSubtable($dataTable, $row)
             }
         }
 
-        $method = $this->getApiMethodForSubtable();
+        $method = $this->getApiMethodForSubtable($request);
         return $this->callApiAndReturnDataTable($this->apiModule, $method, $request);
     }
 
@@ -144,10 +144,16 @@ protected abstract function manipulateSubtableRequest($request);
      * @throws Exception
      * @return string
      */
-    private function getApiMethodForSubtable()
+    private function getApiMethodForSubtable($request)
     {
         if (!$this->apiMethodForSubtable) {
-            $meta = API::getInstance()->getMetadata('all', $this->apiModule, $this->apiMethod);
+            if (!empty($request['idSite'])) {
+                $idSite = $request['idSite'];
+            } else {
+                $idSite = 'all';
+            }
+
+            $meta = API::getInstance()->getMetadata($idSite, $this->apiModule, $this->apiMethod);
 
             if (empty($meta)) {
                 throw new Exception(sprintf(

Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ protected function loadSubtable($dataTable, $row)`
`124`	`124`	`}`
`125`	`125`	`}`
`126`	`126`
`127`		`- $method = $this->getApiMethodForSubtable();`
	`127`	`+ $method = $this->getApiMethodForSubtable($request);`
`128`	`128`	`return $this->callApiAndReturnDataTable($this->apiModule, $method, $request);`
`129`	`129`	`}`
`130`	`130`
`@@ -144,10 +144,16 @@ protected abstract function manipulateSubtableRequest($request);`
`144`	`144`	`* @throws Exception`
`145`	`145`	`* @return string`
`146`	`146`	`*/`
`147`		`- private function getApiMethodForSubtable()`
	`147`	`+ private function getApiMethodForSubtable($request)`
`148`	`148`	`{`
`149`	`149`	`if (!$this->apiMethodForSubtable) {`
`150`		`- $meta = API::getInstance()->getMetadata('all', $this->apiModule, $this->apiMethod);`
	`150`	`+ if (!empty($request['idSite'])) {`
	`151`	`+ $idSite = $request['idSite'];`
	`152`	`+ } else {`
	`153`	`+ $idSite = 'all';`
	`154`	`+ }`
	`155`	`+`
	`156`	`+ $meta = API::getInstance()->getMetadata($idSite, $this->apiModule, $this->apiMethod);`
`151`	`157`
`152`	`158`	`if (empty($meta)) {`
`153`	`159`	`throw new Exception(sprintf(`