Commit 7a87d896 authored by okhin's avatar okhin 🚴

Merge branch 'preprod' into 'master'

Preprod

See merge request !85
parents 42320b5e c64f4403
Pipeline #2326 passed with stages
in 1 minute and 33 seconds
......@@ -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);
......@@ -1541,7 +1541,9 @@ class Admin extends Controller
$f3->reroute('/admin/accounts');
}
$admins = $admins->fetchAll(\PDO::FETCH_ASSOC);
$db = $f3->get('DB');
$stmt = $db->query("SELECT * FROM admins");
$admins = $stmt->fetchAll(\PDO::FETCH_ASSOC);
$f3->set('admins', $admins);
$f3->set('block_content', 'backend/admins.html');
}
......
......@@ -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>
......
......@@ -30,8 +30,8 @@
</tr>
<tr>
<td>Hoodies</td>
<td style="text-align:right;"><b>{{ @hoopie_s1 }}</b></td>
<td style="text-align:right;">{{ @hoopie_s2 }}</td>
<td style="text-align:right;"><b>{{ @hoodie_s1 }}</b></td>
<td style="text-align:right;">{{ @hoodie_s2 }}</td>
</tr>
</tbody>
</table>
......
......@@ -37,7 +37,7 @@ msgid ""
"ouverte, nous vous en informerons."
msgstr ""
"We're currently working on an option to allow you to change the value of "
"your pledgeor to cancel it. You'll be informed as soon as the features will "
"your pledge or to cancel it. You'll be informed as soon as the features will "
"be available."
#: app/view/user/recurrent.html:10 app/view/user/dons.html:10
......@@ -194,11 +194,11 @@ msgstr "The hoodie"
#: app/view/user/infos.html:132
msgid "Pi-plôme à imprimer:"
msgstr "Print your own piploma:"
msgstr "Print your own pi-ploma:"
#: app/view/user/infos.html:138
msgid "Visualiser le pi-plôme sélectionné"
msgstr "Preview the selected piploma"
msgstr "Preview the selected pi-ploma"
#: app/view/user/infos.html:141
msgid "Coupe et taille du pi-shirt:"
......@@ -338,7 +338,7 @@ msgstr "Recurring"
#: app/view/user/perso.html:142
msgid "Piplome"
msgstr "Piploma"
msgstr "Pi-ploma"
#: app/view/user/perso.html:148
msgid "Oui"
......@@ -370,7 +370,7 @@ msgstr "Available to claim counterparts"
#: app/view/user/perso.html:229
msgid "Faire un nouveau don"
msgstr "Make a new plegge"
msgstr "Make a new pledge"
#: app/view/user/perso.html:238
msgid "Demander des contreparties"
......@@ -386,19 +386,19 @@ msgstr ""
#: app/view/user/perso.html:261
msgid "Piplôme"
msgstr "Piploma"
msgstr "Pi-ploma"
#: app/view/user/perso.html:264
msgid "Titulaire du Piplôme"
msgstr "Piploma's recipient"
msgstr "Pi-ploma's recipient"
#: app/view/user/perso.html:292
msgid "Pibag"
msgstr "Pibag"
msgstr "Pi-bag"
#: app/view/user/perso.html:293
msgid "Ainsi que le piplome."
msgstr "As well as the piploma."
msgstr "As well as the pi-ploma."
#: app/view/user/perso.html:320
msgid "Pi-Shirt"
......@@ -406,7 +406,7 @@ msgstr "Pi-Shirt"
#: app/view/user/perso.html:321
msgid "Ainsi que le piplome et le pibag."
msgstr "As well as the piplome and the pibag."
msgstr "As well as the pi-ploma and the pi-bag."
#: app/view/user/perso.html:325 app/view/user/perso.html:362
msgid "Taille"
......@@ -418,7 +418,7 @@ msgstr "Hoodie"
#: app/view/user/perso.html:358
msgid "Ainsi que le pi-shirt, le piplome et le pibag."
msgstr "As well as the pi-shirt, the piploma and the pibag"
msgstr "As well as the pi-shirt, the pi-ploma and the pi-bag"
#: app/view/user/perso.html:381
msgid "Expedier à&nbsp;:"
......@@ -434,11 +434,11 @@ msgstr "Recap:"
#: app/view/user/perso.html:428
msgid "Un piplôme"
msgstr "A Piploma"
msgstr "A Pi-ploma"
#: app/view/user/perso.html:438
msgid "Un pibag"
msgstr "A Pibag"
msgstr "A Pi-bag"
#: app/view/user/perso.html:448
msgid "Un pi-shirt"
......@@ -576,7 +576,7 @@ msgid ""
msgstr ""
"Of course! Create an account on https://don.laquadrature.net and send us "
"your check by snail mail, providing your email address at the back of your "
"check if you want your account tobe credited."
"check if you want your account to be credited."
#: app/view/campaign/faq.html:113
msgid "Ordre&nbsp;: La Quadrature du Net"
......
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