diff --git a/src/Controller/CrisisController.php b/src/Controller/CrisisController.php index b4b0cfb..6de5be2 100644 --- a/src/Controller/CrisisController.php +++ b/src/Controller/CrisisController.php @@ -40,7 +40,7 @@ class CrisisController extends AppController public function view($id = null) { $crisi = $this->Crisis->get($id, [ - 'contain' => ['Users'] + 'contain' => ['Users', 'Infos'] ]); $this->set('crisi', $crisi); $this->set('_serialize', ['crisi']); diff --git a/src/Model/Entity/Crisi.php b/src/Model/Entity/Crisi.php index d65bba6..40ad18a 100644 --- a/src/Model/Entity/Crisi.php +++ b/src/Model/Entity/Crisi.php @@ -36,4 +36,8 @@ class Crisi extends Entity '*' => true, 'id' => false, ]; + + protected function _setHashtags($hastags) + { + } } diff --git a/src/Template/Infos/add.ctp b/src/Template/Infos/add.ctp index 8345845..7006c86 100644 --- a/src/Template/Infos/add.ctp +++ b/src/Template/Infos/add.ctp @@ -13,7 +13,7 @@ <?php echo $this->Form->input('title', ['label' => 'Titre']); echo $this->Form->input('body', ['label' => 'Corps du texte']); - echo $this->Form->input('crisis_id', ['label' => 'ID crise']); + echo $this->Form->input('crisis_id', ['options' => $crisis, 'label' => 'ID crise']); echo $this->Form->input('user_id', ['options' => $users, 'label' => 'ID utilisateur']); echo $this->Form->input('type', ['label' => 'Type']); ?> diff --git a/src/Template/Layout/default.ctp b/src/Template/Layout/default.ctp index dd2856d..9bf2eba 100644 --- a/src/Template/Layout/default.ctp +++ b/src/Template/Layout/default.ctp @@ -112,9 +112,6 @@ <?= $this->Html->script("app.js") ?> - - - <!-- Page specific script (always load last) --> <?= $this->fetch('script') ?> <script>