Rebase reply startdate on master

2018-10-16 20:38:18 +02:00
parent 15eb2806bf
commit 5ada669f43
3 changed files with 4 additions and 4 deletions
--- a/core/admin/mailu/internal/templates/default.sieve
+++ b/core/admin/mailu/internal/templates/default.sieve
@@ -32,6 +32,6 @@ if exists "X-Virus" {
  stop;
 }

-{% if user.reply_active and  %}
+{% if user.reply_active  %}
 vacation :days 1 :subject "{{ user.reply_subject }}" "{{ user.reply_body }}";
 {% endif %}
--- a/core/admin/mailu/models.py
+++ b/core/admin/mailu/models.py
@@ -280,7 +280,7 @@ class User(Base, Email):

    @property
    def reply_active(self):
-        now = datetime.datetime.now()
+        now = date.today()
        return (
            self.reply_enabled and
            self.reply_startdate < now and