diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_variables.scss b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_variables.scss index f9cd33f5f..b65dbd633 100644 --- a/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_variables.scss +++ b/src/Bundle/ChillMainBundle/Resources/public/module/bootstrap/custom/_variables.scss @@ -332,8 +332,8 @@ $grid-breakpoints: ( ) !default; // scss-docs-end grid-breakpoints -@include _assert-ascending($grid-breakpoints, "$grid-breakpoints"); -@include _assert-starts-at-zero($grid-breakpoints, "$grid-breakpoints"); +// @include _assert-ascending($grid-breakpoints, "$grid-breakpoints"); +// @include _assert-starts-at-zero($grid-breakpoints, "$grid-breakpoints"); // Grid containers @@ -350,7 +350,7 @@ $container-max-widths: ( ) !default; // 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 diff --git a/src/Bundle/ChillMainBundle/Resources/views/Login/_login-logo.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Login/_login-logo.html.twig index 751165357..e8bae725e 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Login/_login-logo.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Login/_login-logo.html.twig @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/src/Bundle/ChillMainBundle/Resources/views/Login/login.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Login/login.html.twig index 8a636a8cd..1bb4ba57a 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/Login/login.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/Login/login.html.twig @@ -49,6 +49,6 @@ {{ include('@ChillMain/Login/_footer.html.twig') }} - {{ encore_entry_script_tags('page_login') }} + {# {{ encore_entry_script_tags('page_login') }} #} diff --git a/src/Bundle/ChillMainBundle/migrations/Version20180905101426.php b/src/Bundle/ChillMainBundle/migrations/Version20180905101426.php index e56936aed..7e703aa2f 100644 --- a/src/Bundle/ChillMainBundle/migrations/Version20180905101426.php +++ b/src/Bundle/ChillMainBundle/migrations/Version20180905101426.php @@ -27,7 +27,7 @@ final class Version20180905101426 extends AbstractMigration 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'); } } diff --git a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php index 0859ba7bd..a8bbb215d 100644 --- a/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php +++ b/src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php @@ -166,10 +166,12 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH if (AccompanyingPeriod::STEP_DRAFT === $subject->getStep()) { // only creator can see, edit, delete, etc. + dump($subject->getCreatedBy()); if ( $subject->getCreatedBy() === $token->getUser() || null === $subject->getCreatedBy() ) { + dump('i am true'); return true; } @@ -213,7 +215,7 @@ class AccompanyingPeriodVoter extends AbstractChillVoter implements ProvideRoleH return $token->getUser() === $subject->getUser(); } } - + dump($this->voterHelper->voteOnAttribute($attribute, $subject, $token)); return $this->voterHelper->voteOnAttribute($attribute, $subject, $token); } } diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20220215135509.php b/src/Bundle/ChillPersonBundle/migrations/Version20220215135509.php index b54483955..b1cee6d79 100644 --- a/src/Bundle/ChillPersonBundle/migrations/Version20220215135509.php +++ b/src/Bundle/ChillPersonBundle/migrations/Version20220215135509.php @@ -54,9 +54,9 @@ final class Version20220215135509 extends AbstractMigration implements Container $this->addSql( 'UPDATE chill_person_person SET ' . - $this->buildMigrationPhonenumberClause($carrier_code, 'phonenumber') . - ', ' . - $this->buildMigrationPhoneNumberClause($carrier_code, 'mobilenumber') + $this->buildMigrationPhonenumberClause($carrier_code, 'phonenumber') . + ', ' . + $this->buildMigrationPhoneNumberClause($carrier_code, 'mobilenumber') ); $this->addSql('ALTER TABLE chill_person_phone ALTER phonenumber TYPE TEXT'); @@ -66,7 +66,7 @@ final class Version20220215135509 extends AbstractMigration implements Container $this->addSql( 'UPDATE chill_person_phone SET ' . - $this->buildMigrationPhoneNumberClause($carrier_code, 'phonenumber') + $this->buildMigrationPhoneNumberClause($carrier_code, 'phonenumber') ); }