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

Deprecate farm_area_parse_names() and use farm_term_parse_names() instead.

This commit is contained in:
Michael Stenta 2020-05-24 15:56:42 -04:00
parent 49612fd98b
commit e22e419f2c
6 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/farm/farm_area/farm_area.module
View File

@ -145,6 +145,8 @@ function farm_area_type_options() {
* loaded from the database. Otherwise, they will be created.
*
* @see farm_term_parse_names()
*
* @deprecated Use farm_term_parse_names() instead.
*/
function farm_area_parse_names($names, $create = FALSE) {
return farm_term_parse_names($names, 'farm_areas', $create);

2
modules/farm/farm_crop/farm_crop.farm_quick.planting.inc
View File

@ -387,7 +387,7 @@ function farm_crop_planting_quick_form_submit($form, &$form_state) {
// If the location is available, load areas.
$areas = array();
if (!empty($log_values['location'])) {
$areas = farm_area_parse_names($log_values['location'], TRUE);
$areas = farm_term_parse_names($log_values['location'], 'farm_areas', TRUE);
}
// Build quantity measurements.

1
modules/farm/farm_movement/farm_movement.info
View File

@ -16,6 +16,7 @@ dependencies[] = farm_log
dependencies[] = farm_map
dependencies[] = farm_map_geofield
dependencies[] = farm_map_kml
dependencies[] = farm_term
dependencies[] = features
dependencies[] = field_collection
dependencies[] = field_group

4
modules/farm/farm_movement/farm_movement.location.inc
View File

@ -179,7 +179,7 @@ function farm_movement_asset_location_submit(array $form, array &$form_state) {
$asset = $form_state['values']['farm_asset'];
// Load the areas.
$areas = farm_area_parse_names($form_state['values']['location']['areas'], TRUE);
$areas = farm_term_parse_names($form_state['values']['location']['areas'], 'farm_areas', TRUE);
// Create an observation log to record the movement.
farm_movement_create($asset, $areas, REQUEST_TIME);
@ -849,7 +849,7 @@ function farm_movement_asset_move_action_submit(array $form, array $form_state)
$context = array();
// Load the areas.
$context['areas'] = farm_area_parse_names($form_state['values']['areas'], TRUE);
$context['areas'] = farm_term_parse_names($form_state['values']['areas'], 'farm_areas', TRUE);
// Convert the date to a timestamp.
$timestamp = strtotime($form_state['values']['date']);

4
modules/farm/farm_soil/farm_soil.farm_quick.amendment.inc
View File

@ -59,7 +59,7 @@ function farm_soil_amendment_form($form, &$form_state) {
$area = FALSE;
if (!empty($form_values['area']['name'])) {
$area_name = $form_values['area']['name'];
$areas = farm_area_parse_names($area_name);
$areas = farm_term_parse_names($area_name, 'farm_areas');
$area = reset($areas);
}
@ -523,7 +523,7 @@ function farm_soil_amendment_form_submit($form, &$form_state) {
// Parse the area name, create new one if it doesn't exist.
$area_name = $form_values['area']['name'];
$areas = farm_area_parse_names($area_name, TRUE);
$areas = farm_term_parse_names($area_name, 'farm_areas', TRUE);
// If no areas were found/created, bail with an error.
if (empty($areas)) {

4
modules/farm/farm_soil/farm_soil.farm_quick.disturbance.inc
View File

@ -59,7 +59,7 @@ function farm_soil_disturbance_form($form, &$form_state) {
$area = FALSE;
if (!empty($form_values['area']['name'])) {
$area_name = $form_values['area']['name'];
$areas = farm_area_parse_names($area_name);
$areas = farm_term_parse_names($area_name, 'farm_areas');
$area = reset($areas);
}
@ -299,7 +299,7 @@ function farm_soil_disturbance_form_submit($form, &$form_state) {
// Parse the area name, create new one if it doesn't exist.
$area_name = $form_values['area']['name'];
$areas = farm_area_parse_names($area_name, TRUE);
$areas = farm_term_parse_names($area_name, 'farm_areas', TRUE);
// If no areas were found/created, bail with an error.
if (empty($areas)) {