Commit dd828639 authored by Mindiell's avatar Mindiell

#83 : Correction sur l'onglet des CBs

parent 7493d61b
Pipeline #2323 failed with stages
in 1 second
......@@ -937,7 +937,7 @@ class Admin extends Controller
$export = false;
$texte = '';
$status = '';
$limite = '50';
$limit = '50';
$page = '1';
$db = $f3->get('DB');
if ($f3->get('VERB')=='POST') {
......@@ -973,7 +973,7 @@ class Admin extends Controller
$status = $f3->exists('POST.status') ? $f3->get('POST.status') : '';
}
$query = "SELECT id, email, expiration, status FROM users WHERE identifier!='' AND identifier IS NOT NULL AND status != ''";
$query = "SELECT id, email, users.expiration, status FROM users INNER JOIN identifiers ON users.id=identifiers.user_id WHERE identifier!='' AND identifier IS NOT NULL AND status != ''";
if ($texte!='') {
$query .= " AND (email like '%".$texte."%'
OR pseudo like '%".$texte."%')";
......@@ -1014,7 +1014,7 @@ class Admin extends Controller
$f3->set('texte', $texte);
$f3->set('status', ($status!='') ? $status : 0);
$f3->set('limite', $limite);
$f3->set('limite', $limit);
$f3->set('query', $query);
$f3->set('data', $cbs);
$f3->set('page', $page);
......
......@@ -51,7 +51,7 @@
<repeat group="{{ @data }}" value="{{ @row }}">
<tr>
<td><label for="chk_{{ @row.id }}"><input type="checkbox" name="chk_{{ @row.id }}" id="chk_{{ @row.id }}" value="{{ @row.id }}" />{{ @row.id }}</label></td>
<td><a href="{{ 'user_info', 'id='.@row.id }}">{{ @row.email }}</a></td>
<td><a href="{{ 'user_info', 'id='.@row.id | alias }}">{{ @row.email }}</a></td>
<td>{{ @row.expiration }}</td>
<td class="inline">{{ @CB_STATUTS[@row.status] }}</td>
<td>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment