diff --git a/op/op.UsrMgr.php b/op/op.UsrMgr.php index 63ed65b01..70029a17b 100644 --- a/op/op.UsrMgr.php +++ b/op/op.UsrMgr.php @@ -94,10 +94,13 @@ if ($action == "adduser") { } else UI::exitError(getMLText("admin_tools"),getMLText("access_denied")); - if(isset($_POST["workflow"])) { - $workflow = $dms->getWorkflow($_POST["workflow"]); - if($workflow) - $newUser->setMandatoryWorkflow($workflow); + if(isset($_POST["workflows"]) && $_POST["workflows"]) { + $workflows = array(); + foreach($_POST["workflows"] as $workflowid) + if($tmp = $dms->getWorkflow($workflowid)) + $workflows[] = $tmp; + if($workflows) + $newUser->setMandatoryWorkflows($workflows); } if (isset($_POST["usrReviewers"])){ @@ -245,13 +248,14 @@ else if ($action == "edituser") { if(!$isDisabled) $editedUser->clearLoginFailures(); } - if(isset($_POST["workflow"]) && $_POST["workflow"]) { - $currworkflow = $editedUser->getMandatoryWorkflow(); - if (!$currworkflow || ($currworkflow->getID() != $_POST["workflow"])) { - $workflow = $dms->getWorkflow($_POST["workflow"]); - if($workflow) - $editedUser->setMandatoryWorkflow($workflow); + if(isset($_POST["workflows"]) && $_POST["workflows"]) { + $workflows = array(); + foreach($_POST["workflows"] as $workflowid) { + if($tmp = $dms->getWorkflow($workflowid)) + $workflows[] = $tmp; } + if($workflows) + $editedUser->setMandatoryWorkflows($workflows); } else { $editedUser->delMandatoryWorkflow(); } diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php index 849e77e9b..1c52b6e8c 100644 --- a/views/bootstrap/class.UsrMgr.php +++ b/views/bootstrap/class.UsrMgr.php @@ -374,12 +374,15 @@ $(document).ready( function() {
:
- ".""; + $mandatoryworkflows = $currUser ? $currUser->getMandatoryWorkflows() : array(); foreach ($workflows as $workflow) { print ""; }