From 3ceb427479c0dbba94f8f06ed705fb4ec4de6662 Mon Sep 17 00:00:00 2001 From: Thilina Pituwala Date: Sun, 1 Nov 2020 10:17:04 +0100 Subject: [PATCH] Fix ci build --- bin/export-plural-rules | 1 + bin/markdown | 1 + bin/pdepend | 1 + bin/phpcb | 1 + bin/phpcbf | 1 + bin/phpcpd | 1 + bin/phpcs | 1 + bin/phploc | 1 + bin/phpmd | 1 + bin/phpunit | 1 + bin/release | 1 + bin/robo | 1 + build.xml | 2 +- core/login.php | 2 +- core/src/Classes/BaseService.php | 16 ++++++++-------- 15 files changed, 22 insertions(+), 10 deletions(-) create mode 120000 bin/export-plural-rules create mode 120000 bin/markdown create mode 120000 bin/pdepend create mode 120000 bin/phpcb create mode 120000 bin/phpcbf create mode 120000 bin/phpcpd create mode 120000 bin/phpcs create mode 120000 bin/phploc create mode 120000 bin/phpmd create mode 120000 bin/phpunit create mode 120000 bin/release create mode 120000 bin/robo diff --git a/bin/export-plural-rules b/bin/export-plural-rules new file mode 120000 index 000000000..06abdeebe --- /dev/null +++ b/bin/export-plural-rules @@ -0,0 +1 @@ +../core/lib/composer/vendor/gettext/languages/bin/export-plural-rules \ No newline at end of file diff --git a/bin/markdown b/bin/markdown new file mode 120000 index 000000000..d032611d1 --- /dev/null +++ b/bin/markdown @@ -0,0 +1 @@ +../core/lib/composer/vendor/cebe/markdown/bin/markdown \ No newline at end of file diff --git a/bin/pdepend b/bin/pdepend new file mode 120000 index 000000000..fc410e6f4 --- /dev/null +++ b/bin/pdepend @@ -0,0 +1 @@ +../core/lib/composer/vendor/pdepend/pdepend/src/bin/pdepend \ No newline at end of file diff --git a/bin/phpcb b/bin/phpcb new file mode 120000 index 000000000..1843dc983 --- /dev/null +++ b/bin/phpcb @@ -0,0 +1 @@ +../core/lib/composer/vendor/mayflower/php-codebrowser/bin/phpcb \ No newline at end of file diff --git a/bin/phpcbf b/bin/phpcbf new file mode 120000 index 000000000..903da4e4d --- /dev/null +++ b/bin/phpcbf @@ -0,0 +1 @@ +../core/lib/composer/vendor/squizlabs/php_codesniffer/scripts/phpcbf \ No newline at end of file diff --git a/bin/phpcpd b/bin/phpcpd new file mode 120000 index 000000000..596580050 --- /dev/null +++ b/bin/phpcpd @@ -0,0 +1 @@ +../core/lib/composer/vendor/sebastian/phpcpd/composer/bin/phpcpd \ No newline at end of file diff --git a/bin/phpcs b/bin/phpcs new file mode 120000 index 000000000..c438d23b5 --- /dev/null +++ b/bin/phpcs @@ -0,0 +1 @@ +../core/lib/composer/vendor/squizlabs/php_codesniffer/scripts/phpcs \ No newline at end of file diff --git a/bin/phploc b/bin/phploc new file mode 120000 index 000000000..85e379bea --- /dev/null +++ b/bin/phploc @@ -0,0 +1 @@ +../core/lib/composer/vendor/phploc/phploc/phploc \ No newline at end of file diff --git a/bin/phpmd b/bin/phpmd new file mode 120000 index 000000000..e5ec0fa80 --- /dev/null +++ b/bin/phpmd @@ -0,0 +1 @@ +../core/lib/composer/vendor/phpmd/phpmd/src/bin/phpmd \ No newline at end of file diff --git a/bin/phpunit b/bin/phpunit new file mode 120000 index 000000000..cfff73118 --- /dev/null +++ b/bin/phpunit @@ -0,0 +1 @@ +../core/lib/composer/vendor/phpunit/phpunit/phpunit \ No newline at end of file diff --git a/bin/release b/bin/release new file mode 120000 index 000000000..9a3ed3887 --- /dev/null +++ b/bin/release @@ -0,0 +1 @@ +../core/lib/composer/vendor/consolidation/self-update/scripts/release \ No newline at end of file diff --git a/bin/robo b/bin/robo new file mode 120000 index 000000000..be4294419 --- /dev/null +++ b/bin/robo @@ -0,0 +1 @@ +../core/lib/composer/vendor/consolidation/robo/robo \ No newline at end of file diff --git a/build.xml b/build.xml index c1b812222..31648f7bf 100644 --- a/build.xml +++ b/build.xml @@ -1,7 +1,7 @@ - + diff --git a/core/login.php b/core/login.php index a5953491a..54ddbe934 100644 --- a/core/login.php +++ b/core/login.php @@ -277,7 +277,7 @@
- +
diff --git a/core/src/Classes/BaseService.php b/core/src/Classes/BaseService.php index 3efa63382..96db6b26e 100644 --- a/core/src/Classes/BaseService.php +++ b/core/src/Classes/BaseService.php @@ -292,8 +292,8 @@ public function getDataCount() $childCompaniesIds = array(); if (\Classes\SettingsManager::getInstance()->getSetting( - 'System: Child Company Structure Managers Enabled' - ) == '1' + 'System: Child Company Structure Managers Enabled' + ) == '1' ) { $childCompaniesResp = \Company\Common\Model\CompanyStructure::getAllChildCompanyStructures( $cempObj->department @@ -486,8 +486,8 @@ public function getData( $childCompaniesIds = array(); if (SettingsManager::getInstance()->getSetting( - 'System: Child Company Structure Managers Enabled' - ) == '1' + 'System: Child Company Structure Managers Enabled' + ) == '1' ) { $childCompaniesResp = CompanyStructure::getAllChildCompanyStructures($cempObj->department); $childCompanies = $childCompaniesResp->getObject(); @@ -567,8 +567,8 @@ public function getData( $childCompaniesIds = array(); if (SettingsManager::getInstance()->getSetting( - 'System: Child Company Structure Managers Enabled' - ) == '1' + 'System: Child Company Structure Managers Enabled' + ) == '1' ) { $childCompaniesResp = CompanyStructure::getAllChildCompanyStructures($cempObj->department); $childCompanies = $childCompaniesResp->getObject(); @@ -1783,8 +1783,8 @@ protected function canManageEmployee($profileId) ) { $departmentHeadFound = true; } elseif (SettingsManager::getInstance()->getSetting( - 'System: Child Company Structure Managers Enabled' - ) == '1' + 'System: Child Company Structure Managers Enabled' + ) == '1' ) { $companyStructure = new CompanyStructure(); $companyStructure->Load('id = ?', array($subordinate->department));