galads/icehrm
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix ci build

Browse Source
This commit is contained in:
Thilina Pituwala
2020-11-01 10:17:04 +01:00
parent d3b4748cba
commit 3ceb427479
15 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/login.php
View File

@@ -277,7 +277,7 @@ $csrfToken = sha1(rand(4500, 100000) . time(). CLIENT_BASE_URL);
<div class="col-lg-6 col-md-8 col-xs-10">
<div class="bg-white-2 h-100 px-11 pt-11 pb-7">
<div class="row d-flex justify-content-center">
<img src="<?=$logoFileUrl?>"/>
<img src="<?=$logoFileUrl?>" style="max-width:100%;max-height:280px;"/>
</div>
<hr/>
<?php if ($gsuiteEnabled) {?>

16
core/src/Classes/BaseService.php
View File

@@ -292,8 +292,8 @@ class BaseService
$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 @@ class BaseService
$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 @@ class BaseService
$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 @@ END;
) {
$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));