Skip to content
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

add Admin_EditorTemplatesController_add #3338

Merged
merged 11 commits into from
May 24, 2024
Merged

add Admin_EditorTemplatesController_add #3338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8215f64
unitTest_Admin_EditorTemplatesController_add
Apr 11, 2024
e9af398
Merge branch 'dev-5' into unitTest_Admin_EditorTemplatesController_add
Apr 12, 2024
fead4ca
modified
Apr 12, 2024
2d8eb2f
Merge branch 'dev-5.1' into unitTest_Admin_EditorTemplatesController_add
Apr 12, 2024
9b0578a
Merge branch 'dev-5.1' into unitTest_Admin_EditorTemplatesController_add
Apr 15, 2024
fed1481
modified
Apr 15, 2024
974aa12
Merge branch 'dev-5.1' into unitTest_Admin_EditorTemplatesController_add
May 8, 2024
8cb9a97
modified
May 8, 2024
ae62564
Merge branch 'dev-5.1' into unitTest_Admin_EditorTemplatesController_add
May 9, 2024
11629d2
Merge branch 'dev-5.1' into unitTest_Admin_EditorTemplatesController_add
May 20, 2024
c648a20
modified
May 20, 2024
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: 3 additions & 4 deletions plugins/bc-editor-template/src/Controller/Admin/EditorTemplatesController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ public function index(EditorTemplatesServiceInterface $service)
* @param EditorTemplatesService $service
* @checked
* @noTodo
* @UnitTest
*/
public function add(EditorTemplatesServiceInterface $service)
{
Expand All @@ -73,7 +74,7 @@ public function add(EditorTemplatesServiceInterface $service)
]);

$this->BcMessage->setSuccess(__d('baser_core', 'テンプレート「{0}」を追加しました', $entity->name));
$this->redirect(['action' => 'index']);
return $this->redirect(['action' => 'index']);
} catch (PersistenceFailedException $e) {
$entity = $e->getEntity();
$this->BcMessage->setError(__d('baser_core', '入力エラーです。内容を修正してください。'));
Expand All @@ -84,7 +85,6 @@ public function add(EditorTemplatesServiceInterface $service)
$this->set([
'editorTemplate' => $entity?? $service->getNew()
]);
$this->viewBuilder()->addHelper(BcSiteConfig::get('editor'));
}

/**
Expand Down Expand Up @@ -117,7 +117,7 @@ public function edit(EditorTemplatesServiceInterface $service, int $id)
]);

$this->BcMessage->setSuccess(__d('baser_core', 'テンプレート「{0}」を更新しました', $entity->name));
$this->redirect(['action' => 'index']);
return $this->redirect(['action' => 'index']);
} catch (PersistenceFailedException $e) {
$entity = $e->getEntity();
$this->BcMessage->setError(__d('baser_core', '入力エラーです。内容を修正してください。'));
Expand All @@ -128,7 +128,6 @@ public function edit(EditorTemplatesServiceInterface $service, int $id)
$this->set([
'editorTemplate' => $entity
]);
$this->viewBuilder()->addHelper(BcSiteConfig::get('editor'));
}

/**
Expand Down
21 changes: 21 additions & 0 deletions plugins/bc-editor-template/tests/TestCase/Controller/Admin/EditorTemplatesControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,27 @@ public function testAfterAddEvent()
$this->assertEquals(1, $query->count());
}

/**
* Test add
*/
public function testAdmin_add()
{
$this->enableSecurityToken();
$this->enableCsrfToken();

//正常系実行
$this->post('/baser/admin/bc-editor-template/editor_templates/add', ['name' => 'test', 'description' => 'test description']);
$this->assertResponseCode(302);
$this->assertFlashMessage('テンプレート「test」を追加しました');
$this->assertRedirect(['action' => 'index']);

//異常系実行
$this->post('/baser/admin/bc-editor-template/editor_templates/add', ['name' => '']);
$this->assertResponseCode(200);
$vars = $this->_controller->viewBuilder()->getVars();
$this->assertEquals(['name' => ['_empty' => "テンプレート名を入力してください。"]], $vars['editorTemplate']->getErrors());
}

/**
* Test beforeAddEvent
*/
Expand Down
Loading