diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php
index f60ffc2e..fd139666 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php
@@ -494,6 +494,13 @@ class GroupController extends Controller
$datas=$qb->setFirstResult($start)->setMaxResults($length)->getQuery()->getResult();
$user=$this->getUser();
+ $config=$em->getRepository('CadolesCoreBundle:Config')->find("datausers");
+ $fields=$config->getValue();
+ $fields=json_decode($fields,true);
+ if(!is_array($fields)) $fields=[];
+ if(!array_key_exists("visite",$fields)) $fields["visite"]["perm"]=0;
+ $fgviewvisite=($fields["visite"]["perm"]==1);
+
foreach($datas as $data) {
// Propriétaire
$usergroup=$em->getRepository("CadolesCoreBundle:UserGroup")->findOneBy(["user"=>$data->getId(),"group"=>$id]);
@@ -522,12 +529,18 @@ class GroupController extends Controller
}
// Visite
- $visite="";
- if($usergroup->getVisitedate()) {
- $visite=$usergroup->getVisitedate()->format("d/m/Y H:i")."
nb = ".$usergroup->getVisitecpt();
+ if($fgviewvisite) {
+ $visite="";
+ if($usergroup->getVisitedate()) {
+ $visite=$usergroup->getVisitedate()->format("d/m/Y H:i")."
nb = ".$usergroup->getVisitecpt();
+ }
}
+ if($fgviewvisite)
+ $tmp=array("DT_RowId"=>"user".$data->getId(),$action,$avatar,$data->getUsername(),$data->getEmail(),$visite,$rolegroup);
+ else
+ $tmp=array("DT_RowId"=>"user".$data->getId(),$action,$avatar,$data->getUsername(),$data->getEmail(),$rolegroup);
- array_push($output["data"],array("DT_RowId"=>"user".$data->getId(),$action,$avatar,$data->getUsername(),$data->getEmail(),$visite,$rolegroup));
+ array_push($output["data"],$tmp);
}
// Retour
@@ -1018,6 +1031,14 @@ class GroupController extends Controller
// idreturn ?
$idreturn=$request->get("idreturn");
+ $em = $this->getDoctrine()->getManager();
+ $config=$em->getRepository('CadolesCoreBundle:Config')->find("datausers");
+ $fields=$config->getValue();
+ $fields=json_decode($fields,true);
+ if(!is_array($fields)) $fields=[];
+ if(!array_key_exists("visite",$fields)) $fields["visite"]["perm"]=0;
+ $fgviewvisite=($fields["visite"]["perm"]==1);
+
// Affichage du formulaire
return $this->render($this->labelentity.':users.html.twig', [
'useheader' => true,
@@ -1026,6 +1047,7 @@ class GroupController extends Controller
'access' => $access,
$this->labeldata => $data,
'idreturn' => $idreturn,
+ 'fgviewvisite' => $fgviewvisite,
]);
}
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php
index fe9c4613..3e67d727 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php
@@ -841,12 +841,15 @@ class UserController extends Controller
public function viewAction($id, Request $request)
{
$user=$this->getData($id);
+ $fields=$this->getDefaultDatauser();
return $this->render('CadolesCoreBundle:User:view.html.twig', [
'useheader' => false,
'usemenu' => false,
'usesidebar' => false,
- "user" => $user
+ 'user' => $user,
+ 'fields' => $fields,
+
]);
}
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/users.html.twig b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/users.html.twig
index b0ef7f1e..a66b182c 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/users.html.twig
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/views/Group/users.html.twig
@@ -36,7 +36,9 @@