Skip to content

fix: edit problem #152

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

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
8d4c60d
fix: edit problem
RyujiAMANO Nov 27, 2022
eb801d1
comment: phpmd抑止
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
7 changes: 7 additions & 0 deletions Controller/CircularNoticesController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,7 @@ public function add() {
* edit action
*
* @return void
* @SuppressWarnings(PHPMD.CyclomaticComplexity)
*/
public function edit() {
$userId = Current::read('User.id');
Expand All @@ -359,6 +360,12 @@ public function edit() {
return $this->throwBadRequest();
}

// フレームから取得したCircularNoticeSetting.keyとコンテンツのcircular_notice_setting_keyが一致しない場合はBadRequest
$settingKey = $this->viewVars['circularNoticeSetting']['CircularNoticeSetting']['key'] ?? null;
if ($content['CircularNoticeContent']['circular_notice_setting_key'] !== $settingKey) {
return $this->throwBadRequest();
}

if ($this->CircularNoticeContent->canEditWorkflowContent($content) === false) {
return $this->throwBadRequest();
}
Expand Down
4 changes: 3 additions & 1 deletion Test/Case/Controller/CircularNoticesController/EditTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ public function dataProviderEdit() {
$results[0] = array(
'urlOptions' => Hash::insert($data, 'frame_id', ''),
'assert' => null,
'exception' => 'BadRequestException'
);
$results[1] = array(
'urlOptions' => Hash::insert($data, 'key', 'A'),
Expand All @@ -105,7 +106,8 @@ public function dataProviderEdit() {
);
$results[3] = array(
'urlOptions' => Hash::insert($data, 'key', 'circular_notice_content_4'),
'assert' => array('method' => 'assertNotEmpty'),
'assert' => null,
'exception' => 'BadRequestException'
);

return $results;
Expand Down