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

backport assigning processes to other user

Browse Source
This commit is contained in:
Uwe Steinmann 2022-05-06 09:54:55 +02:00
parent 5950be6292
commit dbb2340269
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
op/op.UsrMgr.php
View File

@ -209,6 +209,15 @@ else if ($action == "removefromprocesses") {
UI::exitError(getMLText("admin_tools"),getMLText("cannot_delete_yourself")); UI::exitError(getMLText("admin_tools"),getMLText("cannot_delete_yourself"));
} }
if(!empty($_POST["assignTo"])) {
$userToAssign = $dms->getUser($_POST["assignTo"]);
if (!is_object($userToAssign)) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_user_id"));
}
} else {
$userToAssign = null;
}
$userToRemove = $dms->getUser($userid); $userToRemove = $dms->getUser($userid);
if (!is_object($userToRemove)) { if (!is_object($userToRemove)) {
UI::exitError(getMLText("admin_tools"),getMLText("invalid_user_id")); UI::exitError(getMLText("admin_tools"),getMLText("invalid_user_id"));

24
views/bootstrap/class.RemoveUserFromProcesses.php
View File

@ -193,9 +193,9 @@ $(document).ready( function() {
$this->pageNavigation(getMLText("admin_tools"), "admin_tools"); $this->pageNavigation(getMLText("admin_tools"), "admin_tools");
$this->contentHeading(getMLText("rm_user_from_processes")); $this->contentHeading(getMLText("rm_user_from_processes"));
$this->warningMsg(getMLText("confirm_rm_user_from_processes", array ("username" => htmlspecialchars($rmuser->getFullName()))));
$this->rowStart(); $this->rowStart();
$this->columnStart(4); $this->columnStart(4);
$this->warningMsg(getMLText("confirm_rm_user_from_processes", array ("username" => htmlspecialchars($rmuser->getFullName()))));
$reviewStatus = $rmuser->getReviewStatus(); $reviewStatus = $rmuser->getReviewStatus();
$tmpr = array(); $tmpr = array();
@ -295,24 +295,26 @@ $(document).ready( function() {
} }
echo "</table>"; echo "</table>";
/* $this->infoMsg(getMLText("info_rm_user_from_processes_user"));
$options = array();
$allUsers = $dms->getAllUsers($sortusersinlist); $options = array(array(0, getMLText('do_no_transfer_to_user')));
foreach ($allUsers as $currUser) { foreach ($allusers as $currUser) {
if (!$currUser->isGuest()) if ($currUser->isGuest() || ($currUser->getID() == $rmuser->getID()) )
$options[] = array($currUser->getID(), htmlspecialchars($currUser->getLogin()), ($currUser->getID()==$user->getID()), array(array('data-subtitle', htmlspecialchars($currUser->getFullName())))); continue;
if ($rmuser && $currUser->getID()==$rmuser->getID()) $selected=$count;
$options[] = array($currUser->getID(), htmlspecialchars($currUser->getLogin()." - ".$currUser->getFullName()));
} }
$this->formField( $this->formField(
getMLText("user"), getMLText("transfer_process_to_user"),
array( array(
'element'=>'select', 'element'=>'select',
'id'=>'newuser', 'name'=>'assignTo',
'name'=>'newuserid',
'class'=>'chzn-select', 'class'=>'chzn-select',
'options'=>$options 'options'=>$options
) )
); );
*/
$this->formSubmit("<i class=\"fa fa-remove\"></i> ".getMLText('rm_user_from_processes')); $this->formSubmit("<i class=\"fa fa-remove\"></i> ".getMLText('rm_user_from_processes'));
?> ?>