Merge pull request #65 from s-nakajima/master

UIガイドによる改修等
NetCommons3 · May 22, 2016 · 8de200a · 8de200a
2 parents 8e3dee6 + 129b655
commit 8de200a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/Controller/BbsFrameSettingsController.php b/Controller/BbsFrameSettingsController.php
@@ -77,7 +77,7 @@ class BbsFrameSettingsController extends BbsesAppController {
 	public function edit() {
 		if ($this->request->is('put') || $this->request->is('post')) {
 			if ($this->BbsFrameSetting->saveBbsFrameSetting($this->data)) {
-				$this->redirect(NetCommonsUrl::backToPageUrl());
+				$this->redirect(NetCommonsUrl::backToPageUrl(true));
 				return;
 			}
 			$this->NetCommons->handleValidationError($this->BbsFrameSetting->validationErrors);

diff --git a/Model/BbsArticle.php b/Model/BbsArticle.php
@@ -60,6 +60,7 @@ class BbsArticle extends BbsesAppModel {
 				'X-SUBJECT' => 'BbsArticle.title',
 				'X-BODY' => 'BbsArticle.content',
 				'X-BBS_NAME' => 'Bbs.name',
+				'X-URL' => array('controller' => 'bbs_articles'),
 			),
 		),
 		'Topics.Topics' => array(

diff --git a/View/BbsFrameSettings/edit.ctp b/View/BbsFrameSettings/edit.ctp
@@ -17,7 +17,7 @@
 		<?php echo $this->BlockForm->displayEditForm(array(
 				'model' => 'BbsFrameSetting',
 				'callback' => 'Bbses.BbsFrameSettings/edit_form',
-				'cancelUrl' => NetCommonsUrl::backToPageUrl(),
+				'cancelUrl' => NetCommonsUrl::backToPageUrl(true),
 			)); ?>
 	</div>
 </article>