Jingga/oms-Organization
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Organization.git synced 2026-02-17 08:48:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix install

Browse Source
This commit is contained in:
Dennis Eichhorn 2016-10-09 20:07:30 +02:00
parent 856fb3bf2e
commit 61567348c6
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Admin/Install/Navigation.php
View File

@ -32,7 +32,7 @@ class Navigation
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
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); $navData = json_decode(file_get_contents(__DIR__ . '/Navigation.install.json'), true);

4
Admin/Installer.php
View File

@ -37,9 +37,9 @@ class Installer extends InstallerAbstract
/** /**
* {@inheritdoc} * {@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()) { switch ($dbPool->get('core')->getType()) {
case DatabaseType::MYSQL: case DatabaseType::MYSQL:

30
Controller.php
View File

@ -267,15 +267,15 @@ class Controller extends ModuleAbstract implements WebInterface
{ {
$val = []; $val = [];
if ( if (
$val['name'] = empty($request->getData('name')) ($val['name'] = empty($request->getData('name')))
|| $val['parent'] = ( || ($val['parent'] = (
$request->getData('parent') !== null $request->getData('parent') !== null
&& !is_numeric($request->getData('parent')) && !is_numeric($request->getData('parent'))
) ))
|| $val['status'] = ( || ($val['status'] = (
$request->getData('status') === null $request->getData('status') === null
|| !Status::isValidValue((int) $request->getData('status')) || !Status::isValidValue((int) $request->getData('status'))
) ))
) { ) {
$response->set('unit_create_validation', new FormValidation($val)); $response->set('unit_create_validation', new FormValidation($val));
@ -296,15 +296,15 @@ class Controller extends ModuleAbstract implements WebInterface
{ {
$val = []; $val = [];
if ( if (
$val['name'] = empty($request->getData('name')) ($val['name'] = empty($request->getData('name')))
|| $val['parent'] = ( || ($val['parent'] = (
$request->getData('parent') !== null $request->getData('parent') !== null
&& !is_numeric($request->getData('parent')) && !is_numeric($request->getData('parent'))
) ))
|| $val['status'] = ( || ($val['status'] = (
$request->getData('status') === null $request->getData('status') === null
|| !Status::isValidValue((int) $request->getData('status')) || !Status::isValidValue((int) $request->getData('status'))
) ))
) { ) {
$response->set('position_create_validation', new FormValidation($val)); $response->set('position_create_validation', new FormValidation($val));
@ -325,14 +325,14 @@ class Controller extends ModuleAbstract implements WebInterface
{ {
$val = []; $val = [];
if ( if (
$val['name'] = empty($request->getData('name')) ($val['name'] = empty($request->getData('name')))
|| $val['parent'] = ( || ($val['parent'] = (
$request->getData('parent') !== null $request->getData('parent') !== null
&& !is_numeric((int) $request->getData('parent')) && !is_numeric((int) $request->getData('parent'))
) ))
|| $val['status'] = ( || ($val['status'] = (
$request->getData('status') === null $request->getData('status') === null
|| !Status::isValidValue($request->getData('status')) || !Status::isValidValue($request->getData('status')))
) )
) { ) {
$response->set('department_create_validation', new FormValidation($val)); $response->set('department_create_validation', new FormValidation($val));