Merge branch 'master' into dist/envole/6/master
This commit is contained in:
commit
5adab0951c
|
@ -78,7 +78,6 @@ class CoreController extends Controller
|
||||||
foreach($fields as $key => $field) {
|
foreach($fields as $key => $field) {
|
||||||
// Si champs obligatoire
|
// Si champs obligatoire
|
||||||
if($field["perm"]==2) {
|
if($field["perm"]==2) {
|
||||||
dump($key);
|
|
||||||
switch($key) {
|
switch($key) {
|
||||||
case "firstname": if($user->getFirstname()=="") $toprofil=true; break;
|
case "firstname": if($user->getFirstname()=="") $toprofil=true; break;
|
||||||
case "visible": if($user->getVisible()=="") $toprofil=true; break;
|
case "visible": if($user->getVisible()=="") $toprofil=true; break;
|
||||||
|
@ -96,7 +95,6 @@ class CoreController extends Controller
|
||||||
case "birthcountry": if($user->getBirthcountry()=="") $toprofil=true; break;
|
case "birthcountry": if($user->getBirthcountry()=="") $toprofil=true; break;
|
||||||
case "birthplace": if($user->getBirthplace()=="") $toprofil=true; break;
|
case "birthplace": if($user->getBirthplace()=="") $toprofil=true; break;
|
||||||
}
|
}
|
||||||
dump($toprofil);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1963,7 +1963,6 @@ class PagewidgetController extends Controller
|
||||||
if($usage!="group"||!$group) {
|
if($usage!="group"||!$group) {
|
||||||
$group=$em->getRepository("CadolesCoreBundle:Group")->findOneBy(["fgall"=>true])->getId();
|
$group=$em->getRepository("CadolesCoreBundle:Group")->findOneBy(["fgall"=>true])->getId();
|
||||||
}
|
}
|
||||||
dump($group);
|
|
||||||
|
|
||||||
// Render
|
// Render
|
||||||
return $this->render($this->labelentity.':viewchat.html.twig', [
|
return $this->render($this->labelentity.':viewchat.html.twig', [
|
||||||
|
|
Loading…
Reference in New Issue