From 240d7ff853c1ec69a600c53422cd72039870db64 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sun, 9 Oct 2016 20:07:30 +0200 Subject: [PATCH] Fix install --- Admin/Install/Navigation.php | 2 +- Admin/Installer.php | 4 ++-- Controller.php | 10 +++++----- Theme/Backend/settings-general.tpl.php | 6 +++--- Theme/backend/settings-general.tpl.php | 6 +++--- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index 52b8cfe..a3b2d55 100644 --- a/Admin/Install/Navigation.php +++ b/Admin/Install/Navigation.php @@ -29,7 +29,7 @@ use phpOMS\DataStorage\Database\Pool; */ class Navigation { - public static function install(Pool $dbPool) + public static function install(string $path, Pool $dbPool) { $navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true); diff --git a/Admin/Installer.php b/Admin/Installer.php index ed17332..344c200 100644 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -37,9 +37,9 @@ class Installer extends InstallerAbstract /** * {@inheritdoc} */ - public static function install(Pool $dbPool, InfoManager $info) + public static function install(string $path, Pool $dbPool, InfoManager $info) { - parent::install($dbPool, $info); + parent::install($path, $dbPool, $info); switch ($dbPool->get('core')->getType()) { case DatabaseType::MYSQL: diff --git a/Controller.php b/Controller.php index a31f8ce..2e84286 100644 --- a/Controller.php +++ b/Controller.php @@ -302,15 +302,15 @@ class Controller extends ModuleAbstract implements WebInterface { $val = []; if ( - $val['name'] = empty($request->getData('name')) - || $val['parent'] = ( + ($val['name'] = empty($request->getData('name'))) + || ($val['parent'] = ( $request->getData('parent') !== null && !is_numeric($request->getData('parent')) - ) - || $val['status'] = ( + )) + || ($val['status'] = ( $request->getData('status') === null || !GroupStatus::isValidValue((int) $request->getData('status')) - ) + )) ) { $response->set('group_create_validation', new FormValidation($val)); diff --git a/Theme/Backend/settings-general.tpl.php b/Theme/Backend/settings-general.tpl.php index 2db817a..e58109e 100644 --- a/Theme/Backend/settings-general.tpl.php +++ b/Theme/Backend/settings-general.tpl.php @@ -27,11 +27,11 @@ $_thousands_sep = $this->getData('thousands_sep') ?? ''; $_password = $this->getData('password') ?? ''; $_country = $this->getData('country') ?? ''; -$countries = \phpOMS\Localization\ISO3166EnumArray::getConstants(); +$countries = \phpOMS\Localization\ISO3166NameEnum::getConstants(); $timezones = \phpOMS\Localization\TimeZoneEnumArray::getConstants(); $timeformats = \phpOMS\Localization\ISO8601EnumArray::getConstants(); -$languages = \phpOMS\Localization\ISO639EnumArray::getConstants(); -$currencies = \phpOMS\Localization\ISO4217EnumArray::getConstants(); +$languages = \phpOMS\Localization\ISO639Enum::getConstants(); +$currencies = \phpOMS\Localization\ISO4217Enum::getConstants(); ?>
diff --git a/Theme/backend/settings-general.tpl.php b/Theme/backend/settings-general.tpl.php index 2db817a..e58109e 100644 --- a/Theme/backend/settings-general.tpl.php +++ b/Theme/backend/settings-general.tpl.php @@ -27,11 +27,11 @@ $_thousands_sep = $this->getData('thousands_sep') ?? ''; $_password = $this->getData('password') ?? ''; $_country = $this->getData('country') ?? ''; -$countries = \phpOMS\Localization\ISO3166EnumArray::getConstants(); +$countries = \phpOMS\Localization\ISO3166NameEnum::getConstants(); $timezones = \phpOMS\Localization\TimeZoneEnumArray::getConstants(); $timeformats = \phpOMS\Localization\ISO8601EnumArray::getConstants(); -$languages = \phpOMS\Localization\ISO639EnumArray::getConstants(); -$currencies = \phpOMS\Localization\ISO4217EnumArray::getConstants(); +$languages = \phpOMS\Localization\ISO639Enum::getConstants(); +$currencies = \phpOMS\Localization\ISO4217Enum::getConstants(); ?>