diff --git a/History.md b/History.md index f80121e6d0..fd8d3d41a1 100644 --- a/History.md +++ b/History.md @@ -22,6 +22,7 @@ - Bugfix: When using "previous / next motion" links for pagination, motions and resolutions were not properly separated. - Bugfix: Some Youtube-Videos could not be embedded. - Bugfix: When copying a consultation with motion types whose permissions were restricted to a specific user group, these permissions where not properly copied. +- Bugfix: If an uploaded logo was deleted, the dhown logo was broken instead of falling back to the default logo. ### Version 4.14.2 (2024-09-08) diff --git a/composer.json b/composer.json index 5720132f33..1ffafff7a4 100644 --- a/composer.json +++ b/composer.json @@ -34,7 +34,7 @@ "phpoffice/phpspreadsheet": "^3.3", "predis/predis": "^2.2", "s1syphos/php-simple-captcha": "^2.3", - "scssphp/scssphp": "^1.11", + "scssphp/scssphp": "^1.13.0", "setasign/fpdi": "^2.3.7", "spomky-labs/otphp": "^11.3", "symfony/amazon-mailer": "^5.4.23", diff --git a/composer.lock b/composer.lock index c0c90b759d..457547f00c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ecf2349a76c207218fbb3075133a4e2e", + "content-hash": "412e28ab5b578a3962d8d9f0f8e19ede", "packages": [ { "name": "async-aws/core", diff --git a/controllers/admin/IndexController.php b/controllers/admin/IndexController.php index 451e81f16b..4bed527e37 100644 --- a/controllers/admin/IndexController.php +++ b/controllers/admin/IndexController.php @@ -552,6 +552,13 @@ public function actionFiles(): HtmlResponse 'id' => $this->getHttpRequest()->post('id'), ]); if ($file) { + $settings = $this->consultation->getSettings(); + if ($settings->logoUrl === $file->getUrl()) { + $settings->logoUrl = null; + $this->consultation->setSettings($settings); + $this->consultation->save(); + } + $file->delete(); } diff --git a/tests/Acceptance/proposedprocedure/EditAmendmentCept.php b/tests/Acceptance/proposedprocedure/EditAmendmentCept.php index fe3faf3964..471d2deffe 100644 --- a/tests/Acceptance/proposedprocedure/EditAmendmentCept.php +++ b/tests/Acceptance/proposedprocedure/EditAmendmentCept.php @@ -160,11 +160,10 @@ $I->submitForm('#motionConfirmedForm', []); $I->see('A really small replacement'); -$I->see('A8', 'h1'); +$I->see('Testing proposed changes', 'h1'); $I->see('Version 2', '.motionDataTable .historyOpener .currVersion'); $I->clickJS('.motionDataTable .btnHistoryOpener'); $I->see('Version 1', '.motionDataTable .motionHistory a'); $I->see('Umwelt', '.motionDataTable'); $I->gotoConsultationHome(); -$I->see('A8', '.motionLink' . (AcceptanceTester::FIRST_FREE_MOTION_ID + 1)); -$I->dontSeeElement('.motionRow118'); +$I->see('Testing proposed changes', '.sectionResolutions .motionLink' . (AcceptanceTester::FIRST_FREE_MOTION_ID + 1));