diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql
index 6d0b91d6..b14c05b0 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Command/data/core-init-01.sql
@@ -8,7 +8,7 @@ INSERT IGNORE INTO `niveau01` (`id`, `label`, `siren`) VALUES
(-100, 'DRAAF', '130007107');
INSERT IGNORE INTO `user` (`id`, `niveau01_id`, `username`, `firstname`, `lastname`, `password`, `email`, `avatar`, `role`,`siren`,`authlevel`) VALUES
-(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}p8HoeQaUHjlX567Zu5prmDTjQMcKv6zu
+(-100, -100, 'admin', 'Administrateur', 'draaf', '{SSHA}wVosXEVYfrthFQKc0AqqOtZZXDWT3re1
', 'admin@ldapbundle.ac-arno.fr', 'admin.jpg', 'ROLE_ADMIN', '130007107', 'simple');
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/CoreController.php b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/CoreController.php
index d2c6755a..6609b157 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/CoreController.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/CoreController.php
@@ -76,6 +76,7 @@ class CoreController extends Controller
foreach($fields as $key => $field) {
// Si champs obligatoire
if($field["perm"]==2) {
+ dump($key);
switch($key) {
case "firstname": if($user->getFirstname()=="") $toprofil=true; break;
case "visible": if($user->getVisible()=="") $toprofil=true; break;
@@ -93,12 +94,13 @@ class CoreController extends Controller
case "birthcountry": if($user->getBirthcountry()=="") $toprofil=true; break;
case "birthplace": if($user->getBirthplace()=="") $toprofil=true; break;
}
+ dump($toprofil);
}
}
}
if($toprofil) {
- return $this->redirect($this->generateUrl('cadoles_core_profil',array("info"=>"Merci de compléter votre profil")));
+ return $this->redirect($this->generateUrl('cadoles_core_user',array("info"=>"Merci de compléter votre profil")));
}
}
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 6359fd22..4a60d0b9 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/GroupController.php
@@ -188,7 +188,7 @@ class GroupController extends Controller
$userinfo="";
if($data->getOwner()) {
- $userinfo.="getOwner()->getAvatar()."' class='avatar' style='margin:0px 5px 0px 0px;display:inline-block;'>";
+ $userinfo.="
getOwner()->getAvatar()."' class='avatar' style='margin:0px 5px 0px 0px;display:inline-block;'>";
$userinfo.=$data->getOwner()->getUsername();
}
@@ -331,7 +331,7 @@ class GroupController extends Controller
$fgmanager="";
// Avatar
- $avatar="
getAvatar()."' style='width:30px;background-color:#337ab7;margin:auto;display:block;'>";
+ $avatar="
getAvatar()."' style='width:30px;background-color:#337ab7;margin:auto;display:block;cursor:pointer;'>";
array_push($output["data"],array("DT_RowId"=>"user".$data->getId(),$action,$avatar,$data->getUsername(),$data->getEmail(),$fgmanager));
}
@@ -463,7 +463,7 @@ class GroupController extends Controller
$action.="";
// Avatar
- $avatar="
getAvatar()."' style='width:30px;background-color:#337ab7;margin:auto;display:block;'>";
+ $avatar="
getAvatar()."' style='width:30px;background-color:#337ab7;margin:auto;display:block;cursor:pointer'>";
// Flag manager
$fgmanager="";
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 55353335..c76d3647 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Controller/UserController.php
@@ -270,7 +270,7 @@ class UserController extends Controller
$tmp=array();
if($access=="config") array_push($tmp,$action);
- array_push($tmp,"
getAvatar()."' class='avatar' style='margin:auto;display:block;'>");
+ array_push($tmp,"
getAvatar()."' class='avatar' style='margin:auto;display:block;'>");
array_push($tmp,$data->getUsername());
array_push($tmp,$data->getLastname());
array_push($tmp,$data->getFirstname());
@@ -735,7 +735,17 @@ class UserController extends Controller
return $this->updateAction($user->getId(),"user",$request);
}
+ public function viewAction($id, Request $request)
+ {
+ $user=$this->getData($id);
+ return $this->render('CadolesCoreBundle:User:view.html.twig', [
+ 'useheader' => false,
+ 'usemenu' => false,
+ 'usesidebar' => false,
+ "user" => $user
+ ]);
+ }
public function importuserAction(Request $request) {
if($this->GetParameter("masteridentity")!="SQL")
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/routing.yml b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/routing.yml
index b63b1f09..b6fc83ec 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/routing.yml
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/config/routing.yml
@@ -265,6 +265,10 @@ cadoles_core_user_users:
path: /user/users
defaults: { _controller: CadolesCoreBundle:User:list, access: user }
+cadoles_core_user_view:
+ path: /user/view/{id}
+ defaults: { _controller: CadolesCoreBundle:User:view }
+
#== Niveau01 =============================================================================================================
cadoles_core_config_niveau01:
diff --git a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/local.js b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/local.js
index 46cf9921..abb65545 100644
--- a/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/local.js
+++ b/src/ninegate-1.0/src/Cadoles/CoreBundle/Resources/public/themes/transnum/local.js
@@ -3,24 +3,34 @@
// Instance the tour
function MyTour() {
+ var template="