diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php index 80f0ee62a..871716492 100644 --- a/views/bootstrap/class.AddDocument.php +++ b/views/bootstrap/class.AddDocument.php @@ -512,8 +512,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(); @@ -752,13 +752,12 @@ console.log(params); } } } - $this->contentContainerEnd(); $this->warningMsg(getMLText("add_doc_reviewer_approver_warning")); } else { - $this->contentContainerEnd(); } if($enablereceiptworkflow) { + $this->contentContainerEnd(); $this->contentSubHeading(getMLText("assign_recipients")); $this->contentContainerStart(); $options = array(); @@ -813,9 +812,9 @@ console.log(params); ) ); - $this->contentContainerEnd(); } + $this->contentContainerEnd(); $this->columnEnd(); $this->rowEnd(); $this->formSubmit(" ".getMLText('add_document')); diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php index b4c66001f..2dc7eae9a 100644 --- a/views/bootstrap/class.Search.php +++ b/views/bootstrap/class.Search.php @@ -1116,6 +1116,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'])) { @@ -1125,7 +1126,7 @@ $(document).ready(function() { $content .= ''; $content .= ' to '; $content .= ''; - $content .= ''; + $content .= ''; $content .= ''; $this->printAccordion($dispname, $content); }