mirror of
https://gitlab.com/Chill-Projet/chill-bundles.git
synced 2025-11-20 19:07:47 +00:00
Compare commits
3 Commits
470-alphab
...
4.8.1
| Author | SHA1 | Date | |
|---|---|---|---|
| 26d9b55c6d | |||
| add9249502 | |||
| 380d48c43a |
@@ -1,6 +0,0 @@
|
|||||||
kind: Fixed
|
|
||||||
body: Insert name of file as the document title when uploading
|
|
||||||
time: 2025-11-19T13:33:24.778116633+01:00
|
|
||||||
custom:
|
|
||||||
Issue: ""
|
|
||||||
SchemaChange: No schema change
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
kind: Fixed
|
|
||||||
body: Add missing path paramater 'id' for editing multiple participations
|
|
||||||
time: 2025-11-19T13:48:02.078949572+01:00
|
|
||||||
custom:
|
|
||||||
Issue: ""
|
|
||||||
SchemaChange: No schema change
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
kind: UX
|
|
||||||
body: Alphabetically order userJobs and mainLocations within user creation form
|
|
||||||
time: 2025-11-19T15:37:06.393470745+01:00
|
|
||||||
custom:
|
|
||||||
Issue: "470"
|
|
||||||
SchemaChange: No schema change
|
|
||||||
6
.changes/v4.8.1.md
Normal file
6
.changes/v4.8.1.md
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
## v4.8.1 - 2025-11-20
|
||||||
|
### Fixed
|
||||||
|
* Insert name of file as the document title when uploading
|
||||||
|
* Add missing path paramater 'id' for editing multiple participations
|
||||||
|
* ([#471](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/471)) Hide the display of inactive user groups in the api
|
||||||
|
|
||||||
@@ -6,6 +6,13 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
|
|||||||
and is generated by [Changie](https://github.com/miniscruff/changie).
|
and is generated by [Changie](https://github.com/miniscruff/changie).
|
||||||
|
|
||||||
|
|
||||||
|
## v4.8.1 - 2025-11-20
|
||||||
|
### Fixed
|
||||||
|
* Insert name of file as the document title when uploading
|
||||||
|
* Add missing path paramater 'id' for editing multiple participations
|
||||||
|
* ([#471](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/471)) Hide the display of inactive user groups in the api
|
||||||
|
|
||||||
|
|
||||||
## v4.8.0 - 2025-11-17
|
## v4.8.0 - 2025-11-17
|
||||||
### Feature
|
### Feature
|
||||||
* ([#461](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/461)) Make a calendar item on the 'mes rendez-vous' page clickable. Clicking will navigate to the edit page of the calendar item.
|
* ([#461](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/461)) Make a calendar item on the 'mes rendez-vous' page clickable. Clicking will navigate to the edit page of the calendar item.
|
||||||
|
|||||||
@@ -12,5 +12,12 @@ declare(strict_types=1);
|
|||||||
namespace Chill\MainBundle\Controller;
|
namespace Chill\MainBundle\Controller;
|
||||||
|
|
||||||
use Chill\MainBundle\CRUD\Controller\ApiController;
|
use Chill\MainBundle\CRUD\Controller\ApiController;
|
||||||
|
use Symfony\Component\HttpFoundation\Request;
|
||||||
|
|
||||||
class UserGroupApiController extends ApiController {}
|
class UserGroupApiController extends ApiController
|
||||||
|
{
|
||||||
|
protected function customizeQuery(string $action, Request $request, $query): void
|
||||||
|
{
|
||||||
|
$query->andWhere('e.active = TRUE');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ use Chill\MainBundle\Entity\UserJob;
|
|||||||
use Chill\MainBundle\Form\Type\ChillDateType;
|
use Chill\MainBundle\Form\Type\ChillDateType;
|
||||||
use Chill\MainBundle\Form\Type\ChillPhoneNumberType;
|
use Chill\MainBundle\Form\Type\ChillPhoneNumberType;
|
||||||
use Chill\MainBundle\Form\Type\PickCivilityType;
|
use Chill\MainBundle\Form\Type\PickCivilityType;
|
||||||
use Chill\MainBundle\Repository\UserJobRepository;
|
|
||||||
use Chill\MainBundle\Templating\TranslatableStringHelper;
|
use Chill\MainBundle\Templating\TranslatableStringHelper;
|
||||||
use Doctrine\ORM\EntityRepository;
|
use Doctrine\ORM\EntityRepository;
|
||||||
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
|
use Symfony\Bridge\Doctrine\Form\Type\EntityType;
|
||||||
@@ -37,7 +36,7 @@ use Symfony\Component\Validator\Constraints\Regex;
|
|||||||
|
|
||||||
class UserType extends AbstractType
|
class UserType extends AbstractType
|
||||||
{
|
{
|
||||||
public function __construct(private readonly TranslatableStringHelper $translatableStringHelper, protected ParameterBagInterface $parameterBag, private readonly UserJobRepository $userJobRepository) {}
|
public function __construct(private readonly TranslatableStringHelper $translatableStringHelper, protected ParameterBagInterface $parameterBag) {}
|
||||||
|
|
||||||
public function buildForm(FormBuilderInterface $builder, array $options)
|
public function buildForm(FormBuilderInterface $builder, array $options)
|
||||||
{
|
{
|
||||||
@@ -81,7 +80,12 @@ class UserType extends AbstractType
|
|||||||
'placeholder' => 'choose a job',
|
'placeholder' => 'choose a job',
|
||||||
'class' => UserJob::class,
|
'class' => UserJob::class,
|
||||||
'choice_label' => fn (UserJob $c) => $this->translatableStringHelper->localize($c->getLabel()),
|
'choice_label' => fn (UserJob $c) => $this->translatableStringHelper->localize($c->getLabel()),
|
||||||
'choices' => $this->loadAndSortUserJobs(),
|
'query_builder' => static function (EntityRepository $er) {
|
||||||
|
$qb = $er->createQueryBuilder('uj');
|
||||||
|
$qb->where('uj.active = TRUE');
|
||||||
|
|
||||||
|
return $qb;
|
||||||
|
},
|
||||||
])
|
])
|
||||||
->add('mainLocation', EntityType::class, [
|
->add('mainLocation', EntityType::class, [
|
||||||
'label' => 'Main location',
|
'label' => 'Main location',
|
||||||
@@ -92,7 +96,6 @@ class UserType extends AbstractType
|
|||||||
'query_builder' => static function (EntityRepository $er) {
|
'query_builder' => static function (EntityRepository $er) {
|
||||||
$qb = $er->createQueryBuilder('l');
|
$qb = $er->createQueryBuilder('l');
|
||||||
$qb->orderBy('l.locationType');
|
$qb->orderBy('l.locationType');
|
||||||
$qb->orderBy('l.name', 'ASC');
|
|
||||||
$qb->where('l.availableForUsers = TRUE');
|
$qb->where('l.availableForUsers = TRUE');
|
||||||
|
|
||||||
return $qb;
|
return $qb;
|
||||||
@@ -152,20 +155,6 @@ class UserType extends AbstractType
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private function loadAndSortUserJobs(): array
|
|
||||||
{
|
|
||||||
$items = $this->userJobRepository->findBy(['active' => true]);
|
|
||||||
|
|
||||||
usort(
|
|
||||||
$items,
|
|
||||||
fn ($a, $b) => mb_strtolower((string) $this->translatableStringHelper->localize($a->getLabel()))
|
|
||||||
<=>
|
|
||||||
mb_strtolower((string) $this->translatableStringHelper->localize($b->getLabel()))
|
|
||||||
);
|
|
||||||
|
|
||||||
return $items;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param OptionsResolverInterface $resolver
|
* @param OptionsResolverInterface $resolver
|
||||||
*/
|
*/
|
||||||
|
|||||||
Reference in New Issue
Block a user