Skip to content

Fix/edit problem #115

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 #115

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
f41a29d
fix: edit problem
RyujiAMANO Nov 27, 2022
798903f
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
3 changes: 3 additions & 0 deletions Controller/FaqQuestionsController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,9 @@ public function edit() {
$this->FaqQuestion->alias . '.key' => $faqQuestionKey
)
));
if (empty($faqQuestion)) {
return $this->throwBadRequest();
}

//編集権限チェック
if (! $this->FaqQuestion->canEditWorkflowContent($faqQuestion)) {
Expand Down