From b7c9ecf16231d5820cbf768915c61905f1ee3fbe Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 24 Apr 2023 16:58:30 +0200 Subject: [PATCH 1/2] fix nesting of containers --- views/bootstrap/class.AddDocument.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php index 93f6d8945..0fce83ffd 100644 --- a/views/bootstrap/class.AddDocument.php +++ b/views/bootstrap/class.AddDocument.php @@ -492,8 +492,8 @@ console.log(params); } $this->warningMsg(getMLText("add_doc_workflow_warning")); } elseif($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') { + $this->contentContainerEnd(); if($workflowmode == 'traditional') { - $this->contentContainerEnd(); $this->contentSubHeading(getMLText("assign_reviewers")); $this->contentContainerStart(); @@ -697,11 +697,10 @@ console.log(params); } } } - $this->contentContainerEnd(); $this->warningMsg(getMLText("add_doc_reviewer_approver_warning")); } else { - $this->contentContainerEnd(); } + $this->contentContainerEnd(); $this->columnEnd(); $this->rowEnd(); $this->formSubmit(" ".getMLText('add_document')); From 798a52ed37a081abd26dd95f4dc18be971847880 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Mon, 24 Apr 2023 16:58:48 +0200 Subject: [PATCH 2/2] make set button for ranges 'primary' --- views/bootstrap/class.Search.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php index 1bf66fc8e..87d39fc66 100644 --- a/views/bootstrap/class.Search.php +++ b/views/bootstrap/class.Search.php @@ -1096,6 +1096,7 @@ $(document).ready(function() { $dispname = $attrdef->getName(); switch($attrdef->getType()) { case SeedDMS_Core_AttributeDefinition::type_int: + case SeedDMS_Core_AttributeDefinition::type_float: /* See below on an explaination for the if statement */ if($values && (count($values) > 1 || reset($values) < $total)) { if(empty($allparams['attributes'][$facetname]['from']) && empty($allparams['attributes'][$facetname]['to'])) { @@ -1105,7 +1106,7 @@ $(document).ready(function() { $content .= ''; $content .= ' to '; $content .= ''; - $content .= ''; + $content .= ''; $content .= ''; $this->printAccordion($dispname, $content); }