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

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

View file

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

View file

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