多言語化対応（is_original_copyフィールド追加）

NetCommons3/NetCommons3#770
NetCommons3 · Jan 17, 2017 · 0145112 · 0145112
1 parent bca12ac
commit 0145112
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Model/Block.php b/Model/Block.php
@@ -177,7 +177,9 @@ public function bindModelBlockLang($joinKey = 'Block.id') {
 							'BlocksLanguage.language_id' => Current::read('Language.id', '0'),
 						),
 					),
-					'fields' => array('language_id', 'block_id', 'name', 'is_origin', 'is_translation'),
+					'fields' => array(
+						'language_id', 'block_id', 'name', 'is_origin', 'is_translation', 'is_original_copy'
+					),
 					'order' => ''
 				),
 			)

diff --git a/Test/Case/Model/Behavior/BlockBehavior/GetBlockConditionsTest.php b/Test/Case/Model/Behavior/BlockBehavior/GetBlockConditionsTest.php
@@ -147,6 +147,7 @@ public function testGetBlockConditions($conditions, $model) {
 					'name' => 'Block name 1',
 					'is_origin' => true,
 					'is_translation' => false,
+					'is_original_copy' => false,
 				),
 			),
 			1 => array(
@@ -185,6 +186,7 @@ public function testGetBlockConditions($conditions, $model) {
 					'name' => 'Block name 1',
 					'is_origin' => true,
 					'is_translation' => false,
+					'is_original_copy' => false,
 				),
 			),
 		);