git.ithinksw.org
/
philo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changed Location & Calendar to check for constants in the settings file for which...
[philo.git]
/
contrib
/
julian
/
models.py
diff --git
a/contrib/julian/models.py
b/contrib/julian/models.py
index
049473c
..
db6ad71
100644
(file)
--- a/
contrib/julian/models.py
+++ b/
contrib/julian/models.py
@@
-2,12
+2,14
@@
from django.db import models
from philo.models.base import Tag, Entity, Titled
import datetime
from philo.models.base import Tag, Entity, Titled
import datetime
-class Location(Entity, Titled):
- slug = models.SlugField(max_length=255, unique=True)
+if not hasattr(settings, 'PHILO_LOCATION_MODULE'):
+ class Location(Entity, Titled):
+ slug = models.SlugField(max_length=255, unique=True)
-class Calendar(Entity, Titled):
- slug = models.SlugField(max_length=255, unique=True)
+if not hasattr(settings, 'PHILO_CALENDAR_MODULE'):
+ class Calendar(Entity, Titled):
+ slug = models.SlugField(max_length=255, unique=True)
class Event(Entity, Titled):
class Event(Entity, Titled):
@@
-16,7
+18,7
@@
class Event(Entity, Titled):
end_time = models.DateTimeField()
is_all_day_event = models.BooleanField(default=False)
time_created = models.DateTimeField(default=datetime.datetime.now)
end_time = models.DateTimeField()
is_all_day_event = models.BooleanField(default=False)
time_created = models.DateTimeField(default=datetime.datetime.now)
- location = models.ForeignKey(
Location
)
- calendars = models.ManyToManyField(
Calendar
)
+ location = models.ForeignKey(
getattr(settings, 'PHILO_LOCATION_MODULE', Location), related_name='events'
)
+ calendars = models.ManyToManyField(
getattr(settings, 'PHILO_CALENDAR_MODULE', Calendar), related_name='events'
)
tags = models.ManyToManyField(Tag)
tags = models.ManyToManyField(Tag)