';
581c591
< 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) {
599c609
< $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']));
673a684
>
765,766c776,777
< 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']);
772c783
< 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) {
872,879c883,890
< if ($item['#required_field']) {
< $item['#required'] = TRUE;
< }
< else {
< foreach(element_children($item) as $child) {
< conditional_fields_set_required_for_render($item[$child]);
< }
< }
---
> if ($item['#required_field']) {
> $item['#required'] = TRUE;
> }
> else {
> foreach (element_children($item) as $child) {
> conditional_fields_set_required_for_render($item[$child]);
> }
> }
881a893,894
> // 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.
883c896
< * Themes a conditional markup for a field label.
---
> * Um wrapper para form_clean_id.
885,886c898,900
< 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;
888a903
>
890,893c905,908
< * 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.
> */
895,913c910,928
< 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;
914a930,941
>
> /**
> * Implementation of hook_theme().
> */
> function conditional_fields_theme() {
> return array(
> 'conditional_fields_form_item' => array(
> 'arguments' => array('item' => NULL),
> ),
> );
> }
>