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

Pass the sensor entity into the sensor settings form.

This commit is contained in:
Michael Stenta 2016-06-10 12:02:12 -04:00
parent 8ef2ccd602
commit ea3ae8fe0a
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
farm_sensor.module
View File

@ -356,7 +356,7 @@ function farm_sensor_form_alter(&$form, &$form_state, $form_id) {
if (!empty($sensor_type) && !empty($sensor_types[$sensor_type]['form']) && function_exists($sensor_types[$sensor_type]['form'])) {
// Load the sensor type settings form.
$settings_form = call_user_func_array($sensor_types[$sensor_type]['form'], array($sensor_settings));
$settings_form = call_user_func_array($sensor_types[$sensor_type]['form'], array($farm_asset, $sensor_settings));
// Add it to the fieldset.
$form['sensor_settings'] = array_merge($form['sensor_settings'], $settings_form);

4
farm_sensor_listener/farm_sensor_listener.module
View File

@ -156,13 +156,15 @@ function farm_sensor_listener_farm_sensor_type_info() {
/**
* Settings form for listener sensor.
*
* @param FarmAsset $sensor
* The sensor asset entity.
* @param array $settings
* The farm sensor settings.
*
* @return array
* Returns a form with settings for this Listener sensor.
*/
function farm_sensor_listener_settings_form($settings = array()) {
function farm_sensor_listener_settings_form($sensor, $settings = array()) {
// If a public/private key haven't been set yet, generate them.
if (empty($settings['public_key'])) {