From 4c7deadb9aa2c32db3afc1df7b09faaa6c3a279c Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@klebos.com>
Date: Wed, 23 Mar 2022 22:55:43 +0000
Subject: [PATCH] documenting fossils
---
core/admin.py | 11 ++++-------
core/utils.py | 6 ++++--
media/js/readme.txt | 2 +-
3 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/core/admin.py b/core/admin.py
index c11d866..7bc78e5 100644
--- a/core/admin.py
+++ b/core/admin.py
@@ -20,12 +20,14 @@ What is the search path for the css and js inclusions in the Media subclasses t
class TroggleModelAdmin(admin.ModelAdmin):
def save_model(self, request, obj, form, change):
- """overriding admin save to fill the new_since parsing_field"""
+ """overriding admin save to fill the new_since parsing_field
+
+ new_since_parsing is not currently used in troggle. It is a fossil."""
obj.new_since_parsing=True
obj.save()
class Media:
- js = ('jquery/jquery.min.js','js/QM_helper.js')
+ js = ('jquery/jquery.min.js','js/QM_helper.js') # not currently available to troggle, see media/js/README
class RoleInline(admin.TabularInline):
@@ -37,11 +39,6 @@ class SurvexBlockAdmin(TroggleModelAdmin):
inlines = (RoleInline,)
-# class SurveyAdmin(TroggleModelAdmin):
- # #inlines = (ScannedImageInline,)
- # search_fields = ('expedition__year','wallet_number')
-
-
class QMsFoundInline(admin.TabularInline):
model=QM
fk_name='found_by'
diff --git a/core/utils.py b/core/utils.py
index fe5bd07..f487c7b 100644
--- a/core/utils.py
+++ b/core/utils.py
@@ -89,6 +89,8 @@ def save_carefully(objectType, lookupAttribs={}, nonLookupAttribs={}):
The checking is accomplished using Django's get_or_create and the new_since_parsing boolean field
defined in core.models.TroggleModel.
+
+ We are not using new_since_parsing - it is a fossil from Aaron Curtis's design in 2006. So it is always false.
"""
try:
@@ -116,10 +118,10 @@ def save_carefully(objectType, lookupAttribs={}, nonLookupAttribs={}):
logging.info(str(instance) + ' was just added to the database for the first time. \n')
if not created and instance.new_since_parsing:
- logging.info(str(instance) + " has been modified using Troggle, so the current script left it as is. \n")
+ logging.info(str(instance) + " has been modified using Troggle since parsing, so the current script left it as is. \n")
if not created and not instance.new_since_parsing:
- logging.info(str(instance) + " existed in the database unchanged since last parse. It was overwritten by the current script. \n")
+ logging.info(" instance:<"+ str(instance) + "> existed in the database unchanged since last parse. It have been overwritten.")
return (instance, created)
diff --git a/media/js/readme.txt b/media/js/readme.txt
index 05ca9ac..339dfd7 100644
--- a/media/js/readme.txt
+++ b/media/js/readme.txt
@@ -4,7 +4,7 @@ This folder is NOT LINKED IN TO troggle
ONLY mention of QM_helper and jquery is in core/admin.py
where it is something to do with the JSON export capability.
-Which seems to work even though /js/ is not availabl to troggle code
+Which seems to work even though /js/ is not available to troggle code
(it woud need to be /javascript/...)
settings.JSLIB_URL == /JAVASCRIPT/