Merge branch 'master' into dist/envole/6/master
This commit is contained in:
commit
a78b2051f1
|
@ -41,7 +41,7 @@ class BookmarkController extends Controller
|
||||||
$user=$pagewidget->getPage()->getUser();
|
$user=$pagewidget->getPage()->getUser();
|
||||||
if($user!=$this->getUser()) throw $this->createNotFoundException('Permission denied');
|
if($user!=$this->getUser()) throw $this->createNotFoundException('Permission denied');
|
||||||
}
|
}
|
||||||
else {
|
elseif($usage=="group") {
|
||||||
$groupentity=$this->getDoctrine()->getRepository("CadolesCoreBundle:Group")->find($group);
|
$groupentity=$this->getDoctrine()->getRepository("CadolesCoreBundle:Group")->find($group);
|
||||||
$usergroup=$this->getDoctrine()->getRepository("CadolesCoreBundle:UserGroup")->findoneby(["user"=>$this->getUser(),"group"=>$groupentity]);
|
$usergroup=$this->getDoctrine()->getRepository("CadolesCoreBundle:UserGroup")->findoneby(["user"=>$this->getUser(),"group"=>$groupentity]);
|
||||||
if(!$usergroup or $usergroup->getRolegroup()<50) throw $this->createNotFoundException('Permission denied');
|
if(!$usergroup or $usergroup->getRolegroup()<50) throw $this->createNotFoundException('Permission denied');
|
||||||
|
|
Binary file not shown.
After Width: | Height: | Size: 5.9 KiB |
Loading…
Reference in New Issue