Commit 54a381027a8ea6022787bd9b3ac8fc5e2cfd7036
1 parent
79e4717b
Exists in
master
and in
3 other branches
Version: 2.4.3.8
Ajout informations debug - Utilisateur LDAP Version majeure en cours (2.5): https://projects.irap.omp.eu/versions/99 ROADMAP: https://projects.irap.omp.eu/projects/labinvent/roadmap
Showing
5 changed files
with
11 additions
and
6 deletions
Show diff stats
README-LABINVENT.md
| ... | ... | @@ -50,10 +50,10 @@ Logiciel testé et validé sur les configurations suivantes : |
| 50 | 50 | |
| 51 | 51 | VERSION ACTUELLE |
| 52 | 52 | |
| 53 | -Date: 10/06/2016 | |
| 54 | -Version: 2.4.3.7 | |
| 53 | +Date: 13/06/2016 | |
| 54 | +Version: 2.4.3.8 | |
| 55 | 55 | |
| 56 | -Ajout utilisateur - Mode ldap --> Bugfixes utilisateur sans mail | |
| 56 | +Ajout informations debug - Utilisateur LDAP | |
| 57 | 57 | |
| 58 | 58 | Version majeure en cours (2.5): https://projects.irap.omp.eu/versions/99 |
| 59 | 59 | ... | ... |
src/Controller/AppController.php
| ... | ... | @@ -156,6 +156,9 @@ class AppController extends Controller |
| 156 | 156 | } |
| 157 | 157 | $this->set('username', $this->LdapAuth->user('givenname')[0].' '.$this->LdapAuth->user('sn')[0]); |
| 158 | 158 | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 159 | 162 | $configuration = TableRegistry::get('Configurations')->find()->where(['id =' => 1])->first(); |
| 160 | 163 | $this->set('configuration', $configuration); |
| 161 | 164 | $this->request->session()->write("authType", $configuration->authentificationType_ldap); |
| ... | ... | @@ -169,6 +172,7 @@ class AppController extends Controller |
| 169 | 172 | echo '<tr><td><strong>'.$nom.' </strong></td><td>'.$valeur.'</td></tr>'; |
| 170 | 173 | }; |
| 171 | 174 | $this->set('displayElement', $displayElement); |
| 175 | + | |
| 172 | 176 | } |
| 173 | 177 | |
| 174 | 178 | // "le materiel", "le suivi"... | ... | ... |
src/Controller/MaterielsController.php
| ... | ... | @@ -152,8 +152,6 @@ class MaterielsController extends AppController |
| 152 | 152 | } |
| 153 | 153 | |
| 154 | 154 | |
| 155 | - $this->myDebug($this); | |
| 156 | - | |
| 157 | 155 | $this->paginate = [ |
| 158 | 156 | 'contain' => ['SurCategories', 'Categories', 'SousCategories', 'GroupesThematiques', 'GroupesMetiers', 'Organismes', 'Sites'], |
| 159 | 157 | 'order' => ['Materiels.numero_laboratoire' => 'desc'] | ... | ... |
src/Controller/UsersController.php
| ... | ... | @@ -83,6 +83,9 @@ class UsersController extends AppController |
| 83 | 83 | ]; |
| 84 | 84 | $users = $this->paginate($this->Users); |
| 85 | 85 | |
| 86 | + //Affichage informations disponible pour l'utilisateur connecté | |
| 87 | + $this->myDebug($this->LdapAuth->user()); | |
| 88 | + | |
| 86 | 89 | $this->set(compact('users')); |
| 87 | 90 | $this->set('_serialize', ['users']); |
| 88 | 91 | } | ... | ... |
src/Template/Layout/default.ctp
| ... | ... | @@ -94,7 +94,7 @@ $cakeDescription = 'Labinvent 2.0'; |
| 94 | 94 | </i></td> |
| 95 | 95 | <td id="version"> |
| 96 | 96 | <!-- VERSION M.m.f.b (version (M)ajeure, version (m)ineure, numero de nouvelle (f)onctionnalite, numero de (b)ugfix) --> |
| 97 | - <font color="black">VERSION 2.4.3.6 (10/06/2016)</font> | |
| 97 | + <font color="black">VERSION 2.4.3.8 (13/06/2016)</font> | |
| 98 | 98 | </td> |
| 99 | 99 | </tr> |
| 100 | 100 | </table> | ... | ... |