Skip to content

Fix/edit problem #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RyujiAMANO merged 2 commits into from
Nov 29, 2022
Merged

Fix/edit problem #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccbc047
fix: edit problem
RyujiAMANO Nov 27, 2022
d4caab1
fix: test: github actionsのエラー修正
RyujiAMANO Nov 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions View/Elements/index.ctp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'))): ?>

Expand Down
1 change: 1 addition & 0 deletions View/Elements/indexOnce.ctp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 /* 編集 */ ?>
Expand Down