scottk/Mailu
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/Mailu.git synced 2025-11-02 11:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #785 from TheLegend875/feat-displayed-name

Browse Source 
Feature: send auto reply with displayed name
This commit is contained in:
Tim Möhlmann
2019-01-02 19:14:17 +02:00
committed by GitHub
parent 47234786ea 999d2a9557
commit 74fe177297
4 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/admin/mailu/internal/templates/default.sieve
View File

@@ -33,5 +33,5 @@ if exists "X-Virus" {
} }
{% if user.reply_active %} {% if user.reply_active %}
vacation :days 1 :subject "{{ user.reply_subject }}" "{{ user.reply_body }}"; vacation :days 1 {% if user.displayed_name != "" %}:from "{{ user.displayed_name }} <{{ user.email }}>"{% endif %} :subject "{{ user.reply_subject }}" "{{ user.reply_body }}";
{% endif %} {% endif %}

1
core/admin/mailu/ui/forms.py
View File

@@ -89,6 +89,7 @@ class UserForm(flask_wtf.FlaskForm):
quota_bytes = fields_.IntegerSliderField(_('Quota'), default=1000000000) quota_bytes = fields_.IntegerSliderField(_('Quota'), default=1000000000)
enable_imap = fields.BooleanField(_('Allow IMAP access'), default=True) enable_imap = fields.BooleanField(_('Allow IMAP access'), default=True)
enable_pop = fields.BooleanField(_('Allow POP3 access'), default=True) enable_pop = fields.BooleanField(_('Allow POP3 access'), default=True)
displayed_name = fields.StringField(_('Displayed name'))
comment = fields.StringField(_('Comment')) comment = fields.StringField(_('Comment'))
enabled = fields.BooleanField(_('Enabled'), default=True) enabled = fields.BooleanField(_('Enabled'), default=True)
submit = fields.SubmitField(_('Save')) submit = fields.SubmitField(_('Save'))

1
core/admin/mailu/ui/templates/user/create.html
View File

@@ -15,6 +15,7 @@
{% call macros.box(_("General")) %} {% call macros.box(_("General")) %}
{{ macros.form_field(form.localpart, append='<span class="input-group-addon">@'+domain.name+'</span>') }} {{ macros.form_field(form.localpart, append='<span class="input-group-addon">@'+domain.name+'</span>') }}
{{ macros.form_fields((form.pw, form.pw2)) }} {{ macros.form_fields((form.pw, form.pw2)) }}
{{ macros.form_field(form.displayed_name) }}
{{ macros.form_field(form.comment) }} {{ macros.form_field(form.comment) }}
{{ macros.form_field(form.enabled) }} {{ macros.form_field(form.enabled) }}
{% endcall %} {% endcall %}

4
core/admin/mailu/ui/templates/user/settings.html
View File

@@ -11,6 +11,10 @@
{% block content %} {% block content %}
<form class="form" method="post" role="form"> <form class="form" method="post" role="form">
{{ form.hidden_tag() }} {{ form.hidden_tag() }}
{% call macros.box(title=_("Displayed name")) %}
{{ macros.form_field(form.displayed_name) }}
{% endcall %}
{% call macros.box(title=_("Antispam")) %} {% call macros.box(title=_("Antispam")) %}
{{ macros.form_field(form.spam_enabled) }} {{ macros.form_field(form.spam_enabled) }}