REfactoring model introspection to gather info form multiple models

This commit is contained in:
José Lorenzo Rodríguez 2009-10-20 01:02:24 -04:30 committed by mark_story
parent 1454ea54a2
commit 31f0cdc214

View file

@ -44,7 +44,7 @@ class FormHelper extends AppHelper {
* *
* @access public * @access public
*/ */
var $fieldset = array('fields' => array(), 'key' => 'id', 'validates' => array()); var $fieldset = array();
/** /**
* Options used by DateTime fields * Options used by DateTime fields
@ -72,6 +72,56 @@ class FormHelper extends AppHelper {
*/ */
var $requestType = null; var $requestType = null;
var $defaultModel = null;
function &_introspectModel($model) {
$object = null;
if (is_string($model) && strpos($model, '.') !== false) {
$path = explode('.', $model);
$model = end($path);
}
if (ClassRegistry::isKeySet($model)) {
$object =& ClassRegistry::getObject($model);
}
if (!empty($object)) {
$fields = $object->schema();
foreach ($fields as $key => $value) {
unset($fields[$key]);
$fields[$key] = $value;
}
if (!empty($object->hasAndBelongsToMany)) {
foreach ($object->hasAndBelongsToMany as $alias => $assocData) {
$fields[$alias] = array('type' => 'multiple');
}
}
$validates = array();
if (!empty($object->validate)) {
foreach ($object->validate as $validateField => $validateProperties) {
if (is_array($validateProperties)) {
$dims = Set::countDim($validateProperties);
if (($dims == 1 && !isset($validateProperties['required']) || (array_key_exists('required', $validateProperties) && $validateProperties['required'] !== false))) {
$validates[] = $validateField;
} elseif ($dims > 1) {
foreach ($validateProperties as $rule => $validateProp) {
if (is_array($validateProp) && (array_key_exists('required', $validateProp) && $validateProp['required'] !== false)) {
$validates[] = $validateField;
}
}
}
}
}
}
$defaults = array('fields' => array(), 'key' => 'id', 'validates' => array());
$key = $object->primaryKey;
$this->fieldset[$object->name] = array_merge($defaults,compact('fields', 'key', 'validates'));
}
return $object;
}
/** /**
* Persistent default options used by input(). Set by FormHelper::create(). * Persistent default options used by input(). Set by FormHelper::create().
* *
@ -100,26 +150,18 @@ class FormHelper extends AppHelper {
* @return string An formatted opening FORM tag. * @return string An formatted opening FORM tag.
*/ */
function create($model = null, $options = array()) { function create($model = null, $options = array()) {
$defaultModel = null; $created = $id = false;
$append = '';
$view =& ClassRegistry::getObject('view'); $view =& ClassRegistry::getObject('view');
if (is_array($model) && empty($options)) { if (is_array($model) && empty($options)) {
$options = $model; $options = $model;
$model = null; $model = null;
} } elseif (empty($model) && $model !== false && !empty($this->params['models'])) {
if (empty($model) && $model !== false && !empty($this->params['models'])) {
$model = $this->params['models'][0]; $model = $this->params['models'][0];
$defaultModel = $this->params['models'][0]; $this->defaultModel = $this->params['models'][0];
} elseif (empty($model) && empty($this->params['models'])) { } elseif (empty($model) && empty($this->params['models'])) {
$model = false; $model = false;
} elseif (is_string($model) && strpos($model, '.') !== false) {
$path = explode('.', $model);
$model = $path[count($path) - 1];
}
if (ClassRegistry::isKeySet($model)) {
$object =& ClassRegistry::getObject($model);
} }
$models = ClassRegistry::keys(); $models = ClassRegistry::keys();
@ -132,44 +174,11 @@ class FormHelper extends AppHelper {
} }
} }
$object =& $this->_introspectModel($model);
$this->setEntity($model . '.', true); $this->setEntity($model . '.', true);
$append = '';
$created = $id = false;
if (isset($object)) { if (isset($this->fieldset[$this->model()]['key'])) {
$fields = $object->schema(); $data = $this->fieldset[$this->model()];
foreach ($fields as $key => $value) {
unset($fields[$key]);
$fields[$model . '.' . $key] = $value;
}
if (!empty($object->hasAndBelongsToMany)) {
foreach ($object->hasAndBelongsToMany as $alias => $assocData) {
$fields[$alias] = array('type' => 'multiple');
}
}
$validates = array();
if (!empty($object->validate)) {
foreach ($object->validate as $validateField => $validateProperties) {
if (is_array($validateProperties)) {
$dims = Set::countDim($validateProperties);
if (($dims == 1 && !isset($validateProperties['required']) || (array_key_exists('required', $validateProperties) && $validateProperties['required'] !== false))) {
$validates[] = $validateField;
} elseif ($dims > 1) {
foreach ($validateProperties as $rule => $validateProp) {
if (is_array($validateProp) && (array_key_exists('required', $validateProp) && $validateProp['required'] !== false)) {
$validates[] = $validateField;
}
}
}
}
}
}
$key = $object->primaryKey;
$this->fieldset = compact('fields', 'key', 'validates');
}
$data = $this->fieldset;
$recordExists = ( $recordExists = (
isset($this->data[$model]) && isset($this->data[$model]) &&
isset($this->data[$model][$data['key']]) && isset($this->data[$model][$data['key']]) &&
@ -180,6 +189,7 @@ class FormHelper extends AppHelper {
$created = true; $created = true;
$id = $this->data[$model][$data['key']]; $id = $this->data[$model][$data['key']];
} }
}
$options = array_merge(array( $options = array_merge(array(
'type' => ($created && empty($options['action'])) ? 'put' : 'post', 'type' => ($created && empty($options['action'])) ? 'put' : 'post',
'action' => null, 'action' => null,
@ -192,7 +202,7 @@ class FormHelper extends AppHelper {
if (empty($options['url']) || is_array($options['url'])) { if (empty($options['url']) || is_array($options['url'])) {
if (empty($options['url']['controller'])) { if (empty($options['url']['controller'])) {
if (!empty($model) && $model != $defaultModel) { if (!empty($model) && $model != $this->defaultModel) {
$options['url']['controller'] = Inflector::underscore(Inflector::pluralize($model)); $options['url']['controller'] = Inflector::underscore(Inflector::pluralize($model));
} elseif (!empty($this->params['controller'])) { } elseif (!empty($this->params['controller'])) {
$options['url']['controller'] = Inflector::underscore($this->params['controller']); $options['url']['controller'] = Inflector::underscore($this->params['controller']);
@ -544,7 +554,7 @@ class FormHelper extends AppHelper {
} }
if (empty($fields)) { if (empty($fields)) {
$fields = array_keys($this->fieldset['fields']); $fields = array_keys($this->fieldset[$this->model()]['fields']);
} }
if ($legend === true) { if ($legend === true) {
@ -616,36 +626,31 @@ class FormHelper extends AppHelper {
function input($fieldName, $options = array()) { function input($fieldName, $options = array()) {
$view =& ClassRegistry::getObject('view'); $view =& ClassRegistry::getObject('view');
$this->setEntity($fieldName); $this->setEntity($fieldName);
$entity = join('.', $view->entity());
$options = array_merge( $options = array_merge(
array('before' => null, 'between' => null, 'after' => null), array('before' => null, 'between' => null, 'after' => null),
$this->_inputDefaults, $this->_inputDefaults,
$options $options
); );
$defaults = array('before' => null, 'between' => null, 'after' => null);
$options = array_merge($defaults, $options);
if (!isset($this->fieldset[$this->model()])) {
//Try to load fieldset for this model
$this->_introspectModel($this->model());
}
if (!isset($options['type'])) { if (!isset($options['type'])) {
$options['type'] = 'text'; $options['type'] = 'text';
$fieldDef = array();
if (isset($options['options'])) { if (isset($options['options'])) {
$options['type'] = 'select'; $options['type'] = 'select';
} elseif (in_array($this->field(), array('psword', 'passwd', 'password'))) { } elseif (in_array($this->field(), array('psword', 'passwd', 'password'))) {
$options['type'] = 'password'; $options['type'] = 'password';
} elseif (isset($this->fieldset['fields'][$entity])) { } elseif (isset($this->fieldset[$this->model()]['fields'][$this->field()])) {
$fieldDef = $this->fieldset['fields'][$entity]; $fieldDef = $this->fieldset[$this->model()]['fields'][$this->field()];
$type = $fieldDef['type']; $type = $fieldDef['type'];
$primaryKey = $this->fieldset['key']; $primaryKey = $this->fieldset[$this->model()]['key'];
} elseif (ClassRegistry::isKeySet($this->model())) {
$model =& ClassRegistry::getObject($this->model());
$type = $model->getColumnType($this->field());
$fieldDef = $model->schema();
if (isset($fieldDef[$this->field()])) {
$fieldDef = $fieldDef[$this->field()];
} else {
$fieldDef = array();
}
$primaryKey = $model->primaryKey;
} }
if (isset($type)) { if (isset($type)) {
@ -714,7 +719,11 @@ class FormHelper extends AppHelper {
} elseif (is_array($div)) { } elseif (is_array($div)) {
$divOptions = array_merge($divOptions, $div); $divOptions = array_merge($divOptions, $div);
} }
if (in_array($this->field(), $this->fieldset['validates'])) { /* FIX: To have a validation rule does not mean that it is required */
if (
isset($this->fieldset[$this->model()]) &&
in_array($this->field(), $this->fieldset[$this->model()]['validates'])
) {
$divOptions = $this->addClass($divOptions, 'required'); $divOptions = $this->addClass($divOptions, 'required');
} }
if (!isset($divOptions['tag'])) { if (!isset($divOptions['tag'])) {