Opravy chyb helpdesk (#797)

* block capacity check fix * check tables existence fix * downgrade nette forms
skaut · Mar 1, 2021 · 35d5269 · 35d5269
1 parent ffbeb34
commit 35d5269
Show file tree

Hide file tree

Showing 5 changed files with 823 additions and 152 deletions.
diff --git a/app/AdminModule/ProgramModule/Forms/BlockFormFactory.php b/app/AdminModule/ProgramModule/Forms/BlockFormFactory.php
@@ -158,7 +158,7 @@ public function create(int $id, int $userId): Form
         $capacityText->addCondition(Form::FILLED)
             ->addRule(Form::INTEGER, 'admin.program.blocks.form.capacity_format')
             ->toggle('alternatesAllowedCheckbox');
-        $minAllowedCapacity = $this->queryBus->handle(new MinBlockAllowedCapacityQuery($this->block));
+        $minAllowedCapacity = $this->block !== null ? $this->queryBus->handle(new MinBlockAllowedCapacityQuery($this->block)) : null;
         if ($minAllowedCapacity !== null) {
             $capacityText->addCondition(Form::FILLED)
                 ->addRule(Form::MIN, 'admin.program.blocks.form.capacity_low', $minAllowedCapacity);

diff --git a/app/InstallModule/Presenters/InstallPresenter.php b/app/InstallModule/Presenters/InstallPresenter.php
@@ -7,7 +7,6 @@
 use App\Model\Acl\Repositories\RoleRepository;
 use App\Model\Acl\Role;
 use App\Model\Settings\Commands\SetSettingBoolValue;
-use App\Model\Settings\Exceptions\SettingsItemNotFoundException;
 use App\Model\Settings\Queries\SettingBoolValueQuery;
 use App\Model\Settings\Settings;
 use App\Model\Structure\Repositories\SubeventRepository;
@@ -17,14 +16,14 @@
 use App\Services\QueryBus;
 use Contributte\Console\Application;
 use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\DBAL\Exception\TableNotFoundException;
 use Doctrine\Migrations\Tools\Console\Command\MigrateCommand;
 use Doctrine\ORM\EntityManagerInterface;
 use Exception;
 use Nette\Application\AbortException;
 use Skautis\Skautis;
 use Skautis\Wsdl\WsdlException;
 use Symfony\Component\Console\Input\ArrayInput;
+use Symfony\Component\Messenger\Exception\HandlerFailedException;
 use Throwable;
 use Tracy\Debugger;
 use Tracy\ILogger;
@@ -84,8 +83,8 @@ public function renderDefault(): void
 
             $this->flashMessage('install.schema.schema_already_created', 'info');
             $this->redirect('admin');
-        } catch (TableNotFoundException $ex) {
-        } catch (SettingsItemNotFoundException $ex) {
+        } catch (HandlerFailedException $ex) {
+            // ignoruje se, tabulky ještě nejsou vytvořeny
         }
     }
 
@@ -126,9 +125,7 @@ public function renderAdmin(): void
                 $this->flashMessage('install.admin.admin_already_created', 'info');
                 $this->redirect('finish');
             }
-        } catch (TableNotFoundException $ex) {
-            $this->redirect('default');
-        } catch (SettingsItemNotFoundException $ex) {
+        } catch (HandlerFailedException $ex) {
             $this->redirect('default');
         }
 
@@ -185,9 +182,7 @@ public function renderFinish(): void
             if (! $this->queryBus->handle(new SettingBoolValueQuery(Settings::ADMIN_CREATED))) {
                 $this->redirect('default');
             }
-        } catch (TableNotFoundException $ex) {
-            $this->redirect('default');
-        } catch (SettingsItemNotFoundException $ex) {
+        } catch (HandlerFailedException $ex) {
             $this->redirect('default');
         }
     }
@@ -204,9 +199,7 @@ public function renderInstalled(): void
             if (! $this->queryBus->handle(new SettingBoolValueQuery(Settings::ADMIN_CREATED))) {
                 $this->redirect('default');
             }
-        } catch (TableNotFoundException $ex) {
-            $this->redirect('default');
-        } catch (SettingsItemNotFoundException $ex) {
+        } catch (HandlerFailedException $ex) {
             $this->redirect('default');
         }
     }

diff --git a/app/WebModule/Presenters/WebBasePresenter.php b/app/WebModule/Presenters/WebBasePresenter.php
@@ -20,8 +20,8 @@
 use App\Services\CmsService;
 use App\Services\QueryBus;
 use App\Services\SkautIsService;
-use Doctrine\DBAL\Exception\TableNotFoundException;
 use Nette\Application\AbortException;
+use Symfony\Component\Messenger\Exception\HandlerFailedException;
 use Throwable;
 use WebLoader\Nette\CssLoader;
 use WebLoader\Nette\JavaScriptLoader;
@@ -140,9 +140,7 @@ private function checkInstallation(): void
             if (! $this->queryBus->handle(new SettingBoolValueQuery(Settings::ADMIN_CREATED))) {
                 $this->redirect(':Install:Install:default');
             }
-        } catch (TableNotFoundException $ex) {
-            $this->redirect(':Install:Install:default');
-        } catch (SettingsItemNotFoundException $ex) {
+        } catch (HandlerFailedException $ex) {
             $this->redirect(':Install:Install:default');
         }
     }

diff --git a/composer.json b/composer.json
@@ -22,7 +22,7 @@
         "nette/database": "^3.1",
         "nette/di": "^3.0",
         "nette/finder": "^2.5",
-        "nette/forms": "^3.0",
+        "nette/forms": "~3.0.0",
         "nette/http": "^3.1",
         "nette/mail": "^3.1",
         "nette/robot-loader": "^3.3",