remove entry-type and tidy cache bits

2 files changed, 0 insertions, 7 deletions

diff --git a/core/models/caves.py b/core/models/caves.py
index 5df1a3b..98b4832 100644
--- a/core/models/caves.py
+++ b/core/models/caves.py
@@ -458,10 +458,6 @@ class LogbookEntry(TroggleModel):
     Le'ts get rid of it and set the 'cave' attribute to a cave object elsehwhere. This is 
     attempting to be Too Clever.
     """
-    LOGBOOK_ENTRY_TYPES = (
-        ("wiki", "Wiki style logbook"),
-        ("html", "Html style logbook")
-    )
     date    = models.DateField()#MJG wants to turn this into a datetime such that multiple Logbook entries on the same day can be ordered.ld()
     expeditionday = models.ForeignKey("ExpeditionDay", null=True,on_delete=models.SET_NULL)#MJG wants to KILL THIS (redundant information)
     expedition = models.ForeignKey(Expedition,blank=True, null=True,on_delete=models.SET_NULL)  # yes this is double-
@@ -470,7 +466,6 @@ class LogbookEntry(TroggleModel):
     place      = models.CharField(max_length=100,blank=True, null=True,help_text="Only use this if you haven't chosen a cave")
     text       = models.TextField()
     slug       = models.SlugField(max_length=50)
-    entry_type = models.CharField(default="wiki",null=True,choices=LOGBOOK_ENTRY_TYPES,max_length=50)
 
     class Meta:
         verbose_name_plural = "Logbook Entries"
diff --git a/core/views/logbooks.py b/core/views/logbooks.py
index 7d58c75..9c3d8c5 100644
--- a/core/views/logbooks.py
+++ b/core/views/logbooks.py
@@ -64,12 +64,10 @@ def expedition(request, expeditionname):
             # Need to delete the existing entries or we get duplication
             # Need to delete both in the Django ORM and in our own object-store.
             entries = this_expedition.logbookentry_set.all()
-            print(f'! - expo {expeditionname} {len(entries)}  entries initially')
             for entry in entries:
                 #print(f'! - delete entry: "{entry}"')
                 entry.delete() 
             entries = this_expedition.logbookentry_set.all()
-            print(f'! - expo {expeditionname} {len(entries)}  entries after deletion')
             LoadLogbookForExpedition(this_expedition) 
         logged_in = True
     else: