gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-06 23:24:57 +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-03-30 12:28:54 +02:00
commit cb808e0e66
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -466,7 +466,6 @@ console.log(params);
echo $arrs; echo $arrs;
} }
$this->contentContainerEnd();
if($workflowmode == 'advanced') { if($workflowmode == 'advanced') {
$mandatoryworkflows = $user->getMandatoryWorkflows(); $mandatoryworkflows = $user->getMandatoryWorkflows();
if($mandatoryworkflows) { if($mandatoryworkflows) {
@ -514,6 +513,7 @@ console.log(params);
$this->warningMsg(getMLText("add_doc_workflow_warning")); $this->warningMsg(getMLText("add_doc_workflow_warning"));
} elseif($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') { } elseif($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
if($workflowmode == 'traditional') { if($workflowmode == 'traditional') {
$this->contentContainerEnd();
$this->contentSubHeading(getMLText("assign_reviewers")); $this->contentSubHeading(getMLText("assign_reviewers"));
$this->contentContainerStart(); $this->contentContainerStart();
@ -754,6 +754,8 @@ console.log(params);
} }
$this->contentContainerEnd(); $this->contentContainerEnd();
$this->warningMsg(getMLText("add_doc_reviewer_approver_warning")); $this->warningMsg(getMLText("add_doc_reviewer_approver_warning"));
} else {
$this->contentContainerEnd();
} }
if($enablereceiptworkflow) { if($enablereceiptworkflow) {

8
views/bootstrap/class.UpdateDocument.php
View File

@ -338,11 +338,14 @@ console.log(element);
) )
); );
} }
$this->contentContainerEnd();
if($settings->_initialDocumentStatus == S_RELEASED) if($settings->_initialDocumentStatus == S_RELEASED)
$this->warningMsg(getMLText("add_doc_workflow_warning")); $this->warningMsg(getMLText("add_doc_workflow_warning"));
} elseif($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') { } elseif($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
if($workflowmode == 'traditional') { if($workflowmode == 'traditional') {
$this->contentContainerEnd();
$this->contentSubHeading(getMLText("assign_reviewers")); $this->contentSubHeading(getMLText("assign_reviewers"));
$this->contentContainerStart();
$res=$user->getMandatoryReviewers(); $res=$user->getMandatoryReviewers();
$options = array(); $options = array();
foreach ($docAccess["users"] as $usr) { foreach ($docAccess["users"] as $usr) {
@ -508,9 +511,11 @@ console.log(element);
} }
} }
} }
$this->contentContainerEnd();
} }
$this->contentSubHeading(getMLText("assign_approvers")); $this->contentSubHeading(getMLText("assign_approvers"));
$this->contentContainerStart();
$options = array(); $options = array();
$res=$user->getMandatoryApprovers(); $res=$user->getMandatoryApprovers();
foreach ($docAccess["users"] as $usr) { foreach ($docAccess["users"] as $usr) {
@ -676,7 +681,10 @@ console.log(element);
} }
} }
} }
$this->contentContainerEnd();
$this->warningMsg(getMLText("add_doc_reviewer_approver_warning")); $this->warningMsg(getMLText("add_doc_reviewer_approver_warning"));
} else {
$this->contentContainerEnd();
} }
if($enablereceiptworkflow) { if($enablereceiptworkflow) {
$options = array(); $options = array();