Merge branch 'master' into dist/envole/6/master

2021-03-26 10:40:39 +01:00 · 2021-03-26 10:40:39 +01:00 · 3b6095cec7
commit 3b6095cec7
parent 75925d4969 04272afa3d
1 changed files with 3 additions and 1 deletions
--- a/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/CalendareventShareType.php
+++ b/src/ninegate-1.0/src/Cadoles/PortalBundle/Form/CalendareventShareType.php
@ -35,8 +35,10 @@ class CalendareventShareType extends AbstractType
                              ->where('g.fgcanshare=:fgcanshare')
                              ->andWhere('g=ug.group')
                              ->andWhere('ug.user=:user')
+                              ->andWhere('ug.rolegroup>=:role')
                              ->setParameter('fgcanshare',true)
-                              ->setParameter('user',$user);
+                              ->setParameter('user',$user)
+                              ->setParameter('role',90);
                },
                'choice_label'  => 'label',
                'multiple'      => true,