From db21ac45f86d3b4244268d514471fb908a184e88 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 --- Model/Behavior/WorkflowBehavior.php | 12 +++++++++++- .../WorkflowBehavior/CanEditWorkflowContentTest.php | 1 + 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Model/Behavior/WorkflowBehavior.php b/Model/Behavior/WorkflowBehavior.php index 4fb2ffc..94d1640 100644 --- a/Model/Behavior/WorkflowBehavior.php +++ b/Model/Behavior/WorkflowBehavior.php @@ -292,7 +292,16 @@ public function getWorkflowConditions(Model $model, $conditions = array()) { $langConditions = array(); } + $currentBlockId = Current::read('Block.id'); + $blockConditions = []; + if ($currentBlockId && $model->hasField('block_id')) { + $blockConditions = [ + $model->alias . '.block_id' => $currentBlockId, + ]; + } + $conditions = Hash::merge( + $blockConditions, array( $langConditions, array('OR' => array($activeConditions, $latestConditons)) @@ -361,7 +370,8 @@ public function canEditWorkflowContent(Model $model, $data) { if (! isset($data[$model->alias]['created_user'])) { return false; } - return ((int)$data[$model->alias]['created_user'] === (int)Current::read('User.id')); + return (Current::permission('content_creatable') && + ((int)$data[$model->alias]['created_user'] === (int)Current::read('User.id'))); } /** diff --git a/Test/Case/Model/Behavior/WorkflowBehavior/CanEditWorkflowContentTest.php b/Test/Case/Model/Behavior/WorkflowBehavior/CanEditWorkflowContentTest.php index 710cbb7..9c11277 100644 --- a/Test/Case/Model/Behavior/WorkflowBehavior/CanEditWorkflowContentTest.php +++ b/Test/Case/Model/Behavior/WorkflowBehavior/CanEditWorkflowContentTest.php @@ -92,6 +92,7 @@ public function testCanEditWorkflowContent($permission, $assert, $userId, $data) Current::$current['User']['id'] = $userId; Current::write('Room.id', '2'); Current::writePermission('2', 'content_editable', $permission); + Current::writePermission('2', 'content_creatable', true); $result = $this->TestModel->canEditWorkflowContent($data); //チェック From 04dca22e3394acd8358cc134b78fe83deff5b379 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