From 69cff4e9b4e3559d65144d4ff943e66cc68c7190 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 19 Apr 2023 15:05:29 +0200 Subject: [PATCH] fix handling of floats in getAttributeEditField --- views/bootstrap/class.Bootstrap.php | 6 +++--- views/bootstrap4/class.Bootstrap4.php | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 47ea6b006..81dc2f34b 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -1899,10 +1899,10 @@ $(document).ready(function() { $objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : ''; $content .= "getMinValues() > 0) ? ' required="required"' : '').' data-rule-email="true"'." />"; break; - case SeedDMS_Core_AttributeDefinition::type_float: + /* case SeedDMS_Core_AttributeDefinition::type_float: $objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : ''; $content .= "getMinValues() > 0) ? ' required="required"' : '')." data-rule-number=\"true\"/>"; - break; + break; */ case SeedDMS_Core_AttributeDefinition::type_folder: $objvalue = $attribute ? (is_object($attribute) ? (int) $attribute->getValue() : (int) $attribute) : 0; if($objvalue) @@ -1989,7 +1989,7 @@ $(document).ready(function() { if(strlen($objvalue) > 80) { $content .= ""; } else { - $content .= "getMinValues() > 0) ? ' required="required"' : '').($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_int ? ' data-rule-digits="true"' : '')." />"; + $content .= "getMinValues() > 0) ? ' required="required"' : '').(in_array($attrdef->getType(), [SeedDMS_Core_AttributeDefinition::type_int, SeedDMS_Core_AttributeDefinition::type_float]) ? ' data-rule-digits="true"' : '')." />"; } } break; diff --git a/views/bootstrap4/class.Bootstrap4.php b/views/bootstrap4/class.Bootstrap4.php index 3e838522a..aa31deaac 100644 --- a/views/bootstrap4/class.Bootstrap4.php +++ b/views/bootstrap4/class.Bootstrap4.php @@ -1951,10 +1951,10 @@ $(document).ready(function() { $objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : ''; $content .= "getMinValues() > 0) ? ' required="required"' : '').' data-rule-email="true"'." />"; break; - case SeedDMS_Core_AttributeDefinition::type_float: + /* case SeedDMS_Core_AttributeDefinition::type_float: $objvalue = $attribute ? (is_object($attribute) ? $attribute->getValue() : $attribute) : ''; $content .= "getMinValues() > 0) ? ' required="required"' : '')." data-rule-number=\"true\"/>"; - break; + break; */ case SeedDMS_Core_AttributeDefinition::type_folder: $objvalue = $attribute ? (is_object($attribute) ? (int) $attribute->getValue() : (int) $attribute) : 0; if($objvalue) @@ -2041,7 +2041,7 @@ $(document).ready(function() { if(strlen($objvalue) > 80) { $content .= ""; } else { - $content .= "getMinValues() > 0) ? ' required="required"' : '').($attrdef->getType() == SeedDMS_Core_AttributeDefinition::type_int ? ' data-rule-digits="true"' : '')." />"; + $content .= "getMinValues() > 0) ? ' required="required"' : '').(in_array($attrdef->getType(), [SeedDMS_Core_AttributeDefinition::type_int, SeedDMS_Core_AttributeDefinition::type_float]) ? ' data-rule-digits="true"' : '')." />"; } } break;