Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-07-17 22:36:14 +00:00
Code Issues Actions Projects Releases Wiki Activity

modifications to adapt to AMLI

Browse Source
This commit is contained in:
Julie Lenaerts 2022-06-14 15:05:09 +02:00
parent 3c685d50dd
commit f987a6b5e0
6 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_variables.scss
View File

@ -332,8 +332,8 @@ $grid-breakpoints: (
) !default; ) !default;
// scss-docs-end grid-breakpoints // scss-docs-end grid-breakpoints
@include _assert-ascending($grid-breakpoints, "$grid-breakpoints"); // @include _assert-ascending($grid-breakpoints, "$grid-breakpoints");
@include _assert-starts-at-zero($grid-breakpoints, "$grid-breakpoints"); // @include _assert-starts-at-zero($grid-breakpoints, "$grid-breakpoints");
// Grid containers // Grid containers
@ -350,7 +350,7 @@ $container-max-widths: (
) !default; ) !default;
// scss-docs-end container-max-widths // scss-docs-end container-max-widths
@include _assert-ascending($container-max-widths, "$container-max-widths"); // @include _assert-ascending($container-max-widths, "$container-max-widths");
// Grid columns // Grid columns

2
src/Bundle/ChillMainBundle/Resources/views/Login/_login-logo.html.twig
View File

@ -1 +1 @@
<img class="logo" src="{{ asset('build/images/logo-chill-outil-accompagnement_white.png') }}"> <img class="logo" src="{{ asset('build/images/achille.png') }}" style="width: 544px; margin-bottom: 2rem;">

2
src/Bundle/ChillMainBundle/Resources/views/Login/login.html.twig
View File

@ -49,6 +49,6 @@
{{ include('@ChillMain/Login/_footer.html.twig') }} {{ include('@ChillMain/Login/_footer.html.twig') }}
</div> </div>
{{ encore_entry_script_tags('page_login') }} {# {{ encore_entry_script_tags('page_login') }} #}
</body> </body>
</html> </html>

2
src/Bundle/ChillMainBundle/migrations/Version20180905101426.php
View File

@ -27,7 +27,7 @@ final class Version20180905101426 extends AbstractMigration
public function up(Schema $schema): void public function up(Schema $schema): void
{ {
$this->addSql('ALTER TABLE permission_groups ADD flags JSONB DEFAULT \'[]\' NOT NULL'); // $this->addSql('ALTER TABLE permission_groups ADD flags JSONB DEFAULT \'[]\' NOT NULL');
$this->addSql('ALTER TABLE group_centers ALTER permissionsgroup_id DROP NOT NULL'); $this->addSql('ALTER TABLE group_centers ALTER permissionsgroup_id DROP NOT NULL');
} }
} }

4
src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
View File

@ -166,10 +166,12 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH
if (AccompanyingPeriod::STEP_DRAFT === $subject->getStep()) { if (AccompanyingPeriod::STEP_DRAFT === $subject->getStep()) {
// only creator can see, edit, delete, etc. // only creator can see, edit, delete, etc.
dump($subject->getCreatedBy());
if ( if (
$subject->getCreatedBy() === $token->getUser() $subject->getCreatedBy() === $token->getUser()
|| null === $subject->getCreatedBy() || null === $subject->getCreatedBy()
) { ) {
dump('i am true');
return true; return true;
} }
@ -213,7 +215,7 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH
return $token->getUser() === $subject->getUser(); return $token->getUser() === $subject->getUser();
} }
} }
dump($this->voterHelper->voteOnAttribute($attribute, $subject, $token));
return $this->voterHelper->voteOnAttribute($attribute, $subject, $token); return $this->voterHelper->voteOnAttribute($attribute, $subject, $token);
} }
} }

8
src/Bundle/ChillPersonBundle/migrations/Version20220215135509.php
View File

@ -54,9 +54,9 @@ final class Version20220215135509 extends AbstractMigration implements Container
$this->addSql( $this->addSql(
'UPDATE chill_person_person SET ' . 'UPDATE chill_person_person SET ' .
$this->buildMigrationPhonenumberClause($carrier_code, 'phonenumber') . $this->buildMigrationPhonenumberClause($carrier_code, 'phonenumber') .
', ' . ', ' .
$this->buildMigrationPhoneNumberClause($carrier_code, 'mobilenumber') $this->buildMigrationPhoneNumberClause($carrier_code, 'mobilenumber')
); );
$this->addSql('ALTER TABLE chill_person_phone ALTER phonenumber TYPE TEXT'); $this->addSql('ALTER TABLE chill_person_phone ALTER phonenumber TYPE TEXT');
@ -66,7 +66,7 @@ final class Version20220215135509 extends AbstractMigration implements Container
$this->addSql( $this->addSql(
'UPDATE chill_person_phone SET ' . 'UPDATE chill_person_phone SET ' .
$this->buildMigrationPhoneNumberClause($carrier_code, 'phonenumber') $this->buildMigrationPhoneNumberClause($carrier_code, 'phonenumber')
); );
} }