From 26fe373a30b9e21fee14dd94eaea09af06d65f52 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Tue, 20 Dec 2022 16:03:49 +0900 Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E3=83=AB=E3=83=BC=E3=83=A0=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E3=81=AE=E5=8F=82=E5=8A=A0=E8=80=85=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=E7=94=BB=E9=9D=A2=E3=81=A7=E3=80=8C=E3=83=AB=E3=83=BC=E3=83=A0?= =?UTF-8?q?=E5=86=85=E3=81=AE=E5=BD=B9=E5=89=B2=E3=80=8D=E3=81=A7=E3=82=BD?= =?UTF-8?q?=E3=83=BC=E3=83=88=E3=81=99=E3=82=8B=E3=81=A8=E3=82=A8=E3=83=A9?= =?UTF-8?q?=E3=83=BC=E3=81=8C=E7=99=BA=E7=94=9F=E3=81=99=E3=82=8B=E3=81=9F?= =?UTF-8?q?=E3=82=81=E4=BF=AE=E6=AD=A3=EF=BC=88NC3=E3=81=AE=E3=81=BF?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controller/Component/RoomsRolesFormComponent.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Controller/Component/RoomsRolesFormComponent.php b/Controller/Component/RoomsRolesFormComponent.php index 9e52827..38b5a23 100644 --- a/Controller/Component/RoomsRolesFormComponent.php +++ b/Controller/Component/RoomsRolesFormComponent.php @@ -208,7 +208,7 @@ public function actionRoomsRolesUser(Controller $controller) { 'displayFields' => self::$displaFields, 'extra' => array( 'selectedUsers' => $controller->Session->read('RoomsRolesUsers'), - 'plugin' => $seached ? $controller->params['plugin'] : '', + 'plugin' => $controller->params['plugin'] ?? '', 'search' => $seached ) )); From af746dc2e3e51645bc4ef7357f687180fce4e30e Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Mon, 13 Feb 2023 22:20:43 +0900 Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=E3=83=AB=E3=83=BC=E3=83=A0=E3=81=AE?= =?UTF-8?q?=E4=BD=9C=E6=88=90=E6=99=82=E3=81=AB=E3=80=81=E5=8F=82=E5=8A=A0?= =?UTF-8?q?=E8=80=85=E3=81=AE=E9=81=B8=E6=8A=9E=E7=94=BB=E9=9D=A2=E3=81=A7?= =?UTF-8?q?=E5=BD=B9=E5=89=B2=E3=82=92=E5=A4=89=E6=9B=B4=E3=81=97=E3=81=9F?= =?UTF-8?q?=E5=BE=8C=E3=81=A7=E5=9F=BA=E6=9C=AC=E8=A8=AD=E5=AE=9A=E3=81=AB?= =?UTF-8?q?=E6=88=BB=E3=81=A3=E3=81=A6=E3=80=81=E3=80=8C=E3=81=99=E3=81=B9?= =?UTF-8?q?=E3=81=A6=E3=81=AE=E4=BC=9A=E5=93=A1=E3=82=92=E3=83=87=E3=83=95?= =?UTF-8?q?=E3=82=A9=E3=83=AB=E3=83=88=E3=81=A7=E5=8F=82=E5=8A=A0=E3=81=95?= =?UTF-8?q?=E3=81=9B=E3=82=8B=E3=80=8D=E3=81=AB=E3=83=81=E3=82=A7=E3=83=83?= =?UTF-8?q?=E3=82=AF=E3=82=92=E5=85=A5=E3=82=8C=E3=81=A6=E7=99=BB=E9=8C=B2?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=81=A8=E3=80=81=E5=BD=B9=E5=89=B2=E3=81=AE?= =?UTF-8?q?=E3=83=87=E3=83=BC=E3=82=BF=E3=81=8C=E4=BA=8C=E9=87=8D=E3=81=A7?= =?UTF-8?q?=E7=99=BB=E9=8C=B2=E3=81=95=E3=82=8C=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controller/RoomAddController.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Controller/RoomAddController.php b/Controller/RoomAddController.php index 5237e93..750e1d6 100644 --- a/Controller/RoomAddController.php +++ b/Controller/RoomAddController.php @@ -165,6 +165,11 @@ public function basic() { //他言語が入力されていない場合、Currentの言語データをセット $this->SwitchLanguage->setM17nRequestValue(); + $defaultParticipation = $this->request->data['Room']['default_participation'] ?? null; + if ($this->Session->read('RoomAdd.Room.default_participation') !== $defaultParticipation) { + $this->Session->delete('RoomsRolesUsers'); + } + //登録処理 $this->request->data['Room']['in_draft'] = true; $room = $this->Room->saveRoom($this->request->data); From 2909b70fd8a6ee13f6d711f320ab9759b8d08de5 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Fri, 24 Feb 2023 16:59:18 +0900 Subject: [PATCH 3/6] =?UTF-8?q?test:=20Github=20Action=E3=82=A8=E3=83=A9?= =?UTF-8?q?=E3=83=BC=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/tests.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9501566..7cfa881 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -44,6 +44,7 @@ jobs: MYSQL_VERSION: ${{ matrix.mysql }} MYSQL_ROOT_PASSWORD: root MYSQL_DATABASE: cakephp_test + COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v2 From 8f612cb4f41735e8269f9823a09309e379be0f1b Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Sun, 26 Feb 2023 05:19:08 +0900 Subject: [PATCH 4/6] change: Version number to 3.3.6 --- VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index fa7adc7..9c25013 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -3.3.5 +3.3.6 From d20cb13e67e415ad6870477d41b8adee96c6613a Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Thu, 5 Oct 2023 22:44:38 +0900 Subject: [PATCH 5/6] =?UTF-8?q?test:=20github=20action=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/tests.yml | 36 +++++++++++++++++++++--------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7cfa881..6da4321 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -3,22 +3,21 @@ on: branches: - main - master - - availability pull_request: branches: - main - master - - availability name: tests jobs: setup: name: setup - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - name: Slack Notification on Start uses: rtCamp/action-slack-notify@v2.2.0 + if: env.SLACK_WEBHOOK != '' env: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_TESTS }} SLACK_CHANNEL: notify-nc3-tests @@ -28,7 +27,7 @@ jobs: tests: name: tests needs: setup - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest strategy: matrix: php: [ '7.1', '7.2', '7.3', '7.4' ] @@ -92,46 +91,53 @@ jobs: docker-compose exec -T nc3app bash /opt/scripts/app-build.sh - name: phpcs (PHP CodeSniffer) + if: always() run: | cd ${NC3_DOCKER_DIR} docker-compose exec -T nc3app bash /opt/scripts/phpcs.sh - name: phpmd (PHP Mess Detector) + if: always() run: | cd ${NC3_DOCKER_DIR} docker-compose exec -T nc3app bash /opt/scripts/phpmd.sh - name: phpcpd (PHP Copy/Paste Detector) + if: always() run: | cd ${NC3_DOCKER_DIR} docker-compose exec -T nc3app bash /opt/scripts/phpcpd.sh - name: gjslint (JavaScript Style Check) + if: always() run: | cd ${NC3_DOCKER_DIR} docker-compose exec -T nc3app bash /opt/scripts/gjslint.sh - name: phpdoc (PHP Documentor) + if: always() run: | cd ${NC3_DOCKER_DIR} docker-compose exec -T nc3app bash /opt/scripts/phpdoc.sh - name: phpunit (PHP UnitTest) + if: always() run: | cd ${NC3_DOCKER_DIR} docker-compose exec -T nc3app bash /opt/scripts/phpunit.sh sudo -s chmod a+w -R ${NC3_BUILD_DIR}/build - - name: push coveralls - env: - COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} - COVERALLS_FLAG_NAME: ${{ matrix.php }} - run: | - cd ${NC3_BUILD_DIR} - ls -la ${NC3_BUILD_DIR} - vendors/bin/php-coveralls --coverage_clover=build/logs/clover.xml -v +# - name: push coveralls +# env: +# COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# COVERALLS_FLAG_NAME: ${{ matrix.php }} +# run: | +# cd ${NC3_BUILD_DIR} +# ls -la ${NC3_BUILD_DIR} +# vendors/bin/php-coveralls --coverage_clover=build/logs/clover.xml -v - name: docker-compose remove + if: always() run: | cd ${NC3_DOCKER_DIR} docker-compose rm -f @@ -139,7 +145,7 @@ jobs: # テスト失敗時はこちらのステップが実行される - name: Slack Notification on Failure uses: rtCamp/action-slack-notify@v2.2.0 - if: failure() + if: env.SLACK_WEBHOOK != '' && failure() env: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_TESTS }} SLACK_CHANNEL: notify-nc3-tests @@ -148,13 +154,13 @@ jobs: teardown: name: teardown - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest needs: tests steps: # テスト成功時はこちらのステップが実行される - name: Slack Notification on Success - if: success() uses: rtCamp/action-slack-notify@v2.2.0 + if: env.SLACK_WEBHOOK != '' && success() env: SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_TESTS }} SLACK_CHANNEL: notify-nc3-tests From b1c4948df31534719aaa30a22d94157d3d25b6e4 Mon Sep 17 00:00:00 2001 From: s-nakajima Date: Mon, 9 Oct 2023 22:36:30 +0900 Subject: [PATCH 6/6] change: Version number to 3.3.7 --- VERSION.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index 9c25013..86fb650 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -3.3.6 +3.3.7