Cadoles
/
ninegate
20
0
Fork 0
Code Issues 29 Pull Requests Projects 1 Releases Wiki Activity

pb sur propriétaire de groupe

This commit is contained in:
afornerot 2019-12-16 17:03:53 +01:00
parent c702a4b0d2
commit 1eacaeea9a
1 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php
View File

@ -703,6 +703,7 @@ class GroupController extends Controller
$data->setFgtemplate(false);
if($data->getLdapfilter()!="") $data->setFgopen(false);
if($data->getAttributes()!="") $data->setFgopen(false);
if($access=="user") $data->setOwner($this->getUser());
// Icon
$idicon = $form->get('idicon')->getData();
@ -713,20 +714,6 @@ class GroupController extends Controller
$em->persist($data);
$em->flush();
// Si acces par user on ajoute forcement le owner comme membre du groupe en tant que manager
/*
if($access=="user") {
$key = Uuid::uuid4();
$usergroup=new Usergroup;
$usergroup->setUser($this->getUser());
$usergroup->setGroup($data);
$usergroup->setFgmanager(true);
$usergroup->setKeyvalue($key);
$em->persist($usergroup);
$em->flush();
}
*/
// On s'assure que le propriétaire est bien membre du groupe
$this->ctrlOwner($data);
@ -932,7 +919,7 @@ class GroupController extends Controller
protected function ctrlOwner($group) {
$em = $this->getDoctrine()->getManager();
if($group->getOwner()) {
$usergroup=$em->getRepository("CadolesCoreBundle:Usergroup")->findOneBy(["user"=>$group->getOwner()]);
$usergroup=$em->getRepository("CadolesCoreBundle:Usergroup")->findOneBy(["group"=>$group,"user"=>$group->getOwner()]);
if(!$usergroup) {
$key = Uuid::uuid4();
$usergroup=new Usergroup;
@ -1038,7 +1025,7 @@ class GroupController extends Controller
if($tmp) $form->addError(new FormError('Un niveau de rang 02 utilise déjà ce label'));
// On s'assure que le label ne contient pas des caractères speciaux
$string = preg_replace('~[^@a-zA-Z0-9._-]~', '', $data->getLabel());
$string = preg_replace('~[^ @a-zA-Z0-9._-]~', '', $data->getLabel());
if($string!=$data->getLabel())
{
$form->addError(new FormError('Caractères interdit dans ce label'));