ashpie/swaf
1
0
Fork 0
Code Issues 22 Pull Requests Releases 11 Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Alice Gaudon 2021-01-25 17:54:36 +01:00
commit a6e822ec64
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "swaf", "name": "swaf",
"version": "0.23.3", "version": "0.23.4",
"description": "Structure Web Application Framework.", "description": "Structure Web Application Framework.",
"repository": "https://eternae.ink/arisu/swaf", "repository": "https://eternae.ink/arisu/swaf",
"author": "Alice Gaudon <alice@gaudon.pro>", "author": "Alice Gaudon <alice@gaudon.pro>",

2
src/auth/migrations/DropNameFromUsers.ts
View File

@ -5,7 +5,7 @@ import Migration from "../../db/Migration";
*/ */
export default class DropNameFromUsers extends Migration { export default class DropNameFromUsers extends Migration {
public async install(): Promise<void> { public async install(): Promise<void> {
await this.query('ALTER TABLE users DROP COLUMN name'); await this.query('ALTER TABLE users DROP COLUMN IF EXISTS name');
} }
public async rollback(): Promise<void> { public async rollback(): Promise<void> {

2
views/auth/account.njk
View File

@ -7,7 +7,7 @@
{% block body %} {% block body %}
<div class="container"> <div class="container">
<div class="panel"> <div class="panel">
<h2><i class="fas fa-user"></i> Personal information</h2> <h2><i data-feather="user"></i> Personal information</h2>
{% if display_email_warning and emails | length <= 0 %} {% if display_email_warning and emails | length <= 0 %}
{{ macros.message('warning', 'To avoid losing access to your account, please add an email address.') }} {{ macros.message('warning', 'To avoid losing access to your account, please add an email address.') }}

2
views/macros.njk
View File

@ -37,7 +37,7 @@
{% set validation = validation[name] if validation[name] or null %} {% set validation = validation[name] if validation[name] or null %}
{% set previousFormData = _locals.previousFormData() %} {% set previousFormData = _locals.previousFormData() %}
{% set value = previousFormData[name] or value or validation.value or '' %} {% set value = previousFormData[name] or value or validation.value or '' %}
{% set prefix = _locals.getFormPrefix() | default('no-') %} {% set prefix = _locals.getFormPrefix() | default('') %}
{% if type == 'hidden' %} {% if type == 'hidden' %}
{% if validation %} {% if validation %}