summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/birds/build.py2
-rw-r--r--app/birds/models.py10
-rw-r--r--app/books/build.py2
-rw-r--r--app/books/models.py4
-rw-r--r--app/builder/base.py2
-rw-r--r--app/expenses/models.py6
-rw-r--r--app/figments/build.py2
-rw-r--r--app/figments/models.py2
-rw-r--r--app/income/models.py4
-rw-r--r--app/jrnl/build.py8
-rw-r--r--app/jrnl/models.py10
-rw-r--r--app/links/models.py2
-rw-r--r--app/locations/models.py19
-rw-r--r--app/notes/build.py2
-rw-r--r--app/notes/models.py4
-rw-r--r--app/pages/build.py2
-rw-r--r--app/photos/build.py2
-rw-r--r--app/photos/models.py14
-rw-r--r--app/projects/models/fiveby.py4
-rw-r--r--app/projects/models/natparks.py7
-rw-r--r--app/resume/build.py2
-rw-r--r--app/resume/models.py4
-rw-r--r--app/src/build.py2
-rw-r--r--app/src/views.py2
24 files changed, 50 insertions, 68 deletions
diff --git a/app/birds/build.py b/app/birds/build.py
index 870133f..565b675 100644
--- a/app/birds/build.py
+++ b/app/birds/build.py
@@ -1,5 +1,5 @@
import os
-from django.core.urlresolvers import reverse
+from django.urls import reverse
from builder.base import BuildNew
diff --git a/app/birds/models.py b/app/birds/models.py
index 380e602..c73e7d7 100644
--- a/app/birds/models.py
+++ b/app/birds/models.py
@@ -1,5 +1,5 @@
import datetime
-from django.core.urlresolvers import reverse
+from django.urls import reverse
from django.template.defaultfilters import slugify
from django.contrib.gis.db import models
from django.contrib.auth.models import User
@@ -43,7 +43,7 @@ class Bird(models.Model):
slug = models.SlugField()
scientific_name = models.CharField(max_length=200)
code = models.IntegerField(choices=ABA_CODES, default=0)
- bird_class = models.ForeignKey(BirdClass)
+ bird_class = models.ForeignKey(BirdClass, on_delete=models.CASCADE)
image = models.FileField(upload_to=get_upload_path, null=True, blank=True, help_text="width of high res is 1360px")
image_credit = models.CharField(max_length=200, blank=True, null=True)
@@ -71,7 +71,7 @@ class Bird(models.Model):
class BirdAudio(models.Model):
- bird = models.ForeignKey(Bird, related_name='recordings')
+ bird = models.ForeignKey(Bird, on_delete=models.CASCADE, related_name='recordings')
audio = models.FileField(upload_to='audio/birds/')
recorder = models.CharField(max_length=200, null=True, blank=True)
pub_date = models.DateTimeField()
@@ -88,9 +88,9 @@ class BirdAudio(models.Model):
class BirdSighting(models.Model):
- bird = models.ForeignKey(Bird)
+ bird = models.ForeignKey(Bird, on_delete=models.CASCADE)
point = models.PointField(blank=True)
- location = models.ForeignKey(Location, blank=True)
+ location = models.ForeignKey(Location, on_delete=models.CASCADE, blank=True)
date = models.DateTimeField('Date', default=timezone.now)
seen_by = models.ManyToManyField(User)
images = models.ManyToManyField(LuxImage, blank=True)
diff --git a/app/books/build.py b/app/books/build.py
index 6743e89..35fdb19 100644
--- a/app/books/build.py
+++ b/app/books/build.py
@@ -1,5 +1,5 @@
import os
-from django.core.urlresolvers import reverse
+from django.urls import reverse
from builder.base import BuildNew
diff --git a/app/books/models.py b/app/books/models.py
index 4362bc9..f888480 100644
--- a/app/books/models.py
+++ b/app/books/models.py
@@ -1,5 +1,5 @@
from django.db import models
-from django.core.urlresolvers import reverse
+from django.urls import reverse
from django.utils.encoding import force_text
from django.conf import settings
from django.template.defaultfilters import slugify
@@ -69,7 +69,7 @@ class Book(models.Model):
class BookHighlight(models.Model):
- book = models.ForeignKey(Book)
+ book = models.ForeignKey(Book, on_delete=models.CASCADE)
page = models.PositiveSmallIntegerField(null=True)
location = models.CharField(max_length=200, blank=True, null=True)
date_added = models.DateTimeField()
diff --git a/app/builder/base.py b/app/builder/base.py
index 573cf6b..1b441a0 100644
--- a/app/builder/base.py
+++ b/app/builder/base.py
@@ -4,7 +4,7 @@ from decimal import Decimal
from django.test.client import Client
from django.template.loader import render_to_string
from django.template import Context
-from django.core.urlresolvers import reverse
+from django.urls import reverse
from django.apps import apps
from django.conf import settings
from jsmin import jsmin
diff --git a/app/expenses/models.py b/app/expenses/models.py
index ff33844..fbcdd7a 100644
--- a/app/expenses/models.py
+++ b/app/expenses/models.py
@@ -1,5 +1,5 @@
from django.db import models
-from django.core.urlresolvers import reverse
+from django.urls import reverse
from django.utils import timezone
CATS = (
@@ -37,7 +37,7 @@ class Month(models.Model):
class LuxExpense(models.Model):
category = models.CharField(max_length=2, choices=CATS, default=1)
amount = models.DecimalField(max_digits=8, decimal_places=2)
- month = models.ForeignKey(Month, null=True)
+ month = models.ForeignKey(Month, on_delete=models.CASCADE, null=True)
def __str__(self):
return '%s-%s' %(self.month, self.get_category_display())
@@ -50,7 +50,7 @@ class Expense(models.Model):
date = models.DateTimeField(default=timezone.now)
notes = models.TextField(null=True, blank=True)
category = models.CharField(max_length=2, choices=CATS, default=1)
- trip = models.ForeignKey(Trip, null=True)
+ trip = models.ForeignKey(Trip, on_delete=models.CASCADE, null=True)
class Meta:
ordering = ('-date',)
diff --git a/app/figments/build.py b/app/figments/build.py
index 07720ac..b656ab0 100644
--- a/app/figments/build.py
+++ b/app/figments/build.py
@@ -1,4 +1,4 @@
-from django.core.urlresolvers import reverse
+from django.urls import reverse
from builder.base import BuildNew
diff --git a/app/figments/models.py b/app/figments/models.py
index b76d8d5..69cf9a0 100644
--- a/app/figments/models.py
+++ b/app/figments/models.py
@@ -1,7 +1,7 @@
import datetime
from itertools import chain
from django.db import models
-from django.core.urlresolvers import reverse
+from django.urls import reverse
from django.contrib.sitemaps import Sitemap
from django.contrib.syndication.views import Feed
from django.db.models.signals import post_save
diff --git a/app/income/models.py b/app/income/models.py
index dbb03bf..68b963f 100644
--- a/app/income/models.py
+++ b/app/income/models.py
@@ -35,8 +35,8 @@ class Gig(models.Model):
)
pay_type = models.IntegerField(choices=PAY_TYPE, default=1)
word_count = models.DecimalField(max_digits=7, decimal_places=0, blank=True, null=True)
- publisher = models.ForeignKey(Publisher, blank=True, null=True)
- pub_item = models.ForeignKey(PubItem, blank=True, null=True)
+ publisher = models.ForeignKey(Publisher, on_delete=models.CASCADE, blank=True, null=True)
+ pub_item = models.ForeignKey(PubItem, on_delete=models.CASCADE, blank=True, null=True)
def __str__(self):
return self.title
diff --git a/app/jrnl/build.py b/app/jrnl/build.py
index 918326a..cbd0e17 100644
--- a/app/jrnl/build.py
+++ b/app/jrnl/build.py
@@ -1,4 +1,4 @@
-from django.core.urlresolvers import reverse
+from django.urls import reverse
from django.apps import apps
from builder.base import BuildNew
from itertools import chain
@@ -87,12 +87,6 @@ def rss_builder():
j = BuildJrnl("jrnl", "entry")
j.build_feed("jrnl:feed")
-
-def amp_builder():
- j = BuildJrnl("jrnl", "entry")
- j.build_amp_view()
-
-
def map_builder():
j = BuildJrnl("jrnl", "entry")
j.build_map()
diff --git a/app/jrnl/models.py b/app/jrnl/models.py
index 7332321..d0b9120 100644
--- a/app/jrnl/models.py
+++ b/app/jrnl/models.py
@@ -4,7 +4,7 @@ import re
from django.contrib.gis.db import models
from django.utils.html import format_html
-from django.core.urlresolvers import reverse
+from django.urls import reverse
from django.template.loader import render_to_string
from django.conf import settings
from django.template import Context
@@ -62,13 +62,13 @@ class Entry(models.Model):
pub_date = models.DateTimeField('Date published')
enable_comments = models.BooleanField(default=False)
point = models.PointField(null=True, blank=True)
- location = models.ForeignKey(Location, null=True, blank=True)
+ location = models.ForeignKey(Location, on_delete=models.CASCADE, null=True, blank=True)
PUB_STATUS = (
(0, 'Draft'),
(1, 'Published'),
)
status = models.IntegerField(choices=PUB_STATUS, default=0)
- photo_gallery = models.ForeignKey(PhotoGallery, blank=True, null=True, verbose_name='photo set')
+ photo_gallery = models.ForeignKey(PhotoGallery, on_delete=models.CASCADE, blank=True, null=True, verbose_name='photo set')
image = models.FileField(upload_to=get_upload_path, null=True, blank=True, help_text="should be 520 by 290")
thumbnail = models.FileField(upload_to=get_tn_path, null=True, blank=True, help_text="should be 160 wide")
meta_description = models.CharField(max_length=256, null=True, blank=True)
@@ -81,7 +81,7 @@ class Entry(models.Model):
(5, 'double-black'),
)
template_name = models.IntegerField(choices=TEMPLATES, default=0)
- featured_image = models.ForeignKey(LuxImage, null=True, blank=True)
+ featured_image = models.ForeignKey(LuxImage, on_delete=models.CASCADE, null=True, blank=True)
has_video = models.BooleanField(blank=True, default=False)
class Meta:
@@ -186,7 +186,7 @@ class HomepageCurrator(models.Model):
image_offset_vertical = models.CharField(max_length=20, help_text="add negative top margin to shift image (include css unit)")
images = models.ManyToManyField(LuxImage)
tag_line = models.CharField(max_length=200)
- featured = models.ForeignKey(Entry, related_name="banner")
+ featured = models.ForeignKey(Entry, on_delete=models.CASCADE, related_name="banner")
popular = models.ManyToManyField(Entry)
template_name = models.CharField(max_length=200, help_text="full path")
diff --git a/app/links/models.py b/app/links/models.py
index 372e860..fe91b1c 100644
--- a/app/links/models.py
+++ b/app/links/models.py
@@ -1,7 +1,7 @@
import requests
import json
from django.template.defaultfilters import striptags
-from django.core.urlresolvers import reverse
+from django.urls import reverse
from django.utils.encoding import force_text
from django.db import models
from django.utils import timezone
diff --git a/app/locations/models.py b/app/locations/models.py
index 1baa964..e9c79e5 100644
--- a/app/locations/models.py
+++ b/app/locations/models.py
@@ -15,13 +15,10 @@ class Region(models.Model):
name = models.CharField(max_length=50)
slug = models.SlugField()
pub_date = models.DateTimeField('Date published', null=True)
- # GeoDjango specific Polygon Field and GeoManager
geometry = models.MultiPolygonField(srid=4326, null=True)
lon = models.FloatField('Longitude', help_text="Longitude of centerpoint", null=True)
lat = models.FloatField('Latitude', help_text="Latitude of centerpoint", null=True)
zoom_level = models.CharField(max_length=2, null=True)
- # GeoManager, a subclass that adds a rich set of geospatial queryset methods
- objects = models.GeoManager()
def get_absolute_url(self):
return "/locations/region/%s/" % (self.slug)
@@ -81,10 +78,9 @@ class Country(models.Model):
zoom_level = models.CharField(max_length=2, null=True)
slug = models.SlugField(null=True)
visited = models.BooleanField(default=False)
- lux_region = models.ForeignKey(Region, null=True)
+ lux_region = models.ForeignKey(Region, on_delete=models.CASCADE, null=True)
pub_date = models.DateTimeField('Date published', null=True)
geometry = models.MultiPolygonField('Country Border', srid=4326)
- objects = models.GeoManager()
class Meta:
ordering = ['name']
@@ -100,12 +96,11 @@ class Country(models.Model):
class State(models.Model):
"""Model to hold state boundaries"""
name = models.CharField(max_length=250, blank=True, null=True,)
- country = models.ForeignKey(Country)
+ country = models.ForeignKey(Country, on_delete=models.CASCADE)
slug = models.SlugField()
code = models.CharField(max_length=2, null=True, blank=True)
pub_date = models.DateTimeField('Date published', null=True)
geometry = models.MultiPolygonField(srid=4326, null=True)
- objects = models.GeoManager()
class Meta:
ordering = ['name']
@@ -119,14 +114,11 @@ class State(models.Model):
class Location(models.Model):
"""Model to hold location shapes as arbitrarily defined by me"""
- state = models.ForeignKey(State)
+ state = models.ForeignKey(State, on_delete=models.CASCADE)
name = models.CharField(max_length=50, )
slug = models.SlugField()
pub_date = models.DateTimeField('Date published', null=True)
- # GeoDjango specific Polygon Field and GeoManager
geometry = models.MultiPolygonField(srid=4326)
- # GeoManager, a subclass that adds a rich set of geospatial queryset methods
- objects = models.GeoManager()
def __str__(self):
return self.name
@@ -148,10 +140,7 @@ class Route(models.Model):
zoom = models.CharField(max_length=2, null=True)
template_var_name = models.CharField(max_length=10, null=True)
pub_date = models.DateTimeField('Date published', null=True)
- # GeoDjango specific Polygon Field and GeoManager
geometry = models.MultiPointField(srid=4326)
- # GeoManager, a subclass that adds a rich set of geospatial queryset methods
- objects = models.GeoManager()
def get_absolute_url(self):
return "/locations/%s/%s/%s/" % (self.slug)
@@ -162,7 +151,7 @@ class Route(models.Model):
class CheckIn(models.Model):
point = models.PointField(blank=True)
- location = models.ForeignKey(Location, blank=True, null=True)
+ location = models.ForeignKey(Location, on_delete=models.CASCADE, blank=True, null=True)
date = models.DateField(default=timezone.now)
class Meta:
diff --git a/app/notes/build.py b/app/notes/build.py
index 499adc6..dc0654e 100644
--- a/app/notes/build.py
+++ b/app/notes/build.py
@@ -1,5 +1,5 @@
import os
-from django.core.urlresolvers import reverse
+from django.urls import reverse
from builder.base import BuildNew
diff --git a/app/notes/models.py b/app/notes/models.py
index 4e7824d..698ca14 100644
--- a/app/notes/models.py
+++ b/app/notes/models.py
@@ -31,7 +31,7 @@ class LuxNote(models.Model):
body_html = models.TextField(blank=True)
body_markdown = models.TextField('Note')
point = models.PointField(blank=True, null=True)
- location = models.ForeignKey(Location, blank=True, null=True)
+ location = models.ForeignKey(Location, on_delete=models.CASCADE, blank=True, null=True)
PUB_STATUS = (
(0, 'Draft'),
(1, 'Published'),
@@ -88,7 +88,7 @@ class Note(models.Model):
date_created = models.DateTimeField('Date', blank=True)
date_last_updated = models.DateTimeField('Date', blank=True)
point = models.PointField()
- location = models.ForeignKey(Location, null=True, blank=True)
+ location = models.ForeignKey(Location, on_delete=models.CASCADE, null=True, blank=True)
city_name = models.CharField(max_length=250, null=True, blank=True)
state_name = models.CharField(max_length=250, null=True, blank=True)
country_name = models.CharField(max_length=150, null=True, blank=True)
diff --git a/app/pages/build.py b/app/pages/build.py
index e40a218..f898833 100644
--- a/app/pages/build.py
+++ b/app/pages/build.py
@@ -1,6 +1,6 @@
from django.template.loader import render_to_string
from django.template import Context
-from django.core.urlresolvers import reverse
+from django.urls import reverse
from django.conf import settings
from builder.base import BuildNew
diff --git a/app/photos/build.py b/app/photos/build.py
index 15a649e..b11c756 100644
--- a/app/photos/build.py
+++ b/app/photos/build.py
@@ -1,5 +1,5 @@
import os
-from django.core.urlresolvers import reverse
+from django.urls import reverse
from builder.base import BuildNew
diff --git a/app/photos/models.py b/app/photos/models.py
index 603e2d1..84ceb0f 100644
--- a/app/photos/models.py
+++ b/app/photos/models.py
@@ -64,7 +64,7 @@ class LuxImage(models.Model):
height = models.CharField(max_length=6, blank=True, null=True)
width = models.CharField(max_length=6, blank=True, null=True)
point = models.PointField(null=True, blank=True)
- location = models.ForeignKey(Location, null=True, blank=True)
+ location = models.ForeignKey(Location, on_delete=models.CASCADE, null=True, blank=True)
is_public = models.BooleanField(default=True)
sizes = models.ManyToManyField(LuxImageSize, blank=True)
flickr_id = models.CharField(null=True, blank=True, max_length=80)
@@ -226,11 +226,11 @@ class LuxGallery(models.Model):
title = models.CharField(blank=True, max_length=300)
description = models.TextField(blank=True, null=True)
slug = models.CharField(blank=True, max_length=300)
- thumb = models.ForeignKey(LuxImage, related_name="gallery_thumb", null=True, blank=True)
+ thumb = models.ForeignKey(LuxImage, on_delete=models.CASCADE, related_name="gallery_thumb", null=True, blank=True)
images = models.ManyToManyField(LuxImage)
pub_date = models.DateTimeField(null=True)
point = models.PointField(null=True, blank=True)
- location = models.ForeignKey(Location, null=True, blank=True)
+ location = models.ForeignKey(Location, on_delete=models.CASCADE, null=True, blank=True)
is_public = models.BooleanField(default=True)
caption_style = models.CharField(blank=True, null=True, max_length=400)
@@ -309,8 +309,8 @@ class Photo(models.Model):
flickr_originalsecret = models.CharField(max_length=50)
lon = models.FloatField('Longitude', help_text="Longitude of centerpoint", null=True)
lat = models.FloatField('Latitude', help_text="Latitude of centerpoint", null=True)
- location = models.ForeignKey(Location, null=True)
- region = models.ForeignKey(Region, null=True)
+ location = models.ForeignKey(Location, on_delete=models.CASCADE, null=True)
+ region = models.ForeignKey(Region, on_delete=models.CASCADE, null=True)
slideshowimage_width = models.CharField(max_length=4, blank=True, null=True)
slideshowimage_height = models.CharField(max_length=4, blank=True, null=True)
slideshowimage_margintop = models.CharField(max_length=4, blank=True, null=True)
@@ -453,8 +453,8 @@ class PhotoGallery(models.Model):
set_slug = models.CharField(blank=True, max_length=300)
primary = models.CharField(blank=True, max_length=300)
photos = models.ManyToManyField(Photo)
- location = models.ForeignKey(Location, null=True)
- region = models.ForeignKey(Region, null=True)
+ location = models.ForeignKey(Location, on_delete=models.CASCADE, null=True)
+ region = models.ForeignKey(Region, on_delete=models.CASCADE, null=True)
pub_date = models.DateTimeField(null=True)
class Meta:
diff --git a/app/projects/models/fiveby.py b/app/projects/models/fiveby.py
index b6c7e33..473c095 100644
--- a/app/projects/models/fiveby.py
+++ b/app/projects/models/fiveby.py
@@ -27,8 +27,8 @@ class FiveBy(models.Model):
)
status = models.IntegerField(choices=PUB_STATUS, default=0)
point = models.PointField(null=True)
- location = models.ForeignKey(Location, null=True)
- region = models.ForeignKey(Region, null=True)
+ location = models.ForeignKey(Location, on_delete=models.CASCADE, null=True)
+ region = models.ForeignKey(Region, on_delete=models.CASCADE, null=True)
class Meta:
ordering = ('-pub_date',)
diff --git a/app/projects/models/natparks.py b/app/projects/models/natparks.py
index 608c5c3..980d9fa 100644
--- a/app/projects/models/natparks.py
+++ b/app/projects/models/natparks.py
@@ -14,7 +14,7 @@ def get_upload_path(self, filename):
class NationalParks(models.Model):
type = models.CharField(max_length=50)
name = models.CharField(max_length=254)
- state = models.ForeignKey(State, null=True)
+ state = models.ForeignKey(State, on_delete=models.CASCADE, null=True)
size = models.CharField(max_length=10, null=True)
fee = models.CharField(max_length=5, null=True)
camping_fee = models.CharField(max_length=10, null=True)
@@ -29,13 +29,12 @@ class NationalParks(models.Model):
visited = models.BooleanField(default=False)
dek = models.TextField(null=True, blank=True)
tag_line = models.CharField(max_length=254, null=True)
- post = models.ForeignKey(Entry, null=True)
- gallery = models.ForeignKey(PhotoGallery, blank=True, null=True, verbose_name='photo set')
+ post = models.ForeignKey(Entry, on_delete=models.CASCADE, null=True)
+ gallery = models.ForeignKey(PhotoGallery, on_delete=models.CASCADE, blank=True, null=True, verbose_name='photo set')
image = models.FileField(upload_to=get_upload_path, null=True, blank=True,
help_text="width: 980px, height: > 450px")
image_height = models.CharField(max_length=20, null=True, blank=True)
image_width = models.CharField(max_length=20, null=True, blank=True)
- objects = models.GeoManager()
class Meta:
verbose_name_plural = "National Parks"
diff --git a/app/resume/build.py b/app/resume/build.py
index b3007fd..e449326 100644
--- a/app/resume/build.py
+++ b/app/resume/build.py
@@ -1,5 +1,5 @@
import os
-from django.core.urlresolvers import reverse
+from django.urls import reverse
from builder.base import BuildNew
from pages.models import Page
diff --git a/app/resume/models.py b/app/resume/models.py
index c225d39..0dcc160 100644
--- a/app/resume/models.py
+++ b/app/resume/models.py
@@ -1,6 +1,6 @@
from django.db import models
from django.utils.encoding import force_text
-from django.core.urlresolvers import reverse
+from django.urls import reverse
from utils.widgets import markdown_to_html
@@ -33,7 +33,7 @@ class PubItem(models.Model):
body_html = models.TextField(null=True, blank=True)
url = models.CharField(max_length=200, blank=True, null=True)
pub_date = models.DateTimeField('Date published')
- publisher = models.ForeignKey(Publisher)
+ publisher = models.ForeignKey(Publisher, on_delete=models.CASCADE)
class Meta:
ordering = ('-pub_date',)
diff --git a/app/src/build.py b/app/src/build.py
index e6119e7..5443755 100644
--- a/app/src/build.py
+++ b/app/src/build.py
@@ -1,6 +1,6 @@
import os
from builder.base import BuildNew
-from django.core.urlresolvers import reverse
+from django.urls import reverse
from . import models
diff --git a/app/src/views.py b/app/src/views.py
index f2466eb..20188fd 100644
--- a/app/src/views.py
+++ b/app/src/views.py
@@ -1,7 +1,7 @@
from django.views.generic import ListView
from django.views.generic.detail import DetailView
from django.contrib.syndication.views import Feed
-from django.core.urlresolvers import reverse
+from django.urls import reverse
from django.conf import settings
from paypal.standard.forms import PayPalPaymentsForm
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2025-04-01 10:14:28 +0000