OpenEcoLab-LasAlpujarras/farmOS
3
0
Fork 0
mirror of https://github.com/farmOS/farmOS.git synced 2024-02-23 11:37:38 +01:00
Code Wiki Activity

Move $form_values alias to the top and replace other usages.

Browse source
This commit is contained in:
Michael Stenta 2019-01-08 13:29:40 -05:00
parent f33dc32ca1
commit f6f3c73ade
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
modules/farm/farm_crop/farm_crop.farm_quick.planting.inc
View file

@ -10,6 +10,12 @@
*/
function farm_crop_planting_quick_form($form, &$form_state) {
// Alias $form_state['values']['planting'] for easier use.
$form_values = array();
if (!empty($form_state['values']['planting'])) {
$form_values = &$form_state['values']['planting'];
}
// Wrapper fieldset.
$form['planting'] = array(
'#type' => 'fieldset',
@ -51,8 +57,8 @@ function farm_crop_planting_quick_form($form, &$form_state) {
// Create a field for each crop/variety.
$crop_count = $crop_count_default;
if (!empty($form_state['values']['planting']['crop_count'])) {
$crop_count = $form_state['values']['planting']['crop_count'];
if (!empty($form_values['crop_count'])) {
$crop_count = $form_values['crop_count'];
}
for ($i=0; $i<$crop_count; $i++) {
$form['planting']['crops'][$i] = array(
@ -111,8 +117,8 @@ function farm_crop_planting_quick_form($form, &$form_state) {
// Log checkbox, checked based on $form_state, with default.
$enabled = !empty($info['enabled']) ? $info['enabled'] : FALSE;
if (isset($form_state['values']['planting']['logs'][$name]['enabled'])) {
$enabled = $form_state['values']['planting']['logs'][$name]['enabled'];
if (isset($form_values['logs'][$name]['enabled'])) {
$enabled = $form_values['logs'][$name]['enabled'];
}
$form['planting']['logs'][$name]['enabled'] = array(
'#type' => 'checkbox',
@ -213,12 +219,6 @@ function farm_crop_planting_quick_form($form, &$form_state) {
}
}
// Alias $form_state['values']['planting'] for easier use.
$form_values = array();
if (!empty($form_state['values']['planting'])) {
$form_values = &$form_state['values']['planting'];
}
// Get the season
// $season defaults to last used season, above
if (!empty($form_values['season']) ) {