mirrors/flexisip-account-manager
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/flexisip-account-manager.git synced 2026-01-17 10:08:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix FLEXIAPI-412 Restrict the default messages statistics graph to the space...

Browse source
This commit is contained in:
Timothée Jaussoin 2025-11-25 11:39:15 +00:00
parent 26aaab2f07
commit abcc9c1c7b
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
flexiapi/app/Http/Controllers/Admin/StatisticsController.php
View file

@ -106,9 +106,13 @@ class StatisticsController extends Controller
$fromQuery = StatisticsCall::query(); $fromQuery = StatisticsCall::query();
$toQuery = StatisticsCall::query(); $toQuery = StatisticsCall::query();
if ($request->get('domain')) { $domain = $request->user()->superAdmin
$fromQuery->where('to_domain', $request->get('domain')); ? $request->get('domain')
$toQuery->where('from_domain', $request->get('domain')); : $request->space->domain;
if ($domain) {
$fromQuery->where('to_domain', $domain);
$toQuery->where('from_domain', $domain);
} }
if ($request->get('to')) { if ($request->get('to')) {

6
flexiapi/app/Libraries/StatisticsGraphFactory.php
View file

@ -57,9 +57,9 @@ class StatisticsGraphFactory
$fromQuery = StatisticsMessage::query(); $fromQuery = StatisticsMessage::query();
$toQuery = StatisticsMessage::query(); $toQuery = StatisticsMessage::query();
if (!Auth::user()?->admin) { if (!Auth::user()?->superAdmin) {
$fromQuery->where('from_domain', space()->domain); $fromQuery->where('from_domain', $this->request->space->domain);
$toQuery->toDomain($this->domain); $toQuery->toDomain(space()->domain);
} elseif ($this->domain) { } elseif ($this->domain) {
$fromQuery->where('from_domain', $this->domain); $fromQuery->where('from_domain', $this->domain);
$toQuery->toDomain($this->domain); $toQuery->toDomain($this->domain);