';
+ $form[$element]['#prefix'] = '
';
$form[$element]['#suffix'] = '
';
}
// Fields in groups
@@ -578,7 +588,7 @@
/**
* Validation for node editing form.
*/
-function conditional_fields_node_editing_form_validate($form_id, $form_values, $form, $data, $required_fields) {
+function conditional_fields_node_editing_form_validate($form, $form_state, $form, $data, $required_fields) {
// If controlled required field (or required field in a controlled group) was triggered, set error
foreach ($data as $row) {
if ($required_fields[$row['field_name']] && conditional_fields_is_triggered($form_values[$row['control_field_name']], $row['trigger_values'])) {
@@ -596,7 +606,7 @@
// This is to catch remaining fields (required fields in controlled groups)
foreach ((array)$required_fields as $field_in_group) {
if (!$control_field || $control_field['field_name'] != $field_in_group['in_group']) {
- $control_field = db_fetch_array(db_query("SELECT control_field_name, field_name, trigger_values FROM {conditional_fields} WHERE field_name = '%s' AND type = '%s'", $field_in_group['in_group'], $form_values['type']));
+ $control_field = db_fetch_array(db_query("SELECT control_field_name, field_name, trigger_values FROM {conditional_fields} WHERE field_name = '%s' AND type = '%s'", $field_in_group['in_group'], $form_state['type']));
}
if ($control_field && conditional_fields_is_triggered($form_values[$control_field['control_field_name']], unserialize($control_field['trigger_values']))) {
conditional_fields_find_required_field($form[$field_in_group['in_group']][$field_in_group['field']], TRUE);
@@ -671,6 +681,7 @@
}
$data['flat'][$type] = array_unique($data['flat'][$type]);
}
+
}
return $data[$structure][$type];
}
@@ -762,14 +773,14 @@
/*
* Clean conditional fields settings pertaining to this removed field
*/
-function _conditional_fields_content_admin_field_remove_submit($form_id, $form_values) {
- conditional_fields_remove_field_settings($form_values['field_name']);
+function _conditional_fields_content_admin_field_remove_submit($form, $form_state) {
+ conditional_fields_remove_field_settings($form_state['field_name']);
}
/*
* Clean conditional fields settings pertaining to this removed group
*/
-function _conditional_fields_fieldgroup_remove_group_submit($form_id, $form_values, $group_name) {
+function _conditional_fields_fieldgroup_remove_group_submit($form, $form_state, $group_name) {
conditional_fields_remove_field_settings($group_name);
}
@@ -868,47 +879,63 @@
* This causes Drupal to render conditionally required fields in a way that
* indicates they are required when visible. e.g., with an asterisk.
*/
-function conditional_fields_set_required_for_render($item) {
- if ($item['#required_field']) {
- $item['#required'] = TRUE;
- }
- else {
- foreach(element_children($item) as $child) {
- conditional_fields_set_required_for_render($item[$child]);
- }
- }
+function conditional_fields_set_required_for_render(&$item) {
+ if ($item['#required_field']) {
+ $item['#required'] = TRUE;
+ }
+ else {
+ foreach (element_children($item) as $child) {
+ conditional_fields_set_required_for_render($item[$child]);
+ }
+ }
}
+// TODO Reescrever este wrapper de forma a remover os dígitos do final de forma genérica.
+// Provavelmente teremos de usar regexes. Aí é só testar contra switchField no js.
/**
- * Themes a conditional markup for a field label.
+ * Um wrapper para form_clean_id.
*/
-function theme_conditional_field_conditional($label) {
- return t('
@label', array('@label' => $label));
+function my_form_clean_id($id = NULL, $flush = FALSE) {
+ $id = str_replace(array('][', '_', ' '), '-', $id);
+ return $id;
}
+
/**
- * Themes the wrappers around conditional fields.
- * Note that if you modify the id and classes of these fields,
- * you have to modify conditional_fields.js accordingly.
- */
+* Themes the wrappers around conditional fields.
+* Note that if you modify the id and classes of these fields,
+* you have to modify conditional_fields.js accordingly.
+*/
function theme_conditional_fields_form_item($item) {
- if ($id = $item['#controlling_field']) {
- $output = '
'. drupal_render($item) .'
';
- }
- else if ($id = $item['#controlled_field']) {
- conditional_fields_set_required_for_render(&$item);
- if ($item['#type'] == 'markup') {
- /* Avoid unnecessary divs in multiple fields */
- $item['#prefix'] = '
';
- $item['#suffix'] = '
';
- $output = drupal_render($item);
- }
- else {
- $output = '
'. drupal_render($item) .'
';
- }
- }
- else {
- $output = drupal_render($item);
- }
- return $output;
+ if ($id = $item['#controlling_field']) {
+ $output = '
'. drupal_render($item) .'
';
+ }
+ else if ($id = $item['#controlled_field']) {
+ conditional_fields_set_required_for_render($item);
+ if ($item['#type'] == 'markup') {
+ /* Avoid unnecessary divs in multiple fields */
+ $item['#prefix'] = '
';
+ $item['#suffix'] = '
';
+ $output = drupal_render($item);
+ }
+ else {
+ $output = '
'. drupal_render($item) .'
';
+ }
+ }
+ else {
+ $output = drupal_render($item);
+ }
+ return $output;
}
+
+/**
+* Implementation of hook_theme().
+*/
+function conditional_fields_theme() {
+ return array(
+ 'conditional_fields_form_item' => array(
+ 'arguments' => array('item' => NULL),
+ ),
+ );
+}
+
diff -Naur conditional_fields-5/conditional-field.tpl.php conditional_fields/conditional-field.tpl.php
--- conditional_fields-5/conditional-field.tpl.php 1969-12-31 16:00:00.000000000 -0800
+++ conditional_fields/conditional-field.tpl.php 2008-12-02 09:47:06.000000000 -0800
@@ -0,0 +1 @@
+
\ No newline at end of file