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

This commit is contained in:
Uwe Steinmann 2020-09-25 09:24:44 +02:00
commit c2df7a2421

View File

@ -210,8 +210,8 @@ $(document).ready( function() {
if(!in_array($seluser->getID(), $undeluserids) && $accessobject->check_view_access('RemoveUser')) { if(!in_array($seluser->getID(), $undeluserids) && $accessobject->check_view_access('RemoveUser')) {
$menuitems['removeuser'] = array('link'=>$this->html_url('RemoveUser', array('userid'=>$seluser->getID())), 'label'=>'<i class="fa fa-remove"></i> '.getMLText("rm_user")); $menuitems['removeuser'] = array('link'=>$this->html_url('RemoveUser', array('userid'=>$seluser->getID())), 'label'=>'<i class="fa fa-remove"></i> '.getMLText("rm_user"));
} }
$menuitems['removeuserfromprozess'] = array('link'=>$this->html_url('RemoveUserFromProcesses', array('userid'=>$seluser->getID())), 'label'=>'<i class="fa fa-remove"></i> '.getMLText("rm_user_from_processes")); $menuitems['removeuserfromprozess'] = array('link'=>$this->html_url('RemoveUserFromProcesses', array('userid'=>$seluser->getID())), 'label'=>'<i class="fa fa-unlink"></i> '.getMLText("rm_user_from_processes"));
$menuitems['transferobjects'] = array('link'=>$this->html_url('TransferObjects', array('userid'=>$seluser->getID())), 'label'=>'<i class="fa fa-share-o"></i> '.getMLText("transfer_objects")); $menuitems['transferobjects'] = array('link'=>$this->html_url('TransferObjects', array('userid'=>$seluser->getID())), 'label'=>'<i class="fa fa-share-square-o"></i> '.getMLText("transfer_objects"));
if($user->isAdmin() && $seluser->getID() != $user->getID()) if($user->isAdmin() && $seluser->getID() != $user->getID())
$menuitems['substituteuser'] = array('link'=>'../op/op.SubstituteUser.php?userid='.$seluser->getID().'&formtoken='.createFormKey('substituteuser'), 'label'=>'<i class="fa fa-exchange"></i> '.getMLText("substitute_user")); $menuitems['substituteuser'] = array('link'=>'../op/op.SubstituteUser.php?userid='.$seluser->getID().'&formtoken='.createFormKey('substituteuser'), 'label'=>'<i class="fa fa-exchange"></i> '.getMLText("substitute_user"));
if($enableemail) if($enableemail)