Skip to content

Commit

Permalink
Merge pull request #6 from hhauer/django17
Browse files Browse the repository at this point in the history
Django17
  • Loading branch information
dstegelman committed Jan 10, 2015
2 parents 83f4f3b + 254d6a0 commit 83a567a
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
include README.md
recursive-include docs/*
recursive-include downtime/templates/ *
recursive-include docs/ *
recursive-include downtime/templates/ *
6 changes: 3 additions & 3 deletions downtime/managers.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ def is_down(self):
return self.filter(start_time__lte=datetime.now(), end_time__gte=datetime.now())

class PeriodManager(Manager):
def get_query_set(self):
def get_queryset(self):
return PeriodQuerySet(self.model, using=self._db)

def active(self):
return self.get_query_set().active()
return self.get_queryset().active()

def is_down(self):
return self.get_query_set().active().is_down()
return self.get_queryset().active().is_down()
2 changes: 1 addition & 1 deletion downtime/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
class Period(models.Model):
start_time = models.DateTimeField(blank=True, null=True)
end_time = models.DateTimeField(blank=True, null=True)
enabled = models.BooleanField()
enabled = models.BooleanField(default=False)

objects = PeriodManager()

Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from setuptools import setup, find_packages

version = '0.3.1'
version = '0.3.2'

setup(name='django-downtime',
version=version,
Expand Down

0 comments on commit 83a567a

Please sign in to comment.