Commit eeb27b78 authored by Carsten  Rose's avatar Carsten Rose
Browse files

Fixed #7639. Fixes bug that orderInterval has not been respected.

parent fca1b949
Pipeline #2752 passed with stages
in 3 minutes and 49 seconds
...@@ -2810,7 +2810,12 @@ abstract class AbstractBuildForm { ...@@ -2810,7 +2810,12 @@ abstract class AbstractBuildForm {
// Handle DragAndDrop // Handle DragAndDrop
$dndAttributes = ''; $dndAttributes = '';
if ($hasDragAndDrop) { if ($hasDragAndDrop) {
$orderInterval = 10;
$orderInterval = $formElement[FE_ORDER_INTERVAL] ?? FE_ORDER_INTERVAL_DEFAULT;
if ($orderInterval == '' || !is_numeric($orderInterval)) {
$orderInterval = FE_ORDER_INTERVAL_DEFAULT;
}
$numColumns = 0; $numColumns = 0;
if (count($formElement[FE_SQL1]) > 0) { if (count($formElement[FE_SQL1]) > 0) {
$numColumns = count($formElement[FE_SQL1][0]) + (int)$flagDelete + (int)($flagNew || $flagEdit); $numColumns = count($formElement[FE_SQL1][0]) + (int)$flagDelete + (int)($flagNew || $flagEdit);
......
...@@ -1317,6 +1317,7 @@ const FE_TYPE_PILL = 'pill'; ...@@ -1317,6 +1317,7 @@ const FE_TYPE_PILL = 'pill';
const FE_HTML_ID = 'htmlId'; // Will be dynamically computed during runtime. const FE_HTML_ID = 'htmlId'; // Will be dynamically computed during runtime.
const FE_ORDER_INTERVAL = 'orderInterval'; const FE_ORDER_INTERVAL = 'orderInterval';
const FE_ORDER_INTERVAL_DEFAULT = '10';
const FE_ORDER_COLUMN = 'orderColumn'; const FE_ORDER_COLUMN = 'orderColumn';
const FE_DND_TABLE = 'dndTable'; const FE_DND_TABLE = 'dndTable';
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment