Etienne Pallier / labinvent

Commit 521ce3e5a53b9fe8ba2ceb19ea5a79329423420b

Authored by Etienne Pallier
1 parent edc83de9
Exists in master and in 1 other branch dev

05/10/2020 v4.104.5-3.7.9 (EP) 

- (b) bugfix UPDATE script => les requetes sql n'étaient tout
simplement PAS exécutées !!!
Showing 7 changed files with 16 additions and 12 deletions   Show diff stats
Inline Side-by-side
CHANGES.txt
  Diff comments   View file @521ce3e
... ... @@ -120,7 +120,8 @@ Outre ces changements, voici d'autres changements importants :
120 120 ======= CHANGES =======
121 121  
122 122 -------
123   -05/10/2020 v4.104.4-3.7.9 (EP)
  123 +05/10/2020 v4.104.5-3.7.9 (EP)
  124 + - (b) bugfix UPDATE script => les requetes sql n'étaient tout simplement PAS exécutées !!!
124 125 - (i) Refactorisation de toutes les vues des "autres listes" (étape 1, étape 2 en cours...)
125 126 => un seul template unique utilisé /src/Template/Common/view.ctp, évite toutes ces trop nombreuses redondances, plus efficace,
126 127 on modifie tout en un seul endroit !
... ...
README.md
  Diff comments   View file @521ce3e
... ... @@ -43,7 +43,7 @@ Logiciel testé et validé sur les configurations suivantes :
43 43 --------------------------------------------------------------------------------------------
44 44  
45 45 Date: 05/10/2020
46   -Version: 4.104.4-3.7.9
  46 +Version: 4.104.5-3.7.9
47 47  
48 48  
49 49 HISTORIQUE DES CHANGEMENTS DE VERSION : voir le fichier CHANGES.txt (ou la page web /pages/changes)
... ...
install/update.sh
  Diff comments   View file @521ce3e
... ... @@ -295,7 +295,7 @@ for db_update_script_new in ${db_update_scripts_new[@]} ; do
295 295 #if [[ $do_it == "o" ]] ; then
296 296 #ls -l ./$db_update_script_new_ || abort
297 297 #./$db_update_script_new || abort
298   - ####./db-update.sh script_sql/$db_update_script_new || abort
  298 + [[ $TEST == 0 ]] && (./db-update.sh script_sql/$db_update_script_new || abort)
299 299 #fi
300 300 fi
301 301 # On supprime le fichier traité de $ftpf
... ...
src/Template/Common/view.ctp
  Diff comments   View file @521ce3e
... ... @@ -12,7 +12,7 @@ $entity = $entity;
12 12 //debug($entity->getSource());
13 13  
14 14 $DEBUG=false;
15   -$DEBUG=true;
  15 +//$DEBUG=true;
16 16  
17 17 if ($DEBUG) {
18 18 $article = 'le ';
... ... @@ -106,8 +106,8 @@ $entities_list = $entities_list;
106 106  
107 107 // Affichage des champs de l'entité (nom, description)
108 108 //$displayElement(__('Nom'), h($entity_name));
109   - $this->MyButton->displayElement(__('Nom'), h($entity_name));
110   - $this->MyButton->displayElement(__('Description'), h($entity->description));
  109 + $this->MyHelper->displayElement(__('Nom'), h($entity_name));
  110 + $this->MyHelper->displayElement(__('Description'), h($entity->description));
111 111  
112 112 ?>
113 113  
... ... @@ -119,7 +119,7 @@ $entities_list = $entities_list;
119 119 //debug($es);
120 120 //debug($es['entities']);
121 121 // function displaySectionShowHide($controller_name, $entity_type_name, $title, $id_name, $is_masculine, $name_field_name, $entities) {
122   - $this->MyButton->displaySectionShowHide(
  122 + $this->MyHelper->displayAssociatedEntitiesAsSectionShowHide(
123 123 $es['controller_name'],
124 124 $es['entity_type_name'],
125 125 $es['title'],
... ...
src/View/AjaxView.php
  Diff comments   View file @521ce3e
... ... @@ -41,6 +41,7 @@ class AjaxView extends AppView
41 41 {
42 42 parent::initialize();
43 43  
44   - $this->response->type('ajax');
  44 + //$this->response->type('ajax');
  45 + $this->response->withType('ajax');
45 46 }
46 47 }
... ...
src/View/AppView.php
  Diff comments   View file @521ce3e
... ... @@ -53,7 +53,7 @@ class AppView extends View
53 53 parent::initialize();
54 54  
55 55 // (EP 20200420 : mon 1er Helper !!)
56   - $this->loadHelper('MyButton');
  56 + $this->loadHelper('MyHelper');
57 57  
58 58 // Added for bootstrap-ui (EP 28/1/20) :
59 59  
... ...
src/View/Helper/MyButtonHelper.php renamed to src/View/Helper/MyHelperHelper.php
  Diff comments   View file @521ce3e
... ... @@ -6,8 +6,9 @@ namespace App\View\Helper;
6 6 use Cake\View\Helper;
7 7 use phpDocumentor\Reflection\Types\Void_;
8 8  
9   -class MyButtonHelper extends Helper {
10   -
  9 +//class MyButtonHelper extends Helper {
  10 +class MyHelperHelper extends Helper {
  11 +
11 12 // On a besoin du HtmlHelper
12 13 public $helpers = ['Html'];
13 14  
... ... @@ -56,7 +57,8 @@ class MyButtonHelper extends Helper {
56 57  
57 58  
58 59 //function displaySectionShowHide($controller_name, $entity_type_name, $title, $id_name, $is_masculine, $name_field_name, $entities) {
59   - function displaySectionShowHide($controller_name, $entity_type_name, $title, $is_masculine, $name_field_name, $entities) {
  60 + //function displaySectionShowHide($controller_name, $entity_type_name, $title, $is_masculine, $name_field_name, $entities) {
  61 + function displayAssociatedEntitiesAsSectionShowHide($controller_name, $entity_type_name, $title, $is_masculine, $name_field_name, $entities) {
60 62 $id_name = $controller_name;
61 63 $id_h3 = 't_'.$id_name;
62 64 $id_i = 'i_'.$id_name;
... ...