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

put reviewer and approver into own content container

Browse Source
This commit is contained in:
Uwe Steinmann 2023-03-30 12:26:35 +02:00
parent 476c726a45
commit 23a94f8ac8
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -446,7 +446,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) {
@ -494,6 +493,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();
@ -699,6 +699,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();
} }
$this->columnEnd(); $this->columnEnd();
$this->rowEnd(); $this->rowEnd();

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

@ -329,10 +329,13 @@ console.log(element);
) )
); );
} }
$this->contentContainerEnd();
$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) {
@ -480,9 +483,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) {
@ -631,9 +636,11 @@ console.log(element);
} }
} }
} }
$this->contentContainerEnd();
$this->warningMsg(getMLText("add_doc_reviewer_approver_warning")); $this->warningMsg(getMLText("add_doc_reviewer_approver_warning"));
} else {
$this->contentContainerEnd();
} }
$this->contentContainerEnd();
$this->formSubmit(getMLText('update_document')); $this->formSubmit(getMLText('update_document'));
?> ?>
</form> </form>