fix a lot a errors probably due to migration

This commit is contained in:
osaajani 2019-11-10 00:27:42 +01:00
parent afb899c003
commit ae42484a60
37 changed files with 561 additions and 581 deletions

View file

@ -46,7 +46,7 @@
</div>
</div>
<div class="form-group">
<label>Contacts au groupe</label>
<label>Contacts du groupe</label>
<input class="add-contacts form-control" name="contacts[]"/>
</div>
<a class="btn btn-danger" href="<?php echo \descartes\Router::url('Group', 'list'); ?>">Annuler</a>

View file

@ -39,27 +39,27 @@
<div class="panel-body">
<form action="<?php echo \descartes\Router::url('Group', 'update', ['csrf' => $_SESSION['csrf']]);?>" method="POST">
<?php
foreach ($groupes as $groupe)
foreach ($groups as $group)
{
$contacts = array();
foreach ($groupe['contacts'] as $contact)
foreach ($group['contacts'] as $contact)
{
$contacts[] = (int)$contact['id'];
}
$contacts = json_encode($contacts);
?>
<input name="groupes[<?php $this->s($groupe['id']); ?>][groupe][id]" type="hidden" value="<?php $this->s($groupe['id']); ?>">
<input name="groupes[<?php $this->s($group['id']); ?>][groupe][id]" type="hidden" value="<?php $this->s($group['id']); ?>">
<div class="form-group">
<label>Nom groupe</label>
<div class="form-group input-group">
<span class="input-group-addon"><span class="fa fa-user"></span></span>
<input name="groupes[<?php $this->s($groupe['id']); ?>][name]" class="form-control" type="text" placeholder="Nom groupe" autofocus required value="<?php $this->s($groupe['name']); ?>">
<input name="groupes[<?php $this->s($group['id']); ?>][name]" class="form-control" type="text" placeholder="Nom groupe" autofocus required value="<?php $this->s($group['name']); ?>">
</div>
</div>
<div class="form-group">
<label>Contacts du groupe</label>
<input class="add-contacts form-control" name="groupes[<?php $this->s($groupe['id']); ?>][contacts_ids][]" value="<?php $this->s($contacts); ?>"/>
<input class="add-contacts form-control" name="groupes[<?php $this->s($group['id']); ?>][contacts_ids][]" value="<?php $this->s($contacts); ?>"/>
</div>
<hr/>
<?php

View file

@ -35,7 +35,7 @@
</div>
<div class="panel-body">
<form method="GET">
<?php if (!$groupes) { ?>
<?php if (!$groups) { ?>
<p>Aucun groupe n'a été formé pour le moment.</p>
<?php } else { ?>
<div class="table-responsive">
@ -49,12 +49,12 @@
</tr>
</thead>
<tbody>
<?php foreach ($groupes as $groupe) { ?>
<?php foreach ($groups as $group) { ?>
<tr>
<td><?php $this->s($groupe['id']); ?></td>
<td><?php $this->s($groupe['name']); ?></td>
<td><?php $this->s($groupe['nb_contacts']); ?></td>
<td><input type="checkbox" name="ids[]" value="<?php $this->s($groupe['id']); ?>"></td>
<td><?php $this->s($group['id']); ?></td>
<td><?php $this->s($group['name']); ?></td>
<td><?php $this->s($group['nb_contacts']); ?></td>
<td><input type="checkbox" name="ids[]" value="<?php $this->s($group['id']); ?>"></td>
</tr>
<?php } ?>
</tbody>
@ -65,7 +65,7 @@
<div class="col-xs-6 no-padding">
<a class="btn btn-success" href="<?php echo \descartes\Router::url('Group', 'add'); ?>"><span class="fa fa-plus"></span> Ajouter un groupe</a>
</div>
<?php if ($groupes) { ?>
<?php if ($groups) { ?>
<div class="text-right col-xs-6 no-padding">
<strong>Action pour la séléction :</strong>
<button class="btn btn-default" type="submit" formaction="<?php echo \descartes\Router::url('Group', 'edit'); ?>"><span class="fa fa-edit"></span> Modifier</button>