From e7b24ade18dc0241021f0cafb94468458679dff1 Mon Sep 17 00:00:00 2001 From: Ryuji AMANO Date: Sun, 27 Nov 2022 14:52:59 +0900 Subject: [PATCH 1/2] fix: edit problem --- Controller/LinksController.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Controller/LinksController.php b/Controller/LinksController.php index e1c8e8c..72aa6e1 100644 --- a/Controller/LinksController.php +++ b/Controller/LinksController.php @@ -292,6 +292,9 @@ public function edit() { $this->Link->alias . '.key' => $linkKey ) )); + if (empty($link)) { + return $this->throwBadRequest(); + } //編集権限チェック if (! $this->Link->canEditWorkflowContent($link)) { From e1ff012b6c7af73f19af85540213fff62a38cf6d Mon Sep 17 00:00:00 2001 From: Ryuji AMANO Date: Sun, 27 Nov 2022 15:16:55 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20test:=20github=20actions=E3=81=AE?= =?UTF-8?q?=E3=82=A8=E3=83=A9=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 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1477ea2..9501566 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -48,6 +48,9 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Fix up git URLs + run: echo -e '[url "https://github.com/"]\n insteadOf = "git://github.com/"' >> ~/.gitconfig + - name: environment run: | echo "GITHUB_WORKSPACE=${GITHUB_WORKSPACE}" @@ -58,7 +61,7 @@ jobs: - name: docker-compose install run: | - curl -L https://github.com/docker/compose/releases/download/1.11.2/docker-compose-`uname -s`-`uname -m` > ~/docker-compose + curl -L https://github.com/docker/compose/releases/download/1.29.2/docker-compose-`uname -s`-`uname -m` > ~/docker-compose chmod +x ~/docker-compose sudo mv ~/docker-compose /usr/local/bin/docker-compose docker-compose --version