Merge pull request #38 from s-nakajima/master

インストール時、単言語で登録するように修正
NetCommons3 · Dec 27, 2016 · 9c56876 · 9c56876
2 parents b169445 + b101581
commit 9c56876
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/Config/Migration/1472409223_records.php b/Config/Migration/1472409223_records.php
@@ -46,7 +46,7 @@ class Records extends NetCommonsMigration {
 				'id' => '1',
 				'code' => 'en',
 				'weight' => '2',
-				'is_active' => true,
+				'is_active' => false,
 			),
 			array(
 				'id' => '2',

diff --git a/Model/Language.php b/Model/Language.php
@@ -44,24 +44,24 @@ class Language extends M17nAppModel {
  */
 	public function beforeValidate($options = array()) {
 		$this->validate = Hash::merge($this->validate, array(
-		'code' => array(
-			'notBlank' => array(
-				'rule' => array('notBlank'),
-				'message' => __d('net_commons', 'Invalid request.'),
+			'code' => array(
+				'notBlank' => array(
+					'rule' => array('notBlank'),
+					'message' => __d('net_commons', 'Invalid request.'),
+				),
 			),
-		),
-		'weight' => array(
-			'numeric' => array(
-				'rule' => array('numeric'),
-				'message' => __d('net_commons', 'Invalid request.'),
+			'weight' => array(
+				'numeric' => array(
+					'rule' => array('numeric'),
+					'message' => __d('net_commons', 'Invalid request.'),
+				),
 			),
-		),
-		'is_active' => array(
-			'boolean' => array(
-				'rule' => array('boolean'),
-				'message' => __d('net_commons', 'Invalid request.'),
+			'is_active' => array(
+				'boolean' => array(
+					'rule' => array('boolean'),
+					'message' => __d('net_commons', 'Invalid request.'),
+				),
 			),
-		),
 		));
 
 		return parent::beforeValidate($options);