gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-11 20:21:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2023-04-24 17:07:17 +02:00
commit d7eeacdc74
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
views/bootstrap/class.AddDocument.php
View File

@ -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("<i class=\"fa fa-save\"></i> ".getMLText('add_document'));

3
views/bootstrap/class.Search.php
View File

@ -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 .= '<input type="number" class="form-control" name="attributes['.$facetname.'][from]" value="" placeholder="min is '.min($tt).'" />';
$content .= '<span class="input-group-text" style="border-left: 0; border-right: 0;"> to </span>';
$content .= '<input type="number" class="form-control" name="attributes['.$facetname.'][to]" value="" placeholder="max is '.max($tt).'" />';
$content .= '<button class="btn btn-outline-secondary" type="submit">Set</button>';
$content .= '<button class="btn btn-primary" type="submit">Set</button>';
$content .= '</div>';
$this->printAccordion($dispname, $content);
}