From 016fbe0f3becb7be22428d993777993d8d77c9a6 Mon Sep 17 00:00:00 2001 From: Thilina Hasantha Date: Mon, 25 May 2020 07:39:54 +0200 Subject: [PATCH] Update readme and fix code style issues --- core/src/Classes/DomainAwareInputCleaner.php | 4 ++-- core/src/Reports/Admin/Reports/PayrollDataExport.php | 2 +- core/src/Utils/LogManager.php | 2 +- readme.md | 9 +-------- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/core/src/Classes/DomainAwareInputCleaner.php b/core/src/Classes/DomainAwareInputCleaner.php index 5e135cc9..a078b73c 100644 --- a/core/src/Classes/DomainAwareInputCleaner.php +++ b/core/src/Classes/DomainAwareInputCleaner.php @@ -3,7 +3,6 @@ namespace Classes; - class DomainAwareInputCleaner { public function cleanTableColumn($input) @@ -72,7 +71,8 @@ class DomainAwareInputCleaner return $filters; } - public function cleanSearch($searchTerm) { + public function cleanSearch($searchTerm) + { if (!$this->isValidFilterValue($searchTerm)) { return ''; } diff --git a/core/src/Reports/Admin/Reports/PayrollDataExport.php b/core/src/Reports/Admin/Reports/PayrollDataExport.php index 449e9ea2..b193d8e7 100644 --- a/core/src/Reports/Admin/Reports/PayrollDataExport.php +++ b/core/src/Reports/Admin/Reports/PayrollDataExport.php @@ -66,7 +66,7 @@ class PayrollDataExport extends ReportBuilder implements ReportBuilderInterface 'editable' => $col->editable, 'enabled' => $col->enabled, 'default_value' => $col->default_value, - 'calculation_columns' => $col->calculation_columns, //[{"name":"O","column":"107","id":"calculation_columns_1"}] + 'calculation_columns' => $col->calculation_columns, 'calculation_function' => $col->calculation_function, ]; diff --git a/core/src/Utils/LogManager.php b/core/src/Utils/LogManager.php index d85acdab..abe02259 100644 --- a/core/src/Utils/LogManager.php +++ b/core/src/Utils/LogManager.php @@ -25,7 +25,7 @@ class LogManager if (defined('LOG_STDERR') && LOG_STDERR === '1') { self::$me->log->pushHandler(new StreamHandler('php://stderr', LOG_LEVEL)); - } else if (is_writable(ini_get('error_log'))) { + } elseif (is_writable(ini_get('error_log'))) { self::$me->log->pushHandler(new StreamHandler(ini_get('error_log'), LOG_LEVEL)); } elseif (is_writable(CLIENT_BASE_PATH.'data/app.log')) { self::$me->log->pushHandler(new StreamHandler(CLIENT_BASE_PATH.'data/app.log', LOG_LEVEL)); diff --git a/readme.md b/readme.md index d0f88c93..87010b11 100644 --- a/readme.md +++ b/readme.md @@ -103,12 +103,7 @@ $ git clone https://github.com/gamonoid/icehrm.git $ cd icehrm $ docker-compose up ``` - -- Load icehrm Development preview - -``` -http://localhost:8080 -``` +- Navigate to [http://localhost:8080](http://localhost:8080) to load icehrm. (user:admin/pass:admin) - Make some changes and the changes will be reflected on the above url @@ -123,8 +118,6 @@ docker-compose -f docker-compose-testing.yaml up --exit-code-from cypress $ docker-compose -f docker-compose-prod.yaml up -d --build ``` -- Navigate to [http://clients.icehrm-open.test/dev](http://clients.icehrm-open.test/dev) to load icehrm from VM. (user:admin/pass:admin) - ### Building frontend assets - When ever you have done a change to JavaScript or CSS files in icehrm/web you need to rebuild the frontend