Fix ci build

gamonoid · Nov 1, 2020 · 3ceb427 · 3ceb427
1 parent d3b4748
commit 3ceb427
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 10 deletions.
diff --git a/bin/export-plural-rules b/bin/export-plural-rules
@@ -0,0 +1 @@
+../core/lib/composer/vendor/gettext/languages/bin/export-plural-rules
diff --git a/bin/markdown b/bin/markdown
@@ -0,0 +1 @@
+../core/lib/composer/vendor/cebe/markdown/bin/markdown
diff --git a/bin/pdepend b/bin/pdepend
@@ -0,0 +1 @@
+../core/lib/composer/vendor/pdepend/pdepend/src/bin/pdepend
diff --git a/bin/phpcb b/bin/phpcb
@@ -0,0 +1 @@
+../core/lib/composer/vendor/mayflower/php-codebrowser/bin/phpcb
diff --git a/bin/phpcbf b/bin/phpcbf
@@ -0,0 +1 @@
+../core/lib/composer/vendor/squizlabs/php_codesniffer/scripts/phpcbf
diff --git a/bin/phpcpd b/bin/phpcpd
@@ -0,0 +1 @@
+../core/lib/composer/vendor/sebastian/phpcpd/composer/bin/phpcpd
diff --git a/bin/phpcs b/bin/phpcs
@@ -0,0 +1 @@
+../core/lib/composer/vendor/squizlabs/php_codesniffer/scripts/phpcs
diff --git a/bin/phploc b/bin/phploc
@@ -0,0 +1 @@
+../core/lib/composer/vendor/phploc/phploc/phploc
diff --git a/bin/phpmd b/bin/phpmd
@@ -0,0 +1 @@
+../core/lib/composer/vendor/phpmd/phpmd/src/bin/phpmd
diff --git a/bin/phpunit b/bin/phpunit
@@ -0,0 +1 @@
+../core/lib/composer/vendor/phpunit/phpunit/phpunit
diff --git a/bin/release b/bin/release
@@ -0,0 +1 @@
+../core/lib/composer/vendor/consolidation/self-update/scripts/release
diff --git a/bin/robo b/bin/robo
@@ -0,0 +1 @@
+../core/lib/composer/vendor/consolidation/robo/robo
diff --git a/build.xml b/build.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="icehrm" default="build">
  <!-- By default, we assume all tools to be on the $PATH -->
- <property name="toolsdir" value="${basedir}/tools/"/>
+ <property name="toolsdir" value="${basedir}/bin/"/>
  <property name="destination" value="${basedir}/build/app"/>
  <property name="testdir" value="${basedir}/build/test"/>
  <property name="origin" value="${basedir}"/>

diff --git a/core/login.php b/core/login.php
@@ -277,7 +277,7 @@
                 <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) {?>

diff --git 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));