SciPost Code Repository

Skip to content
Snippets Groups Projects
Commit 7167f693 authored by Jorran de Wit's avatar Jorran de Wit
Browse files

Today variable outside methods because of server caching

parent 8e055bb5
No related branches found
No related tags found
No related merge requests found
import datetime
from django.db import models
from django.db.models import Q
from django.utils import timezone
today = timezone.now().date()
class AffiliationQuerySet(models.QuerySet):
def active(self):
today = datetime.date.today()
return self.filter(
Q(begin_date__lte=today, end_date__isnull=True) |
Q(begin_date__isnull=True, end_date__gte=today) |
......
import datetime
from django.db import models
from django.db.models import Q
from django.utils import timezone
today = datetime.date.today()
today = timezone.now().date()
class FellowQuerySet(models.QuerySet):
......
......@@ -3,7 +3,6 @@ from django.contrib.auth.decorators import login_required, permission_required
from django.shortcuts import get_object_or_404, render, redirect
from django.core.urlresolvers import reverse
# from proceedings.models import Proceedings
from submissions.models import Submission
from .forms import FellowshipForm, FellowshipTerminateForm, FellowshipRemoveSubmissionForm,\
......
import datetime
from django import forms
from django.contrib.auth import get_user_model
from django.utils.dates import MONTHS
from django.db.models import Sum
from django.utils import timezone
from .models import WorkLog
today = datetime.datetime.today()
today = timezone.now().date()
class WorkLogForm(forms.ModelForm):
......
......@@ -34,8 +34,6 @@ class MembershipAgreementManager(models.Manager):
def now_active(self):
return self.filter(start_date__lte=timezone.now().date(),
end_date__gte=timezone.now().date())
# start_date = models.DateField()
# duration = models.DurationField(choices=MEMBERSHIP_DURATION)
class PartnersAttachmentManager(models.Manager):
......
......@@ -32,6 +32,7 @@ from scipost.fields import ChoiceArrayField
from scipost.models import get_sentinel_user, Contributor
from scipost.storage import SecureFileStorage
now = timezone.now()
########################
......@@ -174,7 +175,7 @@ class Contact(models.Model):
feed = feed.encode('utf8')
salt = self.user.username.encode('utf8')
self.activation_key = hashlib.sha1(salt+salt).hexdigest()
self.key_expires = datetime.datetime.now() + datetime.timedelta(days=2)
self.key_expires = now + datetime.timedelta(days=2)
def save(self, *args, **kwargs):
if not self.activation_key:
......
import datetime
from django.db import models
from django.utils import timezone
today = timezone.now().date()
class ProceedingsQuerySet(models.QuerySet):
def open_for_submission(self):
today = datetime.date.today()
return self.filter(submissions_open__lte=today, submissions_close__gte=today)
import datetime
from django.core.urlresolvers import reverse
from django.db import models
from django.utils import timezone
from scipost.behaviors import TimeStampedModel
from .managers import ProceedingsQuerySet
today = timezone.now().date()
class Proceedings(TimeStampedModel):
"""
......@@ -52,5 +53,4 @@ class Proceedings(TimeStampedModel):
@property
def open_for_submission(self):
today = datetime.date.today()
return self.submissions_open <= today and self.submissions_close >= today
......@@ -19,6 +19,8 @@ from .fields import ChoiceArrayField
from .managers import FellowManager, ContributorManager, RegistrationInvitationManager,\
UnavailabilityPeriodManager, AuthorshipClaimQuerySet
today = timezone.now().date()
def get_sentinel_user():
'''
......@@ -330,7 +332,6 @@ class EditorialCollegeFellowship(TimeStampedModel):
return self.contributor.__str__()
def is_active(self):
today = datetime.date.today()
if not self.start_date:
if not self.until_date:
return True
......
......@@ -16,6 +16,8 @@ from .constants import SUBMISSION_STATUS_OUT_OF_POOL, SUBMISSION_STATUS_PUBLICLY
STATUS_PUT_TO_EC_VOTING, STATUS_VOTING_IN_PREPARATION,\
SUBMISSION_STATUS_VOTING_DEPRECATED, STATUS_REVISION_REQUESTED
now = timezone.now()
class SubmissionQuerySet(models.QuerySet):
def _newest_version_only(self, queryset):
......@@ -335,7 +337,7 @@ class RefereeInvitationQuerySet(models.QuerySet):
def approaching_deadline(self):
qs = self.in_process()
psuedo_deadline = datetime.datetime.now() + datetime.timedelta(days=2)
psuedo_deadline = now + datetime.timedelta(days=2)
deadline = datetime.datetime.now()
qs = qs.filter(submission__reporting_deadline__lte=psuedo_deadline,
submission__reporting_deadline__gte=deadline)
......@@ -343,6 +345,6 @@ class RefereeInvitationQuerySet(models.QuerySet):
def overdue(self):
qs = self.in_process()
deadline = datetime.datetime.now()
deadline = now
qs = qs.filter(submission__reporting_deadline__lte=deadline)
return qs
from django.core.urlresolvers import reverse
from django.db import models
from django.shortcuts import get_object_or_404
from django.template import Context, Template
from django.utils import timezone
from .constants import MOTION_CATEGORIES
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment