From bbf6443a5b2a347b5d371993fa744e528986bc56 Mon Sep 17 00:00:00 2001 From: Dan Chadwick Date: Sun, 27 Sep 2015 21:38:07 -0400 Subject: [PATCH] Issue #2555853 by DanChadwick: Added warning that component must be Required if required is conditionally set. --- includes/webform.conditionals.inc | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/includes/webform.conditionals.inc b/includes/webform.conditionals.inc index 980a70e..ef43e73 100644 --- a/includes/webform.conditionals.inc +++ b/includes/webform.conditionals.inc @@ -56,6 +56,7 @@ function webform_conditionals_form($form, &$form_state, $node) { $source_list = webform_component_list($node, 'conditional', 'path', TRUE); $target_list = webform_component_list($node, TRUE, 'path', TRUE); + $components = $node->webform['components']; $delta = $form_state['conditional_count']; $weight = -$delta - 1; $index = 0; @@ -79,6 +80,15 @@ function webform_conditionals_form($form, &$form_state, $node) { '#targets' => $target_list, '#parents' => array('conditionals', $rgid), ); + foreach ($conditional_group['actions'] as $action) { + $cid = $action['target']; + if ($action['action'] == 'require' && !$components[$cid]['required']) { + drupal_set_message(t('Component %title must be configured as Required for Webform to conditionally change its required status. Configure %title.', + array('%title' => $components[$cid]['name'], + '!url' => url("node/{$node->nid}/webform/components/$cid", array('query' => array('destination' => "node/{$node->nid}/webform/conditionals")))) + ), 'error'); + } + } $form['conditionals'][$rgid]['weight'] = array( '#type' => 'weight', '#title' => t('Weight for rule group !rgid', array('!rgid' => $rgid)), -- 1.7.8.msysgit.0