OpenEcoLab-LasAlpujarras
/
farmOS
mirror of https://github.com/farmOS/farmOS.git
3
0
Fork 0
Code Wiki

Allow child name to be left blank if tag ID is set.

This commit is contained in:
Michael Stenta 2018-04-23 09:19:08 -04:00
parent 82855a881e
commit a85ea349de
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
modules/farm/farm_livestock/farm_livestock.farm_quick.inc
View File

@ -103,7 +103,7 @@ function farm_livestock_birth_form($form, &$form_state) {
$form['birth']['child'][$i]['name'] = array(
'#type' => 'textfield',
'#title' => t('Name'),
'#required' => TRUE,
'#description' => t('Give the animal a name (and/or tag ID below). If the name is left blank, then it will be copied from the tag ID.'),
);
// Tag ID.
@ -223,6 +223,15 @@ function farm_livestock_birth_form_validate($form, &$form_state) {
form_set_error('birth][father', t('The mother and father cannot be the same animal.'));
}
}
// Iterate through the children.
foreach ($form_state['values']['birth']['child'] as $i => $child) {
// Make sure that either the name or tag ID is filled in.
if (empty($child['name']) && empty($child['tag_id'])) {
form_set_error('birth][child][' . $i . '][name', t('The child must have a name or tag ID.'));
}
}
}
/**
@ -249,6 +258,11 @@ function farm_livestock_birth_form_submit($form, &$form_state) {
$children = array();
foreach ($form_state['values']['birth']['child'] as $child) {
// If the name is not set, but tag ID is, copy the tag ID to the name.
if (empty($child['name']) && !empty($child['tag_id'])) {
$child['name'] = $child['tag_id'];
}
// Create a new animal asset.
$values = array(
'type' => 'animal',