Rebase reply startdate on master

master
kaiyou 6 years ago
parent 15eb2806bf
commit 5ada669f43

@ -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 %}

@ -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

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

Loading…
Cancel
Save