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

Rebase reply startdate on master

Browse Source
This commit is contained in:
kaiyou
2018-10-16 20:38:18 +02:00
parent 15eb2806bf
commit 5ada669f43
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,6 +32,6 @@ if exists "X-Virus" {
stop; stop;
} }
{% if user.reply_active and %} {% if user.reply_active %}
vacation :days 1 :subject "{{ user.reply_subject }}" "{{ user.reply_body }}"; vacation :days 1 :subject "{{ user.reply_subject }}" "{{ user.reply_body }}";
{% endif %} {% endif %}

2
core/admin/mailu/models.py
View File

@@ -280,7 +280,7 @@ class User(Base, Email):
@property @property
def reply_active(self): def reply_active(self):
now = datetime.datetime.now() now = date.today()
return ( return (
self.reply_enabled and self.reply_enabled and
self.reply_startdate < now and self.reply_startdate < now and

4
core/admin/migrations/versions/3b281286c7bd_.py
View File

@@ -1,13 +1,13 @@
""" Add a start day for vacations """ Add a start day for vacations
Revision ID: 3b281286c7bd Revision ID: 3b281286c7bd
Revises: 049fed905da7 Revises: 25fd6c7bcb4a
Create Date: 2018-09-27 22:20:08.158553 Create Date: 2018-09-27 22:20:08.158553
""" """
revision = '3b281286c7bd' revision = '3b281286c7bd'
down_revision = '049fed905da7' down_revision = '25fd6c7bcb4a'
from alembic import op from alembic import op
import sqlalchemy as sa import sqlalchemy as sa