diff --git a/core/admin/mailu/ui/templates/fetch/create.html b/core/admin/mailu/ui/templates/fetch/create.html index 69584d15..a48c1a48 100644 --- a/core/admin/mailu/ui/templates/fetch/create.html +++ b/core/admin/mailu/ui/templates/fetch/create.html @@ -25,7 +25,9 @@ {%- call macros.card(title="Settings") %} {{ macros.form_field(form.keep) }} {{ macros.form_field(form.scan) }} +{%- block folders %} {{ macros.form_field(form.folders) }} +{%- endblock %} {%- endcall %} {{ macros.form_field(form.submit) }} diff --git a/core/admin/mailu/ui/templates/fetch/edit.html b/core/admin/mailu/ui/templates/fetch/edit.html index 62af51a9..c7ff5a87 100644 --- a/core/admin/mailu/ui/templates/fetch/edit.html +++ b/core/admin/mailu/ui/templates/fetch/edit.html @@ -7,3 +7,15 @@ {%- block subtitle %} {{ user }} {%- endblock %} + +{%- block folders %} +
+
+
+ + + +
+
+
+{%- endblock %} diff --git a/core/admin/run_dev.sh b/core/admin/run_dev.sh index 4ab76e74..c12bb9ee 100755 --- a/core/admin/run_dev.sh +++ b/core/admin/run_dev.sh @@ -48,7 +48,7 @@ sed -E '/^#/d;s:^FROM system$:FROM system AS base:' "${base}/Dockerfile" >Docker # assets cp "${assets}/package.json" . -cp -r "${assets}/assets/" . +cp -r "${assets}/assets" ./assets awk '/new compress/{f=1}!f{print}/}),/{f=0}' <"${assets}/webpack.config.js" >webpack.config.js sed -E '/^#/d;s:^(FROM [^ ]+$):\1 AS assets:' "${assets}/Dockerfile" >>Dockerfile @@ -65,7 +65,7 @@ RUN set -euxo pipefail \ ; ln -s /app/start.py / ENV \ - FLASK_ENV="development" \ + FLASK_DEBUG="true" \ MEMORY_SESSIONS="true" \ RATELIMIT_STORAGE_URL="memory://" \ SESSION_COOKIE_SECURE="false" \ @@ -82,7 +82,7 @@ ENV \ REDIS_ADDRESS="127.0.0.1" \ WEBMAIL_ADDRESS="127.0.0.1" -CMD ["/bin/bash", "-c", "flask db upgrade &>/dev/null && flask mailu admin '${DEV_ADMIN/@*}' '${DEV_ADMIN#*@}' '${DEV_PASSWORD}' --mode ifmissing >/dev/null && flask run --host=0.0.0.0 --port=8080"] +CMD ["/bin/bash", "-c", "flask db upgrade &>/dev/null && flask mailu admin '${DEV_ADMIN/@*}' '${DEV_ADMIN#*@}' '${DEV_PASSWORD}' --mode ifmissing >/dev/null; flask run --debugger --host=0.0.0.0 --port=8080"] EOF # build