Conjunto de cambios f9bf786 en sipes para 0.3-modules/cck_plan_fields/cck_plan_fields.module

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

Fichero:

• 0.3-modules/cck_plan_fields/cck_plan_fields.module (modificado) (1 diferencia)

0.3-modules/cck_plan_fields/cck_plan_fields.module

@@ -616 +616 @@
  */
 function cck_plan_fields_validate($element, &$form_state) {
-
   $field_name = $element['#field_name'];
-  $type_name = $element['#type_name'];
-  $field = content_fields($field_name, $type_name);
-  $min = is_numeric($field['widget']['min']);
-  $max = is_numeric($field['widget']['max']);
-  $cck_plan_fields_path = drupal_get_path('module', 'cck_plan_fields');
-  drupal_add_js($cck_plan_fields_path . '/js/cck_plan_fields.js');
-  $flag = FALSE;
-  foreach ($element['#columns'] as $ftype) {
-    if ($ftype != 'tid' && !empty($element[$ftype]['#value'])) {
-      $error_field = implode('][', $element['#parents']) .'][' . $ftype;
-      if (!is_numeric($element[$ftype]['#value'])) {
-        form_set_error($error_field, t('Amount should be a number in %field.', array('%field' => t($field['widget']['label']))));
-      }
-      elseif ($field['cck_plan_fields_simple_type'] == 'int') {
-        $start = $element[$ftype]['#value'];
-        $value = preg_replace('@[^-0-9]@', '', $start);
-        if ($start != $value) {
-          form_set_error($error_field, t('Only numbers are allowed in %field.', array('%number' => $field['widget']['min'], '%field' => t($field['widget']['label']))));
-        }
-      }
-      elseif ($min && $field['widget']['min'] > $element[$ftype]['#value']) {
-        form_set_error($error_field, t('Amount should be greater %number in %field.', array('%number' => $field['widget']['min'], '%field' => t($field['widget']['label']))));
-      }
-      elseif ($max && $field['widget']['max'] < $element[$ftype]['#value']) {
-        form_set_error($error_field, t('Amount should be litter %number in %field.', array('%number' => $field['widget']['max'], '%field' => t($field['widget']['label']))));
-      }
-      $flag = TRUE;
-    }
-  }
-  if (!$flag) {
-    return;
-  }
-  if ($element['#delta']) {
-    $current_taxonomy = $element['tid']['#value']; 
-    for($i = 0; $i < $element['#delta']; $i++) {
-      if ($current_taxonomy == $form_state['values'][$field_name][$i]['tid']) {
-        $error_field = implode('][', $element['#parents']) .'][tid';
-        form_set_error($error_field, t('Account can not be repeat in %field.', array('%field' => t($field['widget']['label']))));
-      }
-    }
-  }
-  $type_name = $element['#type_name'];
-  $field = content_fields($field_name, $type_name);
-  $field_key = $element['#columns'][0];
+  if (!isset($element['_remove']['#post'][$field_name][$element['#delta']]['_remove'])) {
+    $type_name = $element['#type_name'];
+    $field = content_fields($field_name, $type_name);
+    $min = is_numeric($field['widget']['min']);
+    $max = is_numeric($field['widget']['max']);
+    $cck_plan_fields_path = drupal_get_path('module', 'cck_plan_fields');
+    drupal_add_js($cck_plan_fields_path . '/js/cck_plan_fields.js');
+    $flag = FALSE;
+    foreach ($element['#columns'] as $ftype) {
+      if ($ftype != 'tid' && !empty($element[$ftype]['#value'])) {
+        $error_field = implode('][', $element['#parents']) .'][' . $ftype;
+        if (!is_numeric($element[$ftype]['#value'])) {
+          form_set_error($error_field, t('Amount should be a number in %field.', array('%field' => t($field['widget']['label']))));
+        }
+        elseif ($field['cck_plan_fields_simple_type'] == 'int') {
+          $start = $element[$ftype]['#value'];
+          $value = preg_replace('@[^-0-9]@', '', $start);
+          if ($start != $value) {
+            form_set_error($error_field, t('Only numbers are allowed in %field.', array('%number' => $field['widget']['min'], '%field' => t($field['widget']['label']))));
+          }
+        }
+        elseif ($min && $field['widget']['min'] > $element[$ftype]['#value']) {
+          form_set_error($error_field, t('Amount should be greater %number in %field.', array('%number' => $field['widget']['min'], '%field' => t($field['widget']['label']))));
+        }
+        elseif ($max && $field['widget']['max'] < $element[$ftype]['#value']) {
+          form_set_error($error_field, t('Amount should be litter %number in %field.', array('%number' => $field['widget']['max'], '%field' => t($field['widget']['label']))));
+        }
+        $flag = TRUE;
+      }
+    }
+    if (!$flag) {
+      return;
+    }
+    if ($element['#delta']) {
+      $current_taxonomy = $element['tid']['#value']; 
+      for($i = 0; $i < $element['#delta']; $i++) {
+        if ($current_taxonomy == $form_state['values'][$field_name][$i]['tid']) {
+          $error_field = implode('][', $element['#parents']) .'][tid';
+          form_set_error($error_field, t('Account can not be repeat in %field.', array('%field' => t($field['widget']['label']))));
+        }
+      }
+    }
+  }
 }