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

Merge farm_log_ids_from_url() into farm_log_prepopulate_log_form_references().

Browse source
This commit is contained in:
Michael Stenta 2017-07-14 15:40:53 -04:00
parent 4cc5523d08
commit 13090d01c0
1 changed files with 13 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
modules/farm/farm_log/farm_log.module
View file

@ -194,7 +194,14 @@ function farm_log_prepopulate_log_form_references(&$form) {
// If a URL param is available, get a list of entity IDs from it.
if (!empty($info['url_param'])) {
$ids = farm_log_ids_from_url($info['url_param']);
// Get query parameters.
$params = drupal_get_query_parameters();
// If the URL param is set, pull the IDs out.
if (!empty($params[$info['url_param']])) {
$ids = $params[$info['url_param']];
}
}
// Or, if the entity type is 'user', load the ID from the current user.
@ -205,6 +212,11 @@ function farm_log_prepopulate_log_form_references(&$form) {
}
}
// Ensure that the IDs are an array.
if (!is_array($ids)) {
$ids = array($ids);
}
// If there are no IDs, skip.
if (empty($ids)) {
continue;
@ -214,29 +226,3 @@ function farm_log_prepopulate_log_form_references(&$form) {
farm_fields_prepopulate_entityreference($form, $info['entity_type'], $field, $ids);
}
}
/**
* Helper function for retrieving a list of entity IDs from a URL query param.
*
* @param string $param
* The URL query param to look at.
*
* @return array
* Returns an array of IDs.
*/
function farm_log_ids_from_url($param) {
// If the GET parameter isn't set, bail.
$params = drupal_get_query_parameters();
if (empty($params[$param])) {
return array();
}
// If only a single ID is passed, convert it to an array.
if (!is_array($params[$param])) {
$params[$param] = array($params[$param]);
}
// Return the array of IDs.
return $params[$param];
}