summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorluxagraf <sng@luxagraf.net>2019-03-03 15:42:30 -0600
committerluxagraf <sng@luxagraf.net>2019-03-03 15:42:30 -0600
commitc24e6043db413f5722e7d378805da069698d64e7 (patch)
tree918a82522b1f2775bbdceb8abc3d0772c0c50f4a /app
parent16e406acfe5ae26b7f80fa6b7cb1a1c1194d4697 (diff)
got rid of old sketches model
Diffstat (limited to 'app')
-rw-r--r--app/jrnl/models.py1
-rw-r--r--app/unused_apps/sketches/__init__.py (renamed from app/sketches/__init__.py)0
-rw-r--r--app/unused_apps/sketches/admin.py (renamed from app/sketches/admin.py)6
-rw-r--r--app/unused_apps/sketches/build.py (renamed from app/sketches/build.py)0
-rw-r--r--app/unused_apps/sketches/migrations/0001_initial.py (renamed from app/sketches/migrations/0001_initial.py)0
-rw-r--r--app/unused_apps/sketches/migrations/0002_auto_20180208_0743.py (renamed from app/sketches/migrations/0002_auto_20180208_0743.py)0
-rw-r--r--app/unused_apps/sketches/migrations/__init__.py (renamed from app/sketches/migrations/__init__.py)0
-rw-r--r--app/unused_apps/sketches/models.py (renamed from app/sketches/models.py)3
-rw-r--r--app/unused_apps/sketches/urls.py (renamed from app/sketches/urls.py)0
-rw-r--r--app/unused_apps/sketches/views.py (renamed from app/sketches/views.py)0
10 files changed, 6 insertions, 4 deletions
diff --git a/app/jrnl/models.py b/app/jrnl/models.py
index c3aace3..88fd84b 100644
--- a/app/jrnl/models.py
+++ b/app/jrnl/models.py
@@ -20,7 +20,6 @@ from django_comments.moderation import CommentModerator, moderator
from photos.models import PhotoGallery, LuxImage, LuxImageSize
from locations.models import Location
-from sketches.models import Sketch
from books.models import Book
from fieldnotes.models import FieldNote
diff --git a/app/sketches/__init__.py b/app/unused_apps/sketches/__init__.py
index e69de29..e69de29 100644
--- a/app/sketches/__init__.py
+++ b/app/unused_apps/sketches/__init__.py
diff --git a/app/sketches/admin.py b/app/unused_apps/sketches/admin.py
index 07a2e6a..0c59867 100644
--- a/app/sketches/admin.py
+++ b/app/unused_apps/sketches/admin.py
@@ -6,17 +6,19 @@ from .models import Sketch
from utils.widgets import LGEntryForm, OLAdminBase
from utils.util import get_latlon
+
@admin.register(Sketch)
class SketchAdmin(OLAdminBase):
form = LGEntryForm
-
prepopulated_fields = {"slug": ('title',)}
list_display = ('title', 'slug', 'pub_date', 'location')
fieldsets = (
('Note', {
'fields': (
- ('title', 'slug'),
+ 'title',
+ 'subtitle',
'body_markdown',
+ 'slug',
('pub_date', 'status'),
'point'
),
diff --git a/app/sketches/build.py b/app/unused_apps/sketches/build.py
index e75b6fd..e75b6fd 100644
--- a/app/sketches/build.py
+++ b/app/unused_apps/sketches/build.py
diff --git a/app/sketches/migrations/0001_initial.py b/app/unused_apps/sketches/migrations/0001_initial.py
index 1e034b4..1e034b4 100644
--- a/app/sketches/migrations/0001_initial.py
+++ b/app/unused_apps/sketches/migrations/0001_initial.py
diff --git a/app/sketches/migrations/0002_auto_20180208_0743.py b/app/unused_apps/sketches/migrations/0002_auto_20180208_0743.py
index 664fcbc..664fcbc 100644
--- a/app/sketches/migrations/0002_auto_20180208_0743.py
+++ b/app/unused_apps/sketches/migrations/0002_auto_20180208_0743.py
diff --git a/app/sketches/migrations/__init__.py b/app/unused_apps/sketches/migrations/__init__.py
index e69de29..e69de29 100644
--- a/app/sketches/migrations/__init__.py
+++ b/app/unused_apps/sketches/migrations/__init__.py
diff --git a/app/sketches/models.py b/app/unused_apps/sketches/models.py
index aa21678..f6df269 100644
--- a/app/sketches/models.py
+++ b/app/unused_apps/sketches/models.py
@@ -14,7 +14,8 @@ def render_images(s):
return s
class Sketch(models.Model):
- title = models.CharField(max_length=250, null=True, blank=True)
+ title = models.CharField(max_length=250, blank=True)
+ subtitle = models.CharField(max_length=250,blank=True)
slug = models.SlugField(unique_for_date='pub_date', blank=True)
pub_date = models.DateTimeField(default=timezone.now)
body_html = models.TextField(blank=True)
diff --git a/app/sketches/urls.py b/app/unused_apps/sketches/urls.py
index 465a0d2..465a0d2 100644
--- a/app/sketches/urls.py
+++ b/app/unused_apps/sketches/urls.py
diff --git a/app/sketches/views.py b/app/unused_apps/sketches/views.py
index b696932..b696932 100644
--- a/app/sketches/views.py
+++ b/app/unused_apps/sketches/views.py