Etienne Pallier / labinvent

Commit 5b0949856ec0375ce5feb922c026fc10b59afd48

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

Version: 2.4.2.1 

Implémentation de la gestion des ACL, tests, bugfixes...
Affichage erreur CakePHP en mode debug de l'application (app.php)

Demande (terminée): https://projects.irap.omp.eu/issues/3735

Demande (en cours): https://projects.irap.omp.eu/issues/3526
					https://projects.irap.omp.eu/issues/3605
					https://projects.irap.omp.eu/issues/3550
					
Version majeure en cours (2.4):
https://projects.irap.omp.eu/versions/107

ROADMAP: https://projects.irap.omp.eu/projects/labinvent/roadmap
Showing 4 changed files with 92 additions and 3 deletions   Show diff stats
Inline Side-by-side
README-LABINVENT.md
  Diff comments   View file @5b09498
... ... @@ -51,11 +51,12 @@ Logiciel testé et validé sur les configurations suivantes :
51 51 VERSION ACTUELLE
52 52  
53 53 Date: 01/06/2016
54   -Version: 2.4.2.0
  54 +Version: 2.4.2.1
55 55  
56 56 Implémentation de la gestion des ACL, tests, bugfixes...
  57 +Affichage erreur CakePHP en mode debug de l'application (app.php)
57 58  
58   -Demande (terminée): https://projects.irap.omp.eu/issues/3689
  59 +Demande (terminée): https://projects.irap.omp.eu/issues/3735
59 60  
60 61 Demande (en cours): https://projects.irap.omp.eu/issues/3526
61 62 https://projects.irap.omp.eu/issues/3605
... ...
src/Template/Error/error400.ctp
  Diff comments   View file @5b09498
1 1 <?php
2 2 use App\Controller\AppController;
  3 +use Cake\Core\Configure;
  4 +use Cake\Error\Debugger;
  5 +
  6 +if(Configure::read('debug')) {
  7 + $this->layout = 'dev_error';
  8 +
  9 + $this->assign('title', $message);
  10 + $this->assign('templateName', 'error400.ctp');
  11 +
  12 + $this->start('file');
  13 + ?>
  14 + <?php if (!empty($error->queryString)) : ?>
  15 + <p class="notice">
  16 + <strong>SQL Query: </strong>
  17 + <?= h($error->queryString) ?>
  18 + </p>
  19 + <?php endif; ?>
  20 + <?php if (!empty($error->params)) : ?>
  21 + <strong>SQL Query Params: </strong>
  22 + <?php Debugger::dump($error->params) ?>
  23 + <?php endif; ?>
  24 + <?= $this->element('auto_table_warning') ?>
  25 + <?php
  26 + if (extension_loaded('xdebug')):
  27 + xdebug_print_function_stack();
  28 + endif;
  29 +
  30 + $this->end();
  31 + ?>
  32 + <h2><?= h($message) ?></h2>
  33 + <p class="error">
  34 + <strong><?= __d('cake', 'Error') ?>: </strong>
  35 + <?= sprintf(
  36 + __d('cake', 'The requested address %s was not found on this server.'),
  37 + "<strong>'{$url}'</strong>"
  38 + ) ?>
  39 + </p>
  40 +<?php
  41 +}
  42 +else {
  43 +
  44 +
3 45 $this->layout = false;
4 46 ?>
5 47  
... ... @@ -121,3 +163,4 @@ if(AppController::isLabinventDebugMode()) { ?&gt;
121 163  
122 164 </body>
123 165 </html>
  166 +<?php } ?>
... ...
src/Template/Error/error500.ctp
  Diff comments   View file @5b09498
1 1 <?php
2 2 use App\Controller\AppController;
  3 +use Cake\Core\Configure;
  4 +use Cake\Error\Debugger;
  5 +
  6 +if(Configure::read('debug')) {
  7 + $this->layout = 'dev_error';
  8 +
  9 + $this->assign('title', $message);
  10 + $this->assign('templateName', 'error500.ctp');
  11 +
  12 + $this->start('file');
  13 + ?>
  14 + <?php if (!empty($error->queryString)) : ?>
  15 + <p class="notice">
  16 + <strong>SQL Query: </strong>
  17 + <?= h($error->queryString) ?>
  18 + </p>
  19 + <?php endif; ?>
  20 + <?php if (!empty($error->params)) : ?>
  21 + <strong>SQL Query Params: </strong>
  22 + <?php Debugger::dump($error->params) ?>
  23 + <?php endif; ?>
  24 + <?php if ($error instanceof Error) : ?>
  25 + <strong>Error in: </strong>
  26 + <?= sprintf('%s, line %s', str_replace(ROOT, 'ROOT', $error->getFile()), $error->getLine()) ?>
  27 + <?php endif; ?>
  28 + <?php
  29 + echo $this->element('auto_table_warning');
  30 +
  31 + if (extension_loaded('xdebug')):
  32 + xdebug_print_function_stack();
  33 + endif;
  34 +
  35 + $this->end();
  36 + ?>
  37 + <h2><?= __d('cake', 'An Internal Error Has Occurred') ?></h2>
  38 + <p class="error">
  39 + <strong><?= __d('cake', 'Error') ?>: </strong>
  40 + <?php error_log('test '.$error); ?>
  41 + <?= h($message) ?>
  42 + </p>
  43 +<?php
  44 +}
  45 +else {
  46 +
3 47 $this->layout = false;
4 48 ?>
5 49  
... ... @@ -121,3 +165,4 @@ if(AppController::isLabinventDebugMode()) { ?&gt;
121 165  
122 166 </body>
123 167 </html>
  168 +<?php } ?>
124 169 \ No newline at end of file
... ...
src/Template/Layout/default.ctp
  Diff comments   View file @5b09498
... ... @@ -93,7 +93,7 @@ $cakeDescription = &#39;Labinvent 2.0&#39;;
93 93 </i></td>
94 94 <td id="version">
95 95 <!-- VERSION M.m.f.b (version (M)ajeure, version (m)ineure, numero de nouvelle (f)onctionnalite, numero de (b)ugfix) -->
96   - <font color="black">VERSION 2.4.2.0 (01/06/2016)</font>
  96 + <font color="black">VERSION 2.4.2.1 (01/06/2016)</font>
97 97 </td>
98 98 </tr>
99 99 </table>
... ...