Etienne Pallier / labinvent

Commit 8eb47d086c39928129fa942d4f47e61fa8f9eab8

Authored by Alexandre
1 parent 6f74ba5c
Exists in master and in 3 other branches dev, dev-IRAP, dev-LATMOS

Version: 2.5.3.1 

bugfixes
	   
Version majeure en cours (2.5): https://projects.irap.omp.eu/versions/99

ROADMAP: https://projects.irap.omp.eu/projects/labinvent/roadmap
Showing 3 changed files with 4 additions and 7 deletions   Show diff stats
Inline Side-by-side
README-LABINVENT.md
  Diff comments   View file @8eb47d0
... ... @@ -51,12 +51,9 @@ Logiciel testé et validé sur les configurations suivantes :
51 51 VERSION ACTUELLE
52 52  
53 53 Date: 29/06/2016
54   -Version: 2.5.3.0
  54 +Version: 2.5.3.1
55 55  
56   -ajout "administrer" form materiels + index "mes materiels"
57   -
58   -Demande (terminé) : https://projects.irap.omp.eu/issues/3906
59   - https://projects.irap.omp.eu/issues/3916
  56 +bugfixes
60 57  
61 58 Version majeure en cours (2.5): https://projects.irap.omp.eu/versions/99
62 59  
... ...
src/Controller/MaterielsController.php
  Diff comments   View file @8eb47d0
... ... @@ -191,7 +191,7 @@ class MaterielsController extends AppController
191 191 }
192 192  
193 193  
194   - if(in_array($this->role, ['Utilisateur', 'Responsable']) && $condition != '') {
  194 + if(in_array($this->role, ['Utilisateur', 'Responsable']) && $condition == '') {
195 195 $condition = ['Materiels.status !=' => 'ARCHIVED'];
196 196 }
197 197  
... ...
src/Template/Layout/default.ctp
  Diff comments   View file @8eb47d0
... ... @@ -94,7 +94,7 @@ $cakeDescription = 'Labinvent 2';
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.5.3.0 (29/06/2016)</font>
  97 + <font color="black">VERSION 2.5.3.1 (29/06/2016)</font>
98 98 </td>
99 99 </tr>
100 100 </table>
... ...