Commit c6d60f4e5a418706ce3e1f6dca8ef8f5a5126bcb
Exists in
master
and in
3 other branches
résolution conflit de pull
Showing
6 changed files
with
15 additions
and
12 deletions
Show diff stats
README-LABINVENT.md
| ... | ... | @@ -53,16 +53,18 @@ Logiciel testé et validé sur les configurations suivantes : |
| 53 | 53 | |
| 54 | 54 | VERSION ACTUELLE |
| 55 | 55 | |
| 56 | -Date: 19/06/2017 | |
| 57 | -Version: 2.6.6 | |
| 58 | - -> Bugfixes add/edit dates materiels | |
| 59 | -- ATTENTION : Mise à jour de la base de données requise (cf database/update) | |
| 56 | +Date: 20/06/2017 | |
| 57 | +Version: 2.6.8 | |
| 58 | + -> Bugfixes materiels/index (boutons admin inactifs) | |
| 60 | 59 | |
| 61 | 60 | Version majeure en cours (2.6): https://projects.irap.omp.eu/versions/161 |
| 62 | 61 | |
| 63 | 62 | ROADMAP: https://projects.irap.omp.eu/projects/labinvent/roadmap |
| 64 | 63 | |
| 65 | 64 | ----------------------------------------------------------------------------------------------------------- |
| 65 | +A copier/coller au cas où, si nécessaire : | |
| 66 | +- ATTENTION : Mise à jour de la base de données requise (cf database/update) | |
| 67 | +----------------------------------------------------------------------------------------------------------- | |
| 66 | 68 | |
| 67 | 69 | CHANGEMENTS IMPORTANTS (MILESTONES) |
| 68 | 70 | ... | ... |
src/Template/Layout/default.ctp
| ... | ... | @@ -101,7 +101,7 @@ $cakeDescription = 'Labinvent 2'; |
| 101 | 101 | </i></td> |
| 102 | 102 | <td id="version"> |
| 103 | 103 | <!-- VERSION M.m.f.b (version (M)ajeure, version (m)ineure, numero de nouvelle (f)onctionnalite, numero de (b)ugfix) --> |
| 104 | - <font color="black">VERSION 2.6.6 (19/06/2017)</font> | |
| 104 | + <font color="black">VERSION 2.6.8 (20/06/2017)</font> | |
| 105 | 105 | <br/> |
| 106 | 106 | <font color="black"><a href="<?php |
| 107 | 107 | ... | ... |
src/Template/Materiels/index.ctp
| ... | ... | @@ -100,18 +100,22 @@ if (isset ( $STATUS )) { |
| 100 | 100 | } |
| 101 | 101 | } |
| 102 | 102 | ?> |
| 103 | -</div> | |
| 104 | - | |
| 103 | +</div> | |
| 105 | 104 | <?php |
| 106 | -if ($nbMateriels != 0) { | |
| 107 | 105 | echo $this->Form->create('materiels', ['url' => '/materiels/execActions']); |
| 108 | 106 | echo $this->Form->input('aff_par_defaut', [ |
| 109 | 107 | 'label' => 'Afficher', |
| 110 | 108 | 'options' => ['20'=> 20, '30'=>30, '50'=>50, '100'=>100, '150'=>150, '200'=>200], |
| 111 | 109 | ]); |
| 110 | + ///$this->Form->end(); | |
| 111 | +?> | |
| 112 | + | |
| 113 | +<?php | |
| 114 | +if ($nbMateriels > 0) { | |
| 115 | + //$form2 = $this->Form; | |
| 116 | + ///echo $this->Form->create('materiels', ['url' => '/materiels/execActions']); | |
| 112 | 117 | if(isset($STATUS)) echo $this->Form->hidden ( 'what', ['value' => $STATUS]); |
| 113 | 118 | ?> |
| 114 | - | |
| 115 | 119 | <table style="border-collapse: separate; border-spacing: 0;"> |
| 116 | 120 | <thead> |
| 117 | 121 | <tr> | ... | ... |
vendor/bin/phinx deleted
vendor/bin/php-parse deleted
vendor/bin/psysh deleted