Allowing empty id on create.

cakephp · Apr 5, 2014 · fadbc20 · fadbc20
1 parent a17c310
commit fadbc20
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/Console/Command/Task/ModelTask.php b/src/Console/Command/Task/ModelTask.php
@@ -448,7 +448,9 @@ public function fieldValidation($fieldName, $metaData, $primaryKey) {
 		}
 
 		$allowEmpty = false;
-		if ($metaData['null'] === true) {
+		if (in_array($fieldName, $primaryKey)) {
+			$allowEmpty = 'create';
+		} elseif ($metaData['null'] === true) {
 			$allowEmpty = true;
 		}
 

diff --git a/src/Console/Templates/default/classes/table.ctp b/src/Console/Templates/default/classes/table.ctp
@@ -75,7 +75,9 @@ $key = array_map(function($el) { return "'$el'"; }, (array)$primaryKey);
 <?php if ($rule['rule']): ?>
 			->add('<?= $field ?>', 'valid', ['rule' => '<?= $rule['rule'] ?>'])
 <?php endif; ?>
-<?php if ($rule['allowEmpty']): ?>
+<?php if (is_string($rule['allowEmpty'])): ?>
+			->allowEmpty('<?= $field ?>', '<?= $rule['allowEmpty'] ?>')
+<?php elseif ($rule['allowEmpty']): ?>
 			->allowEmpty('<?= $field ?>')
 <?php else: ?>
 			->validatePresence('<?= $field ?>', 'create')

diff --git a/tests/TestCase/Console/Command/Task/ModelTaskTest.php b/tests/TestCase/Console/Command/Task/ModelTaskTest.php
@@ -425,7 +425,7 @@ public function testGetValidation() {
 		$model = TableRegistry::get('BakeArticles');
 		$result = $this->Task->getValidation($model);
 		$expected = [
-			'id' => ['rule' => 'numeric', 'allowEmpty' => false],
+			'id' => ['rule' => 'numeric', 'allowEmpty' => 'create'],
 			'bake_user_id' => ['rule' => 'numeric', 'allowEmpty' => false],
 			'title' => ['rule' => false, 'allowEmpty' => false],
 			'body' => ['rule' => false, 'allowEmpty' => true],