Merge pull request #19 from s-nakajima/master

NetCommonFormHelperに統一するように修正、URLの仕様変更による修正
NetCommons3 · Oct 9, 2015 · 8f06f0a · 8f06f0a
2 parents 31bda09 + d9d68c3
commit 8f06f0a
Show file tree

Hide file tree

Showing 21 changed files with 92 additions and 78 deletions.
diff --git a/Controller/BbsArticlesController.php b/Controller/BbsArticlesController.php
@@ -227,6 +227,7 @@ public function add() {
 				$url = NetCommonsUrl::actionUrl(array(
 					'controller' => $this->params['controller'],
 					'action' => 'view',
+					'block_id' => $this->data['Block']['id'],
 					'frame_id' => $this->data['Frame']['id'],
 					'key' => $bbsArticle['BbsArticle']['key']
 				));
@@ -268,6 +269,7 @@ public function reply() {
 				$url = NetCommonsUrl::actionUrl(array(
 					'controller' => $this->params['controller'],
 					'action' => 'view',
+					'block_id' => $this->data['Block']['id'],
 					'frame_id' => $this->data['Frame']['id'],
 					'key' => $bbsArticle['BbsArticle']['key']
 				));
@@ -362,6 +364,7 @@ public function edit() {
 				$url = NetCommonsUrl::actionUrl(array(
 					'controller' => $this->params['controller'],
 					'action' => 'view',
+					'block_id' => $this->data['Block']['id'],
 					'frame_id' => $this->data['Frame']['id'],
 					'key' => $bbsArticle['BbsArticle']['key']
 				));
@@ -433,6 +436,7 @@ public function delete() {
 			$url = NetCommonsUrl::actionUrl(array(
 				'controller' => $this->params['controller'],
 				'action' => 'view',
+				'block_id' => $this->data['Block']['id'],
 				'frame_id' => $this->data['Frame']['id'],
 				'key' => $parentBbsArticle['BbsArticle']['key']
 			));
@@ -466,6 +470,7 @@ public function approve() {
 			$url = NetCommonsUrl::actionUrl(array(
 				'controller' => $this->params['controller'],
 				'action' => 'view',
+				'block_id' => $this->data['Block']['id'],
 				'frame_id' => $this->data['Frame']['id'],
 				'key' => $this->data['BbsArticle']['key']
 			));

diff --git a/Controller/BbsBlockRolePermissionsController.php b/Controller/BbsBlockRolePermissionsController.php
@@ -74,8 +74,6 @@ class BbsBlockRolePermissionsController extends BbsesAppController {
  * @return void
  */
 	public function edit() {
-		CurrentFrame::setBlock($this->request->params['pass'][1]);
-
 		if (! $bbs = $this->Bbs->getBbs()) {
 			$this->setAction('throwBadRequest');
 			return false;

diff --git a/Controller/BbsBlocksController.php b/Controller/BbsBlocksController.php
@@ -131,7 +131,6 @@ public function edit() {
 
 		} else {
 			//表示処理(初期データセット)
-			CurrentFrame::setBlock($this->request->params['pass'][1]);
 			if (! $bbs = $this->Bbs->getBbs()) {
 				$this->setAction('throwBadRequest');
 				return false;

diff --git a/Model/Bbs.php b/Model/Bbs.php
@@ -45,7 +45,7 @@ class Bbs extends BbsesAppModel {
 			'name' => 'Bbs.name',
 			'loadModels' => array(
 				'Like' => 'Likes.Like',
-				'Comment' => 'Comments.Comment',
+				'WorkflowComment' => 'Workflow.WorkflowComment',
 			)
 		),
 		'NetCommons.OriginalKey',
@@ -108,8 +108,6 @@ public function beforeValidate($options = array()) {
 				),
 			),
 
-			//status to set in PublishableBehavior.
-
 			'name' => array(
 				'notBlank' => array(
 					'rule' => array('notBlank'),

diff --git a/Model/BbsArticle.php b/Model/BbsArticle.php
@@ -52,9 +52,9 @@ class BbsArticle extends BbsesAppModel {
 	public $actsAs = array(
 		'Bbses.BbsArticle',
 		'Bbses.BbsArticlesUser',
-		'Comments.Comment',
 		'Likes.Like',
 		'NetCommons.OriginalKey',
+		'Workflow.WorkflowComment',
 		'Workflow.Workflow',
 	);
 

diff --git a/Test/Case/Controller/BbsesControllerTestBase.php b/Test/Case/Controller/BbsesControllerTestBase.php
@@ -33,7 +33,7 @@ class BbsesControllerTestBase extends YAControllerTestCase {
 		'plugin.bbses.bbs_frame_setting',
 		'plugin.bbses.bbs_articles_user',
 		'plugin.bbses.bbs_article',
-		'plugin.comments.comment',
+		'plugin.workflow.workflow_comment',
 	);
 
 /**

diff --git a/Test/Case/Model/BbsModelTestBase.php b/Test/Case/Model/BbsModelTestBase.php
@@ -33,7 +33,7 @@ class BbsModelTestBase extends YACakeTestCase {
 		'plugin.bbses.bbs_frame_setting',
 		'plugin.bbses.bbs_articles_user',
 		'plugin.bbses.bbs_article',
-		'plugin.comments.comment',
+		'plugin.workflow.workflow_comment',
 	);
 
 /**
@@ -55,7 +55,7 @@ public function tearDown() {
 		unset($this->BbsFrameSetting);
 		unset($this->BbsArticle);
 		unset($this->BbsArticlesUser);
-		unset($this->Comment);
+		unset($this->WorkflowComment);
 		parent::tearDown();
 	}
 
@@ -66,6 +66,7 @@ public function tearDown() {
  * @param mixed $value array or string, number
  * @param array $result result data
  * @return void
+ * @SuppressWarnings(PHPMD.DevelopmentCodeFragment)
  */
 	protected function _assertArray($key, $value, $result) {
 		if ($key !== null) {

diff --git a/View/BbsArticles/edit.ctp b/View/BbsArticles/edit.ctp
@@ -41,7 +41,7 @@ $bbsArticle['content'] = $this->data['BbsArticle']['content'];
 				</div>
 
 				<?php echo $this->Workflow->buttons('BbsArticle.status'); ?>
-			<?php echo $this->Form->end(); ?>
+			<?php echo $this->NetCommonsForm->end(); ?>
 
 			<?php if ($this->request->params['action'] === 'edit' && $this->Workflow->canDelete('BbsArticle', $this->data)) : ?>
 				<div class="panel-footer text-right">

diff --git a/View/BbsBlockRolePermissions/edit.ctp b/View/BbsBlockRolePermissions/edit.ctp
@@ -11,14 +11,13 @@
 ?>
 
 <div class="block-setting-body">
-	<?php echo $this->Block->mainTabs(BlockTabsComponent::MAIN_TAB_BLOCK_INDEX); ?>
+	<?php echo $this->BlockTabs->main(BlockTabsComponent::MAIN_TAB_BLOCK_INDEX); ?>
 
 	<div class="tab-content">
-		<?php echo $this->Block->blockTabs(BlockTabsComponent::BLOCK_TAB_PERMISSION); ?>
+		<?php echo $this->BlockTabs->block(BlockTabsComponent::BLOCK_TAB_PERMISSION); ?>
 
 		<?php echo $this->element('Blocks.edit_form', array(
 				'model' => 'BbsBlockRolePermission',
-				'action' => 'edit' . '/' . $this->data['Frame']['id'] . '/' . $this->data['Block']['id'],
 				'callback' => 'Bbses.BbsBlockRolePermissions/edit_form',
 				'cancelUrl' => NetCommonsUrl::backToIndexUrl('default_setting_action'),
 			)); ?>

diff --git a/View/BbsBlocks/edit.ctp b/View/BbsBlocks/edit.ctp
@@ -11,10 +11,10 @@
 ?>
 
 <article class="block-setting-body">
-	<?php echo $this->Block->mainTabs(BlockTabsComponent::MAIN_TAB_BLOCK_INDEX); ?>
+	<?php echo $this->BlockTabs->main(BlockTabsComponent::MAIN_TAB_BLOCK_INDEX); ?>
 
 	<div class="tab-content">
-		<?php echo $this->Block->blockTabs(BlockTabsComponent::BLOCK_TAB_SETTING); ?>
+		<?php echo $this->BlockTabs->block(BlockTabsComponent::BLOCK_TAB_SETTING); ?>
 
 		<?php echo $this->element('Blocks.edit_form', array(
 				'model' => 'Bbs',
@@ -25,7 +25,12 @@
 		<?php if ($this->request->params['action'] === 'edit') : ?>
 			<?php echo $this->element('Blocks.delete_form', array(
 					'model' => 'BbsBlock',
-					'action' => 'delete/' . Current::read('Frame.id') . '/' . Current::read('Block.id'),
+					'action' => NetCommonsUrl::actionUrl(array(
+						'controller' => $this->params['controller'],
+						'action' => 'delete',
+						'block_id' => Current::read('Block.id'),
+						'frame_id' => Current::read('Frame.id')
+					)),
 					'callback' => 'Bbses.BbsBlocks/delete_form'
 				)); ?>
 		<?php endif; ?>

diff --git a/View/BbsBlocks/index.ctp b/View/BbsBlocks/index.ctp
@@ -11,7 +11,7 @@
 ?>
 
 <article class="block-setting-body">
-	<?php echo $this->Block->mainTabs(BlockTabsComponent::MAIN_TAB_BLOCK_INDEX); ?>
+	<?php echo $this->BlockTabs->main(BlockTabsComponent::MAIN_TAB_BLOCK_INDEX); ?>
 
 	<div class="tab-content">
 		<div class="text-right">
@@ -22,7 +22,7 @@
 				'url' => NetCommonsUrl::actionUrl(array('plugin' => 'frames', 'controller' => 'frames', 'action' => 'edit'))
 			)); ?>
 
-			<?php echo $this->Form->hidden('Frame.id'); ?>
+			<?php echo $this->NetCommonsForm->hidden('Frame.id'); ?>
 
 			<table class="table table-hover">
 				<thead>
@@ -58,7 +58,7 @@
 					<?php endforeach; ?>
 				</tbody>
 			</table>
-		<?php echo $this->Form->end(); ?>
+		<?php echo $this->NetCommonsForm->end(); ?>
 
 		<?php echo $this->element('NetCommons.paginator'); ?>
 	</div>

diff --git a/View/BbsFrameSettings/edit.ctp b/View/BbsFrameSettings/edit.ctp
@@ -11,7 +11,7 @@
 ?>
 
 <article class="block-setting-body">
-	<?php echo $this->Block->mainTabs(BlockTabsComponent::MAIN_TAB_FRAME_SETTING); ?>
+	<?php echo $this->BlockTabs->main(BlockTabsComponent::MAIN_TAB_FRAME_SETTING); ?>
 
 	<div class="tab-content">
 		<?php echo $this->element('Blocks.edit_form', array(

diff --git a/View/Elements/BbsArticles/comment_approving_link.ctp b/View/Elements/BbsArticles/comment_approving_link.ctp
@@ -18,18 +18,18 @@
 			'url' => $this->NetCommonsHtml->url(array('action' => 'approve', 'key' => $bbsArticle['BbsArticle']['key']))
 		)); ?>
 
-		<?php echo $this->Form->hidden('Frame.id', array('value' => Current::read('Frame.id'))); ?>
-		<?php echo $this->Form->hidden('Block.id', array('value' => Current::read('Block.id'))); ?>
-		<?php echo $this->Form->hidden('Block.key', array('value' => Current::read('Block.key'))); ?>
-		<?php echo $this->Form->hidden('BbsArticle.id'); ?>
-		<?php echo $this->Form->hidden('BbsArticle.key'); ?>
-		<?php echo $this->Form->hidden('BbsArticle.language_id'); ?>
-		<?php echo $this->Form->hidden('BbsArticleTree.id'); ?>
-		<?php echo $this->Form->hidden('BbsArticleTree.root_id'); ?>
+		<?php echo $this->NetCommonsForm->hidden('Frame.id', array('value' => Current::read('Frame.id'))); ?>
+		<?php echo $this->NetCommonsForm->hidden('Block.id', array('value' => Current::read('Block.id'))); ?>
+		<?php echo $this->NetCommonsForm->hidden('Block.key', array('value' => Current::read('Block.key'))); ?>
+		<?php echo $this->NetCommonsForm->hidden('BbsArticle.id'); ?>
+		<?php echo $this->NetCommonsForm->hidden('BbsArticle.key'); ?>
+		<?php echo $this->NetCommonsForm->hidden('BbsArticle.language_id'); ?>
+		<?php echo $this->NetCommonsForm->hidden('BbsArticleTree.id'); ?>
+		<?php echo $this->NetCommonsForm->hidden('BbsArticleTree.root_id'); ?>
 
 		<?php echo $this->Workflow->publishLinkButton('', array(
 				'tooltip' => true,
 				'iconSize' => 'btn-xs'
 			)); ?>
-	<?php echo $this->Form->end(); ?>
+	<?php echo $this->NetCommonsForm->end(); ?>
 <?php endif;
diff --git a/View/Elements/BbsArticles/delete_form.ctp b/View/Elements/BbsArticles/delete_form.ctp
@@ -15,18 +15,18 @@
 		'action' => 'delete/' . Current::read('Frame.id') . '/' . h($this->data['BbsArticle']['key'])
 	)); ?>
 
-	<?php echo $this->Form->hidden('Frame.id'); ?>
-	<?php echo $this->Form->hidden('Block.id'); ?>
-	<?php echo $this->Form->hidden('Block.key'); ?>
+	<?php echo $this->NetCommonsForm->hidden('Frame.id'); ?>
+	<?php echo $this->NetCommonsForm->hidden('Block.id'); ?>
+	<?php echo $this->NetCommonsForm->hidden('Block.key'); ?>
 
-	<?php echo $this->Form->hidden('Bbs.id'); ?>
-	<?php echo $this->Form->hidden('Bbs.key'); ?>
-	<?php echo $this->Form->hidden('BbsArticle.id'); ?>
-	<?php echo $this->Form->hidden('BbsArticle.key'); ?>
-	<?php echo $this->Form->hidden('BbsArticle.language_id'); ?>
-	<?php echo $this->Form->hidden('BbsArticleTree.root_id'); ?>
+	<?php echo $this->NetCommonsForm->hidden('Bbs.id'); ?>
+	<?php echo $this->NetCommonsForm->hidden('Bbs.key'); ?>
+	<?php echo $this->NetCommonsForm->hidden('BbsArticle.id'); ?>
+	<?php echo $this->NetCommonsForm->hidden('BbsArticle.key'); ?>
+	<?php echo $this->NetCommonsForm->hidden('BbsArticle.language_id'); ?>
+	<?php echo $this->NetCommonsForm->hidden('BbsArticleTree.root_id'); ?>
 
 	<?php echo $this->Button->delete('',
 			sprintf(__d('net_commons', 'Deleting the %s. Are you sure to proceed?'), __d('bbses', 'article'))
 		); ?>
-<?php echo $this->Form->end();
+<?php echo $this->NetCommonsForm->end();
diff --git a/View/Elements/BbsArticles/edit_form.ctp b/View/Elements/BbsArticles/edit_form.ctp
@@ -10,21 +10,21 @@
  */
 ?>
 
-<?php echo $this->Form->hidden('Frame.id'); ?>
-<?php echo $this->Form->hidden('Frame.block_id'); ?>
-<?php echo $this->Form->hidden('Block.id'); ?>
-<?php echo $this->Form->hidden('Block.key'); ?>
-<?php echo $this->Form->hidden('Bbs.id'); ?>
-<?php echo $this->Form->hidden('Bbs.key'); ?>
-<?php echo $this->Form->hidden('BbsArticle.id'); ?>
-<?php echo $this->Form->hidden('BbsArticle.key'); ?>
-<?php echo $this->Form->hidden('BbsArticle.language_id'); ?>
-<?php echo $this->Form->hidden('BbsArticle.bbs_id'); ?>
-<?php echo $this->Form->hidden('BbsArticleTree.id'); ?>
-<?php echo $this->Form->hidden('BbsArticleTree.bbs_key'); ?>
-<?php echo $this->Form->hidden('BbsArticleTree.bbs_article_key'); ?>
-<?php echo $this->Form->hidden('BbsArticleTree.root_id'); ?>
-<?php echo $this->Form->hidden('BbsArticleTree.parent_id'); ?>
+<?php echo $this->NetCommonsForm->hidden('Frame.id'); ?>
+<?php echo $this->NetCommonsForm->hidden('Frame.block_id'); ?>
+<?php echo $this->NetCommonsForm->hidden('Block.id'); ?>
+<?php echo $this->NetCommonsForm->hidden('Block.key'); ?>
+<?php echo $this->NetCommonsForm->hidden('Bbs.id'); ?>
+<?php echo $this->NetCommonsForm->hidden('Bbs.key'); ?>
+<?php echo $this->NetCommonsForm->hidden('BbsArticle.id'); ?>
+<?php echo $this->NetCommonsForm->hidden('BbsArticle.key'); ?>
+<?php echo $this->NetCommonsForm->hidden('BbsArticle.language_id'); ?>
+<?php echo $this->NetCommonsForm->hidden('BbsArticle.bbs_id'); ?>
+<?php echo $this->NetCommonsForm->hidden('BbsArticleTree.id'); ?>
+<?php echo $this->NetCommonsForm->hidden('BbsArticleTree.bbs_key'); ?>
+<?php echo $this->NetCommonsForm->hidden('BbsArticleTree.bbs_article_key'); ?>
+<?php echo $this->NetCommonsForm->hidden('BbsArticleTree.root_id'); ?>
+<?php echo $this->NetCommonsForm->hidden('BbsArticleTree.parent_id'); ?>
 
 <?php echo $this->NetCommonsForm->input('BbsArticle.title', array(
 		'type' => 'text',

diff --git a/View/Elements/BbsArticles/reply_link.ctp b/View/Elements/BbsArticles/reply_link.ctp
@@ -29,10 +29,15 @@
 				'label' => __d('bbses', 'Quote this posts')
 			)); ?>
 
-		<?php echo $this->Form->button('<span class="glyphicon glyphicon-comment"></span>', array(
+		<?php echo $this->NetCommonsForm->button('<span class="glyphicon glyphicon-comment"></span>', array(
 				'class' => 'btn btn-success btn-xs bbs-write-comment-link',
 				'tooltip' => __d('bbses', 'Write comment')
 			)); ?>
 
-	<?php echo $this->Form->end(); ?>
+
+		<?php echo $this->NetCommonsForm->hidden('frame_id', array(
+			'value' => Current::read('Frame.id')
+		)); ?>
+
+	<?php echo $this->NetCommonsForm->end(); ?>
 <?php endif;
diff --git a/View/Elements/BbsArticles/select_sort.ctp b/View/Elements/BbsArticles/select_sort.ctp
@@ -9,10 +9,14 @@
  * @copyright Copyright 2014, NetCommons Project
  */
 
-$url = Hash::merge(
-	array('controller' => 'bbs_articles', 'action' => 'index', Current::read('Frame.id')),
-	$this->Paginator->params['named']
-);
+
+$url = NetCommonsUrl::actionUrlAsArray(Hash::merge(array(
+	'plugin' => 'bbses',
+	'controller' => 'bbs_articles',
+	'action' => 'index',
+	'block_id' => Current::read('Block.id'),
+	'frame_id' => Current::read('Frame.id'),
+), $this->Paginator->params['named']));
 
 $curretSort = isset($this->Paginator->params['named']['sort']) ? $this->Paginator->params['named']['sort'] : 'BbsArticle.created';
 $curretDirection = isset($this->Paginator->params['named']['direction']) ? $this->Paginator->params['named']['direction'] : 'desc';

diff --git a/View/Elements/BbsBlockRolePermissions/edit_form.ctp b/View/Elements/BbsBlockRolePermissions/edit_form.ctp
@@ -10,10 +10,10 @@
  */
 ?>
 
-<?php echo $this->Form->hidden('Block.id'); ?>
-<?php echo $this->Form->hidden('Block.key'); ?>
-<?php echo $this->Form->hidden('BbsSetting.bbs_key'); ?>
-<?php echo $this->Form->hidden('BbsSetting.id'); ?>
+<?php echo $this->NetCommonsForm->hidden('Block.id'); ?>
+<?php echo $this->NetCommonsForm->hidden('Block.key'); ?>
+<?php echo $this->NetCommonsForm->hidden('BbsSetting.bbs_key'); ?>
+<?php echo $this->NetCommonsForm->hidden('BbsSetting.id'); ?>
 
 <?php echo $this->element('Blocks.block_creatable_setting', array(
 		'settingPermissions' => array(

diff --git a/View/Elements/BbsBlocks/delete_form.ctp b/View/Elements/BbsBlocks/delete_form.ctp
@@ -13,9 +13,9 @@
 <div class="pull-left">
 	<?php echo sprintf(__d('net_commons', 'Delete all data associated with the %s.'), __d('bbses', 'BBS')); ?>
 </div>
-<?php echo $this->Form->hidden('Block.id'); ?>
-<?php echo $this->Form->hidden('Block.key'); ?>
-<?php echo $this->Form->hidden('Bbs.key'); ?>
+<?php echo $this->NetCommonsForm->hidden('Block.id'); ?>
+<?php echo $this->NetCommonsForm->hidden('Block.key'); ?>
+<?php echo $this->NetCommonsForm->hidden('Bbs.key'); ?>
 
 <?php echo $this->Button->delete(
 		__d('net_commons', 'Delete'),

diff --git a/View/Elements/BbsBlocks/edit_form.ctp b/View/Elements/BbsBlocks/edit_form.ctp
@@ -12,13 +12,13 @@
 
 <?php echo $this->element('Blocks.form_hidden'); ?>
 
-<?php echo $this->Form->hidden('Bbs.id'); ?>
-<?php echo $this->Form->hidden('Bbs.key'); ?>
-<?php echo $this->Form->hidden('BbsSetting.id'); ?>
-<?php echo $this->Form->hidden('BbsFrameSetting.id'); ?>
-<?php echo $this->Form->hidden('BbsFrameSetting.frame_key'); ?>
-<?php echo $this->Form->hidden('BbsFrameSetting.articles_per_page'); ?>
-<?php echo $this->Form->hidden('BbsFrameSetting.comments_per_page'); ?>
+<?php echo $this->NetCommonsForm->hidden('Bbs.id'); ?>
+<?php echo $this->NetCommonsForm->hidden('Bbs.key'); ?>
+<?php echo $this->NetCommonsForm->hidden('BbsSetting.id'); ?>
+<?php echo $this->NetCommonsForm->hidden('BbsFrameSetting.id'); ?>
+<?php echo $this->NetCommonsForm->hidden('BbsFrameSetting.frame_key'); ?>
+<?php echo $this->NetCommonsForm->hidden('BbsFrameSetting.articles_per_page'); ?>
+<?php echo $this->NetCommonsForm->hidden('BbsFrameSetting.comments_per_page'); ?>
 
 <?php echo $this->NetCommonsForm->input('Bbs.name', array(
 		'type' => 'text',