From ccbc04716eb4ca47b27c5ffcbf1b6188aa30111f Mon Sep 17 00:00:00 2001
From: Ryuji AMANO <ryuji@ryus.co.jp>
Date: Sun, 27 Nov 2022 14:52:58 +0900
Subject: [PATCH 1/2] fix: edit problem

---
 View/Elements/index.ctp     | 1 +
 View/Elements/indexOnce.ctp | 1 +
 2 files changed, 2 insertions(+)

diff --git a/View/Elements/index.ctp b/View/Elements/index.ctp
index 8c44a77..293df51 100644
--- a/View/Elements/index.ctp
+++ b/View/Elements/index.ctp
@@ -82,6 +82,7 @@ $pluginKey = $this->request->params['plugin'];
 
 					<?php /* 編集許可あり or (自分で投稿したコメント & ログイン済みなら、編集・削除可能) */ ?>
 					<?php if (Current::permission('content_comment_editable') || (
+							Current::permission('content_comment_creatable') &&
 							$contentComment['ContentComment']['created_user'] == (int)Current::read('User.id') &&
 							Current::read('User'))): ?>
 
diff --git a/View/Elements/indexOnce.ctp b/View/Elements/indexOnce.ctp
index 9326cbc..7578f75 100644
--- a/View/Elements/indexOnce.ctp
+++ b/View/Elements/indexOnce.ctp
@@ -47,6 +47,7 @@ $this->NetCommonsHtml->css(array('/content_comments/css/style.css'));
 
 <?php /* 編集許可あり or (自分で投稿したコメント & ログイン済みなら、編集可能) */ ?>
 <?php if (Current::permission('content_comment_editable') || (
+		Current::permission('content_comment_creatable') &&
 		$contentComment['ContentComment']['created_user'] == (int)Current::read('User.id') &&
 		Current::read('User'))): ?>
 	<?php /* 編集 */ ?>

From d4caab1cf8edc81b1d5baf7d701efb3a138ca135 Mon Sep 17 00:00:00 2001
From: Ryuji AMANO <ryuji@ryus.co.jp>
Date: Sun, 27 Nov 2022 15:16:54 +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