Release 2.8.0 (#4508)
This commit is contained in:
@@ -159,11 +159,7 @@ abstract class AbstractController extends BaseAbstractController implements Serv
|
||||
/**
|
||||
* Adds a fully translated (both $message and all keys in $parameter) flash message to the stack.
|
||||
*
|
||||
* @param string $type
|
||||
* @param string $message
|
||||
* @param array<string, string> $parameter
|
||||
* @return void
|
||||
* @throws \Exception
|
||||
*/
|
||||
private function addFlashTranslated(string $type, string $message, array $parameter = []): void
|
||||
{
|
||||
@@ -183,9 +179,6 @@ abstract class AbstractController extends BaseAbstractController implements Serv
|
||||
|
||||
/**
|
||||
* Handles exception flash messages for failed update/create actions.
|
||||
* @param \Exception $exception
|
||||
* @param FormInterface $form
|
||||
* @return void
|
||||
*/
|
||||
protected function handleFormUpdateException(\Exception $exception, FormInterface $form): void
|
||||
{
|
||||
@@ -262,10 +255,7 @@ abstract class AbstractController extends BaseAbstractController implements Serv
|
||||
}
|
||||
|
||||
/**
|
||||
* @param FormInterface $form
|
||||
* @param Request $request
|
||||
* @param array<string> $filterParams parameter names, which should not be saved (neither session, nor database)
|
||||
* @return bool
|
||||
* @throws \Exception
|
||||
*/
|
||||
protected function handleSearch(FormInterface $form, Request $request, array $filterParams = []): bool
|
||||
|
||||
@@ -16,6 +16,7 @@ use App\Reporting\CustomerMonthlyProjects\CustomerMonthlyProjects;
|
||||
use App\Reporting\CustomerMonthlyProjects\CustomerMonthlyProjectsForm;
|
||||
use App\Reporting\CustomerMonthlyProjects\CustomerMonthlyProjectsRepository;
|
||||
use App\Repository\Query\UserQuery;
|
||||
use App\Repository\Query\VisibilityInterface;
|
||||
use App\Repository\UserRepository;
|
||||
use PhpOffice\PhpSpreadsheet\Reader\Html;
|
||||
use Symfony\Component\HttpFoundation\Request;
|
||||
@@ -58,6 +59,7 @@ final class CustomerMonthlyProjectsController extends AbstractController
|
||||
$dateTimeFactory = $this->getDateTimeFactory();
|
||||
|
||||
$query = new UserQuery();
|
||||
$query->setVisibility(VisibilityInterface::SHOW_BOTH);
|
||||
$query->setSystemAccount(false);
|
||||
$query->setCurrentUser($currentUser);
|
||||
$allUsers = $userRepository->getUsersForQuery($query);
|
||||
|
||||
@@ -16,6 +16,7 @@ use App\Model\DailyStatistic;
|
||||
use App\Reporting\MonthlyUserList\MonthlyUserList;
|
||||
use App\Reporting\MonthlyUserList\MonthlyUserListForm;
|
||||
use App\Repository\Query\UserQuery;
|
||||
use App\Repository\Query\VisibilityInterface;
|
||||
use App\Repository\UserRepository;
|
||||
use App\Timesheet\TimesheetStatisticService;
|
||||
use PhpOffice\PhpSpreadsheet\Reader\Html;
|
||||
@@ -68,6 +69,7 @@ final class ReportUsersMonthController extends AbstractController
|
||||
$form->submit($request->query->all(), false);
|
||||
|
||||
$query = new UserQuery();
|
||||
$query->setVisibility(VisibilityInterface::SHOW_BOTH);
|
||||
$query->setSystemAccount(false);
|
||||
$query->setCurrentUser($currentUser);
|
||||
|
||||
|
||||
@@ -16,6 +16,7 @@ use App\Model\DailyStatistic;
|
||||
use App\Reporting\WeeklyUserList\WeeklyUserList;
|
||||
use App\Reporting\WeeklyUserList\WeeklyUserListForm;
|
||||
use App\Repository\Query\UserQuery;
|
||||
use App\Repository\Query\VisibilityInterface;
|
||||
use App\Repository\UserRepository;
|
||||
use App\Timesheet\TimesheetStatisticService;
|
||||
use PhpOffice\PhpSpreadsheet\Reader\Html;
|
||||
@@ -68,6 +69,7 @@ final class ReportUsersWeekController extends AbstractController
|
||||
$form->submit($request->query->all(), false);
|
||||
|
||||
$query = new UserQuery();
|
||||
$query->setVisibility(VisibilityInterface::SHOW_BOTH);
|
||||
$query->setSystemAccount(false);
|
||||
$query->setCurrentUser($currentUser);
|
||||
|
||||
|
||||
@@ -17,6 +17,7 @@ use App\Model\MonthlyStatistic;
|
||||
use App\Reporting\YearlyUserList\YearlyUserList;
|
||||
use App\Reporting\YearlyUserList\YearlyUserListForm;
|
||||
use App\Repository\Query\UserQuery;
|
||||
use App\Repository\Query\VisibilityInterface;
|
||||
use App\Repository\UserRepository;
|
||||
use App\Timesheet\TimesheetStatisticService;
|
||||
use PhpOffice\PhpSpreadsheet\Reader\Html;
|
||||
@@ -75,6 +76,7 @@ final class ReportUsersYearController extends AbstractController
|
||||
$form->submit($request->query->all(), false);
|
||||
|
||||
$query = new UserQuery();
|
||||
$query->setVisibility(VisibilityInterface::SHOW_BOTH);
|
||||
$query->setSystemAccount(false);
|
||||
$query->setCurrentUser($currentUser);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user