diff options
| -rw-r--r-- | core/models/wallets.py | 8 | ||||
| -rw-r--r-- | parsers/logbooks.py | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/core/models/wallets.py b/core/models/wallets.py index d9a140d..9e54f4e 100644 --- a/core/models/wallets.py +++ b/core/models/wallets.py @@ -380,8 +380,10 @@ class Wallet(models.Model): if waldata["survex not required"]: survexok = "green" ticks["S"] = "green" - else: - if waldata["survex file"]: + else: + if "survex file" not in waldata: + ticks["S"] = "darkred" + else: if not type(waldata["survex file"]) == list: # a string also is a sequence type, so do it this way waldata["survex file"] = [waldata["survex file"]] ngood = 0 @@ -403,7 +405,7 @@ class Wallet(models.Model): elif nbad >= 1 and ngood == 0: # all bad ticks["S"] = "red" elif nbad == 0 and ngood == 0: # list of blank strings - ticks["S"] = "red" + ticks["S"] = "crimson" else: ticks["S"] = "fuchsia" # have fun working out what this means diff --git a/parsers/logbooks.py b/parsers/logbooks.py index 3ae1a11..86ff796 100644 --- a/parsers/logbooks.py +++ b/parsers/logbooks.py @@ -256,6 +256,8 @@ def tidy_trip_image_urls(text, date): text = text.replace(f' src="/years/{y}//years/{y}/', f' src="/years/{y}/') text = text.replace(f" src='/years/{y}//years/{y}/", f" src='/years/{y}/") + text = text.replace(f'http://expo.survex.com/expofiles', f'/expofiles') + text = text.replace(f' src="/years/{y}//expofiles/', f' src="/expofiles/') text = text.replace(f" src='/years/{y}//expofiles/", f" src='/expofiles/") |