summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Pouzenc <ludovic@pouzenc.fr>2018-07-20 09:23:05 +0200
committerLudovic Pouzenc <ludovic@pouzenc.fr>2018-07-20 09:23:14 +0200
commit51f0aacb4d4f2514433139552ac6ab8ab5506653 (patch)
treec15b3c3f802ba12730c03d3f8c42c007dfaa514e
parentee73b4cb4a3250a10f3efb2bf562f04c13f34a4f (diff)
downloadchd_gestion-51f0aacb4d4f2514433139552ac6ab8ab5506653.zip
chd_gestion-51f0aacb4d4f2514433139552ac6ab8ab5506653.tar.gz
chd_gestion-51f0aacb4d4f2514433139552ac6ab8ab5506653.tar.bz2
rename ippubliques -> ip_publiques, .gitignore autogenerated code for now
-rw-r--r--app-from-scratch.sh8
-rw-r--r--fai_gestion/.gitignore51
-rw-r--r--fai_gestion/src/Template/Layout/default.ctp2
3 files changed, 60 insertions, 1 deletions
diff --git a/app-from-scratch.sh b/app-from-scratch.sh
index 80a12b3..519c68b 100644
--- a/app-from-scratch.sh
+++ b/app-from-scratch.sh
@@ -336,3 +336,11 @@ git commit -m "make side bar skinny, add shortcuts to main controllers"
editor config/bake_extra.php webroot/css/local.css
git add config/bake_extra.php webroot/css/local.css ../app-from-scratch.sh
git commit -m "configure all filters, no align-right on 'view'"
+
+# rename ippubliques -> ip_publiques, .gitignore autogenerated code for now
+# MariaDB side done via phpMyAdmin
+editor src/Template/Layout/default.ctp .gitignore
+git add src/Template/Layout/default.ctp .gitignore
+cake bake all --everything --force --quiet
+git add ../app-from-scratch.sh
+git commit -m "rename ippubliques -> ip_publiques, .gitignore autogenerated code for now"
diff --git a/fai_gestion/.gitignore b/fai_gestion/.gitignore
index 4bde43a..fd8e6f9 100644
--- a/fai_gestion/.gitignore
+++ b/fai_gestion/.gitignore
@@ -38,3 +38,54 @@ nbproject/*
.vscode
# Sass preprocessor
.sass-cache/
+
+# Auto-generated code (cake bake all --everything) #
+####################################################
+/src/Controller/AdherentRoleTypesController.php
+/src/Controller/AdherentRolesController.php
+/src/Controller/AdherentStatutsController.php
+/src/Controller/AdherentTypesController.php
+/src/Controller/AdherentsController.php
+/src/Controller/CivilitesController.php
+/src/Controller/EquipementInterfacesController.php
+/src/Controller/EquipementModelesController.php
+/src/Controller/EquipementModesController.php
+/src/Controller/EquipementsController.php
+/src/Controller/InteresseStatutsController.php
+/src/Controller/InteressesController.php
+/src/Controller/IpPubliquesController.php
+/src/Controller/LienFilaireController.php
+/src/Controller/LienRadioController.php
+/src/Controller/LienTunnelController.php
+/src/Controller/PeriodicitesController.php
+/src/Controller/RelaisController.php
+/src/Controller/SecteursController.php
+/src/Controller/ServiceStatutsController.php
+/src/Controller/ServiceTypesController.php
+/src/Controller/ServicesController.php
+/src/Controller/VillesController.php
+/src/Model/Entity/*
+/src/Model/Table/*
+/src/Template/AdherentRoleTypes/
+/src/Template/AdherentRoles/
+/src/Template/AdherentStatuts/
+/src/Template/AdherentTypes/
+/src/Template/Adherents/
+/src/Template/Civilites/
+/src/Template/EquipementInterfaces/
+/src/Template/EquipementModeles/
+/src/Template/EquipementModes/
+/src/Template/Equipements/
+/src/Template/InteresseStatuts/
+/src/Template/Interesses/
+/src/Template/IpPubliques/
+/src/Template/LienFilaire/
+/src/Template/LienRadio/
+/src/Template/LienTunnel/
+/src/Template/Periodicites/
+/src/Template/Relais/
+/src/Template/Secteurs/
+/src/Template/ServiceStatuts/
+/src/Template/ServiceTypes/
+/src/Template/Services/
+/src/Template/Villes/
diff --git a/fai_gestion/src/Template/Layout/default.ctp b/fai_gestion/src/Template/Layout/default.ctp
index 0dd4773..22b1b48 100644
--- a/fai_gestion/src/Template/Layout/default.ctp
+++ b/fai_gestion/src/Template/Layout/default.ctp
@@ -46,7 +46,7 @@ $cakeDescription = 'CakePHP: the rapid development php framework';
<li><?= $this->Html->link(__('Adherents'),['controller' => 'Adherents', 'action' => 'index']) ?></li>
<li><?= $this->Html->link(__('Interesses'), ['controller' => 'Interesses', 'action' => 'index']) ?></li>
<li><?= $this->Html->link(__('Equipements'), ['controller' => 'Equipements', 'action' => 'index']) ?></li>
- <li><?= $this->Html->link(__('Ippubliques'), ['controller' => 'Ippubliques', 'action' => 'index']) ?></li>
+ <li><?= $this->Html->link(__('Ip Publiques'), ['controller' => 'Ip_publiques', 'action' => 'index']) ?></li>
</ul>
</div>
</nav>