Release 2.38.0 (#5563)
This commit is contained in:
@@ -106,15 +106,15 @@ final class PermissionController extends AbstractController
|
||||
$other = [];
|
||||
|
||||
foreach ($event->getSections() as $section) {
|
||||
$permissionSorted[$section->getTitle()] = [];
|
||||
$permissionSorted[$section->getTitle()] = []; // @phpstan-ignore method.deprecatedInterface
|
||||
}
|
||||
|
||||
foreach ($this->manager->getPermissions() as $permission) {
|
||||
$found = false;
|
||||
|
||||
foreach (array_reverse($event->getSections()) as $section) {
|
||||
if ($section->filter($permission)) {
|
||||
$permissionSorted[$section->getTitle()][] = $permission;
|
||||
if ($section->filter($permission)) { // @phpstan-ignore method.deprecatedInterface
|
||||
$permissionSorted[$section->getTitle()][] = $permission; // @phpstan-ignore method.deprecatedInterface
|
||||
$found = true;
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -12,8 +12,8 @@ namespace App\Controller\Security;
|
||||
use App\Configuration\SystemConfiguration;
|
||||
use App\Controller\AbstractController;
|
||||
use App\Entity\User;
|
||||
use App\Event\EmailEvent;
|
||||
use App\Event\EmailPasswordResetEvent;
|
||||
use App\Event\UserEmailEvent;
|
||||
use App\User\UserService;
|
||||
use Psr\EventDispatcher\EventDispatcherInterface;
|
||||
use Symfony\Bridge\Twig\Mime\TemplatedEmail;
|
||||
@@ -112,7 +112,7 @@ final class PasswordResetController extends AbstractController
|
||||
$this->eventDispatcher->dispatch($event);
|
||||
|
||||
// this will send the email
|
||||
$this->eventDispatcher->dispatch(new EmailEvent($event->getEmail()));
|
||||
$this->eventDispatcher->dispatch(new UserEmailEvent($user, $event->getEmail()));
|
||||
|
||||
$user->markPasswordRequested();
|
||||
$user->setRequiresPasswordReset(true);
|
||||
|
||||
@@ -348,6 +348,10 @@ final class SystemConfigurationController extends AbstractController
|
||||
->setConstraints([
|
||||
new GreaterThanOrEqual(['value' => 0])
|
||||
]),
|
||||
(new Configuration('timesheet.rules.break_time_active'))
|
||||
->setLabel('break')
|
||||
->setType(YesNoType::class)
|
||||
->setOptions(['help' => 'Beta']),
|
||||
]),
|
||||
(new SystemConfigurationModel('quick_entry'))
|
||||
->setTranslation('quick_entry.title')
|
||||
|
||||
Reference in New Issue
Block a user