allerta-vvf
/
allerta-vvf
mirror of https://github.com/allerta-vvf/allerta-vvf
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixes

This commit is contained in:
Matteo Gheza 2021-04-29 23:39:31 +02:00
parent a7dc671b42
commit f6fda6ea8c
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/php.yml vendored
View File

@ -186,7 +186,7 @@ jobs:
run: | run: |
ls ls
sudo wget -O deployment.phar https://github.com/dg/ftp-deployment/releases/download/v3.4.0/deployment.phar sudo wget -O deployment.phar https://github.com/dg/ftp-deployment/releases/download/v3.4.0/deployment.phar
echo '<?php $remotes = [ "staging" => [ "remote" => "${{ secrets.DEPLOY_URL }}", "sentry_env" => "staging" ] ]; ?>' > deployment_remotes.php echo '<?php $remotes = [ "staging" => [ "remote" => "${{ secrets.DEPLOY_URL }}", "sentry_env" => "staging", "skip_composer_upload" => true ] ]; ?>' > deployment_remotes.php
cat deployment_remotes.php cat deployment_remotes.php
ls ls
php deployment.phar deployment.php --section staging php deployment.phar deployment.php --section staging
@ -232,7 +232,7 @@ jobs:
run: | run: |
ls ls
sudo wget -O deployment.phar https://github.com/dg/ftp-deployment/releases/download/v3.4.0/deployment.phar sudo wget -O deployment.phar https://github.com/dg/ftp-deployment/releases/download/v3.4.0/deployment.phar
echo '<?php $remotes = [ "production" => [ "remote" => "${{ secrets.DEPLOY_URL }}", "sentry_env" => "prod" ] ]; ?>' > deployment_remotes.php echo '<?php $remotes = [ "production" => [ "remote" => "${{ secrets.DEPLOY_URL }}", "sentry_env" => "prod", "skip_composer_upload" => true ] ]; ?>' > deployment_remotes.php
cat deployment_remotes.php cat deployment_remotes.php
ls ls
php deployment.phar deployment.php --section production php deployment.phar deployment.php --section production

3
server/modal_availability_schedule.php
View File

@ -53,6 +53,9 @@ if(!empty($result)){
$old_schedules[$schedule[0]][$hour] = true; $old_schedules[$schedule[0]][$hour] = true;
} }
$old_holidays = json_decode($result[0]["holidays"]); $old_holidays = json_decode($result[0]["holidays"]);
if(is_null($old_holidays)){
$old_holidays = [];
}
} else { } else {
$old_schedules = []; $old_schedules = [];
$old_holidays = []; $old_holidays = [];

6
server/resources/package-lock.json generated
View File

@ -25,9 +25,9 @@
"colors": "^1.4.0", "colors": "^1.4.0",
"copy-webpack-plugin": "^8.1.1", "copy-webpack-plugin": "^8.1.1",
"css-loader": "^5.2.4", "css-loader": "^5.2.4",
"datatables.net-bs4": "^1.10.24", "datatables.net-bs4": "^1.10.23",
"datatables.net-buttons-bs4": "^1.7.0", "datatables.net-buttons-bs4": "^1.6.5",
"datatables.net-plugins": "^1.10.24", "datatables.net-plugins": "^1.10.23",
"datatables.net-responsive-bs4": "^2.2.7", "datatables.net-responsive-bs4": "^2.2.7",
"expose-loader": "^2.0.0", "expose-loader": "^2.0.0",
"file-loader": "^6.2.0", "file-loader": "^6.2.0",

6
server/resources/package.json
View File

@ -27,9 +27,9 @@
"colors": "^1.4.0", "colors": "^1.4.0",
"copy-webpack-plugin": "^8.1.1", "copy-webpack-plugin": "^8.1.1",
"css-loader": "^5.2.4", "css-loader": "^5.2.4",
"datatables.net-bs4": "^1.10.24", "datatables.net-bs4": "^1.10.23",
"datatables.net-buttons-bs4": "^1.7.0", "datatables.net-buttons-bs4": "^1.6.5",
"datatables.net-plugins": "^1.10.24", "datatables.net-plugins": "^1.10.23",
"datatables.net-responsive-bs4": "^2.2.7", "datatables.net-responsive-bs4": "^2.2.7",
"expose-loader": "^2.0.0", "expose-loader": "^2.0.0",
"file-loader": "^6.2.0", "file-loader": "^6.2.0",