Conjunto f9bf786 en sipes


Ignorar:
Fecha y hora:
18/07/2017 11:51:15 (hace 7 años)
Autor:
Sipes Apn <root@…>
Branches:
stable
Children:
c64f646
Parents:
96e211e
Mensaje:

se corrigio el error presentado al momento de eliminar un valor

Ubicación:
0.3-modules/cck_plan_fields
Ficheros:
3 editados

Leyenda

No modificado
Añadido
Eliminado

  • 0.3-modules/cck_plan_fields/cck_plan_fields.module

    r1e031fe rf9bf786  
    616616 */
    617617function cck_plan_fields_validate($element, &$form_state) {
    618 
    619618  $field_name = $element['#field_name'];
    620   $type_name = $element['#type_name'];
    621   $field = content_fields($field_name, $type_name);
    622   $min = is_numeric($field['widget']['min']);
    623   $max = is_numeric($field['widget']['max']);
    624   $cck_plan_fields_path = drupal_get_path('module', 'cck_plan_fields');
    625   drupal_add_js($cck_plan_fields_path . '/js/cck_plan_fields.js');
    626   $flag = FALSE;
    627   foreach ($element['#columns'] as $ftype) {
    628     if ($ftype != 'tid' && !empty($element[$ftype]['#value'])) {
    629       $error_field = implode('][', $element['#parents']) .'][' . $ftype;
    630       if (!is_numeric($element[$ftype]['#value'])) {
    631         form_set_error($error_field, t('Amount should be a number in %field.', array('%field' => t($field['widget']['label']))));
    632       }
    633       elseif ($field['cck_plan_fields_simple_type'] == 'int') {
    634         $start = $element[$ftype]['#value'];
    635         $value = preg_replace('@[^-0-9]@', '', $start);
    636         if ($start != $value) {
    637           form_set_error($error_field, t('Only numbers are allowed in %field.', array('%number' => $field['widget']['min'], '%field' => t($field['widget']['label']))));
    638         }
    639       }
    640       elseif ($min && $field['widget']['min'] > $element[$ftype]['#value']) {
    641         form_set_error($error_field, t('Amount should be greater %number in %field.', array('%number' => $field['widget']['min'], '%field' => t($field['widget']['label']))));
    642       }
    643       elseif ($max && $field['widget']['max'] < $element[$ftype]['#value']) {
    644         form_set_error($error_field, t('Amount should be litter %number in %field.', array('%number' => $field['widget']['max'], '%field' => t($field['widget']['label']))));
    645       }
    646       $flag = TRUE;
    647     }
    648   }
    649   if (!$flag) {
    650     return;
    651   }
    652   if ($element['#delta']) {
    653     $current_taxonomy = $element['tid']['#value'];
    654     for($i = 0; $i < $element['#delta']; $i++) {
    655       if ($current_taxonomy == $form_state['values'][$field_name][$i]['tid']) {
    656         $error_field = implode('][', $element['#parents']) .'][tid';
    657         form_set_error($error_field, t('Account can not be repeat in %field.', array('%field' => t($field['widget']['label']))));
    658       }
    659     }
    660   }
    661   $type_name = $element['#type_name'];
    662   $field = content_fields($field_name, $type_name);
    663   $field_key = $element['#columns'][0];
     619  if (!isset($element['_remove']['#post'][$field_name][$element['#delta']]['_remove'])) {
     620    $type_name = $element['#type_name'];
     621    $field = content_fields($field_name, $type_name);
     622    $min = is_numeric($field['widget']['min']);
     623    $max = is_numeric($field['widget']['max']);
     624    $cck_plan_fields_path = drupal_get_path('module', 'cck_plan_fields');
     625    drupal_add_js($cck_plan_fields_path . '/js/cck_plan_fields.js');
     626    $flag = FALSE;
     627    foreach ($element['#columns'] as $ftype) {
     628      if ($ftype != 'tid' && !empty($element[$ftype]['#value'])) {
     629        $error_field = implode('][', $element['#parents']) .'][' . $ftype;
     630        if (!is_numeric($element[$ftype]['#value'])) {
     631          form_set_error($error_field, t('Amount should be a number in %field.', array('%field' => t($field['widget']['label']))));
     632        }
     633        elseif ($field['cck_plan_fields_simple_type'] == 'int') {
     634          $start = $element[$ftype]['#value'];
     635          $value = preg_replace('@[^-0-9]@', '', $start);
     636          if ($start != $value) {
     637            form_set_error($error_field, t('Only numbers are allowed in %field.', array('%number' => $field['widget']['min'], '%field' => t($field['widget']['label']))));
     638          }
     639        }
     640        elseif ($min && $field['widget']['min'] > $element[$ftype]['#value']) {
     641          form_set_error($error_field, t('Amount should be greater %number in %field.', array('%number' => $field['widget']['min'], '%field' => t($field['widget']['label']))));
     642        }
     643        elseif ($max && $field['widget']['max'] < $element[$ftype]['#value']) {
     644          form_set_error($error_field, t('Amount should be litter %number in %field.', array('%number' => $field['widget']['max'], '%field' => t($field['widget']['label']))));
     645        }
     646        $flag = TRUE;
     647      }
     648    }
     649    if (!$flag) {
     650      return;
     651    }
     652    if ($element['#delta']) {
     653      $current_taxonomy = $element['tid']['#value'];
     654      for($i = 0; $i < $element['#delta']; $i++) {
     655        if ($current_taxonomy == $form_state['values'][$field_name][$i]['tid']) {
     656          $error_field = implode('][', $element['#parents']) .'][tid';
     657          form_set_error($error_field, t('Account can not be repeat in %field.', array('%field' => t($field['widget']['label']))));
     658        }
     659      }
     660    }
     661  }
    664662}
    665663

  • 0.3-modules/cck_plan_fields/cck_plan_fields_combine_term.module

    r1e031fe rf9bf786  
    402402function cck_plan_fields_combine_term_validate($element, &$form_state) {
    403403  $field_name = $element['#field_name'];
    404   $type_name = $element['#type_name'];
    405   $field = content_fields($field_name, $type_name);
    406   $min = is_numeric($field['widget']['min']);
    407   $max = is_numeric($field['widget']['max']);
    408   $cck_plan_fields_path = drupal_get_path('module', 'cck_plan_fields');
    409   drupal_add_js($cck_plan_fields_path . '/js/cck_plan_fields.js');
    410   $flag = FALSE;
    411   foreach ($element['#columns'] as $ftype) {
    412     if ($ftype != 'tid' && !empty($element[$ftype]['#value'])) {
    413       $error_field = implode('][', $element['#parents']) .'][' . $ftype;
    414       if (!is_numeric($element[$ftype]['#value'])) {
    415         form_set_error($error_field, t('Amount should be a number in %field.', array('%field' => t($field['widget']['label']))));
    416       }
    417       elseif ($field['cck_plan_fields_simple_type'] == 'int') {
    418         $start = $element[$ftype]['#value'];
    419         $value = preg_replace('@[^-0-9]@', '', $start);
    420         if ($start != $value) {
    421           form_set_error($error_field, t('Only numbers are allowed in %field.', array('%number' => $field['widget']['min'], '%field' => t($field['widget']['label']))));
    422         }
    423       }
    424       elseif ($min && $field['widget']['min'] > $element[$ftype]['#value']) {
    425         form_set_error($error_field, t('Amount should be greater %number in %field.', array('%number' => $field['widget']['min'], '%field' => t($field['widget']['label']))));
    426       }
    427       elseif ($max && $field['widget']['max'] < $element[$ftype]['#value']) {
    428         form_set_error($error_field, t('Amount should be litter %number in %field.', array('%number' => $field['widget']['max'], '%field' => t($field['widget']['label']))));
    429       }
    430       $flag = TRUE;
    431     }
    432   }
    433   if (!$flag) {
    434     return;
    435   }
    436   if ($element['#delta']) {
    437     $current_taxonomy = $element['tid']['#value'];
    438     for($i = 0; $i < $element['#delta']; $i++) {
    439       if ($current_taxonomy == $form_state['values'][$field_name][$i]['tid']) {
    440         $error_field = implode('][', $element['#parents']) .'][tid';
    441         form_set_error($error_field, t('@type_term can not be repeat in %field.', array('%field' => t($field['widget']['label']), '@type_term' => $field['cck_plan_fields_simple_titulo_term'])));
    442       }
    443     }
    444   }
    445   $type_name = $element['#type_name'];
    446   $field = content_fields($field_name, $type_name);
    447   $field_key = $element['#columns'][0];
     404  if (!isset($element['_remove']['#post'][$field_name][$element['#delta']]['_remove'])) {
     405    $type_name = $element['#type_name'];
     406    $field = content_fields($field_name, $type_name);
     407    $min = is_numeric($field['widget']['min']);
     408    $max = is_numeric($field['widget']['max']);
     409    $cck_plan_fields_path = drupal_get_path('module', 'cck_plan_fields');
     410    drupal_add_js($cck_plan_fields_path . '/js/cck_plan_fields.js');
     411    $flag = FALSE;
     412    foreach ($element['#columns'] as $ftype) {
     413      if ($ftype != 'tid' && !empty($element[$ftype]['#value'])) {
     414        $error_field = implode('][', $element['#parents']) .'][' . $ftype;
     415        if (!is_numeric($element[$ftype]['#value'])) {
     416          form_set_error($error_field, t('Amount should be a number in %field.', array('%field' => t($field['widget']['label']))));
     417        }
     418        elseif ($field['cck_plan_fields_simple_type'] == 'int') {
     419          $start = $element[$ftype]['#value'];
     420          $value = preg_replace('@[^-0-9]@', '', $start);
     421          if ($start != $value) {
     422            form_set_error($error_field, t('Only numbers are allowed in %field.', array('%number' => $field['widget']['min'], '%field' => t($field['widget']['label']))));
     423          }
     424        }
     425        elseif ($min && $field['widget']['min'] > $element[$ftype]['#value']) {
     426          form_set_error($error_field, t('Amount should be greater %number in %field.', array('%number' => $field['widget']['min'], '%field' => t($field['widget']['label']))));
     427        }
     428        elseif ($max && $field['widget']['max'] < $element[$ftype]['#value']) {
     429          form_set_error($error_field, t('Amount should be litter %number in %field.', array('%number' => $field['widget']['max'], '%field' => t($field['widget']['label']))));
     430        }
     431        $flag = TRUE;
     432      }
     433    }
     434    if (!$flag) {
     435      return;
     436    }
     437    //inicio desde el primer elemento
     438    if ($element['#delta']) {
     439      $current_taxonomy = $element['tid']['#value'];
     440      for($i = 0; $i < $element['#delta']; $i++) {
     441        if ($current_taxonomy == $form_state['values'][$field_name][$i]['tid'] && !isset($element['_remove']['#post'][$field_name][$i]['_remove'])) {
     442          $error_field = implode('][', $element['#parents']) .'][tid';
     443          form_set_error($error_field, t('@type_term can not be repeat in %field.', array('%field' => t($field['widget']['label']), '@type_term' => $field['cck_plan_fields_simple_titulo_term'])));
     444          return;
     445        }
     446      }
     447    }
     448  }
    448449}
    449450

  • 0.3-modules/cck_plan_fields/cck_plan_fields_simple.module

    r1e031fe rf9bf786  
    529529function cck_plan_fields_simple_validate($element, &$form_state) {
    530530  $field_name = $element['#field_name'];
    531   $type_name = $element['#type_name'];
    532   $field = content_fields($field_name, $type_name);
    533   $min = is_numeric($field['widget']['min']);
    534   $max = is_numeric($field['widget']['max']);
    535   $cck_plan_fields_simple_path = drupal_get_path('module', 'cck_plan_fields_simple');
    536   drupal_add_js($cck_plan_fields_simple_path . '/js/cck_plan_fields.js');
    537   $flag = FALSE;
    538   foreach ($element['#columns'] as $ftype) {
    539     if (!empty($element[$ftype]['#value'])) {
    540       $error_field = implode('][', $element['#parents']) .'][' . $ftype;
    541       if (!is_numeric($element[$ftype]['#value'])) {
    542         form_set_error($error_field, t('Amount should be a number in %field.', array('%field' => t($field['widget']['label']))));
     531  if (!isset($element['_remove']['#post'][$field_name][$element['#delta']]['_remove'])) {
     532    $type_name = $element['#type_name'];
     533    $field = content_fields($field_name, $type_name);
     534    $min = is_numeric($field['widget']['min']);
     535    $max = is_numeric($field['widget']['max']);
     536    $cck_plan_fields_simple_path = drupal_get_path('module', 'cck_plan_fields_simple');
     537    drupal_add_js($cck_plan_fields_simple_path . '/js/cck_plan_fields.js');
     538    $flag = FALSE;
     539    foreach ($element['#columns'] as $ftype) {
     540      if (!empty($element[$ftype]['#value'])) {
     541        $error_field = implode('][', $element['#parents']) .'][' . $ftype;
     542        if (!is_numeric($element[$ftype]['#value'])) {
     543          form_set_error($error_field, t('Amount should be a number in %field.', array('%field' => t($field['widget']['label']))));
     544        }
     545        elseif ($field['cck_plan_fields_simple_type'] == 'int') {
     546          $start = $element[$ftype]['#value'];
     547          $value = preg_replace('@[^-0-9]@', '', $start);
     548          if ($start != $value) {
     549            form_set_error($error_field, t('Only numbers are allowed in %field.', array('%number' => $field['widget']['min'], '%field' => t($field['widget']['label']))));
     550          }
     551        }
     552        elseif ($min && $field['widget']['min'] > $element[$ftype]['#value']) {
     553          form_set_error($error_field, t('Amount should be greater %number in %field.', array('%number' => $field['widget']['min'], '%field' => t($field['widget']['label']))));
     554        }
     555        elseif ($max && $field['widget']['max'] < $element[$ftype]['#value']) {
     556          form_set_error($error_field, t('Amount should be litter %number in %field.', array('%number' => $field['widget']['max'], '%field' => t($field['widget']['label']))));
     557        }
     558        $flag = TRUE;
    543559      }
    544       elseif ($field['cck_plan_fields_simple_type'] == 'int') {
    545         $start = $element[$ftype]['#value'];
    546         $value = preg_replace('@[^-0-9]@', '', $start);
    547         if ($start != $value) {
    548           form_set_error($error_field, t('Only numbers are allowed in %field.', array('%number' => $field['widget']['min'], '%field' => t($field['widget']['label']))));
    549         }
    550       }
    551       elseif ($min && $field['widget']['min'] > $element[$ftype]['#value']) {
    552         form_set_error($error_field, t('Amount should be greater %number in %field.', array('%number' => $field['widget']['min'], '%field' => t($field['widget']['label']))));
    553       }
    554       elseif ($max && $field['widget']['max'] < $element[$ftype]['#value']) {
    555         form_set_error($error_field, t('Amount should be litter %number in %field.', array('%number' => $field['widget']['max'], '%field' => t($field['widget']['label']))));
    556       }
    557       $flag = TRUE;
    558     }
    559   }
    560   if (!$flag) {
    561     return;
    562   }
    563   $type_name = $element['#type_name'];
    564   $field = content_fields($field_name, $type_name);
    565   $field_key = $element['#columns'][0];
     560    }
     561    if (!$flag) {
     562      return;
     563    }
     564  }
    566565}
    567566
Nota: Vea TracChangeset para ayuda en el uso del visor de conjuntos de cambios.