diff options
| author | Pedro Alvarez Piedehierro <pedro.alvarez@codethink.co.uk> | 2021-11-23 12:13:00 +0000 |
|---|---|---|
| committer | Pedro Alvarez Piedehierro <pedro.alvarez@codethink.co.uk> | 2021-11-23 12:13:00 +0000 |
| commit | 9a7b2253220ac5790c18ccde41a6fe9347831153 (patch) | |
| tree | 79030293e928dfd9796db1cb9ca8d25010238c3a /lorrycontroller | |
| parent | b49d223bd8c2ba2bfd6ce97059fd67902e0e2a8d (diff) | |
| parent | cea2acf3b4e1c6fb4b4df60828459a40fc978367 (diff) | |
| download | lorry-controller-9a7b2253220ac5790c18ccde41a6fe9347831153.tar.gz | |
Merge branch 'benbrown/raw-file-fix' into 'master'
Update admin interface to support raw-file
See merge request CodethinkLabs/lorry/lorry-controller!30
Diffstat (limited to 'lorrycontroller')
| -rw-r--r-- | lorrycontroller/showlorry.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lorrycontroller/showlorry.py b/lorrycontroller/showlorry.py index b553b9c..ca0ac59 100644 --- a/lorrycontroller/showlorry.py +++ b/lorrycontroller/showlorry.py @@ -66,7 +66,10 @@ class ShowLorryHTML(ShowLorryBase, lorrycontroller.LorryControllerRoute): shower = lorrycontroller.JobShower() lorry_obj = list(json.loads(lorry_info['text']).values())[0] - lorry_info['url'] = lorry_obj['url'] + if "url" in lorry_obj: + lorry_info['url'] = lorry_obj['url'] + elif "urls" in lorry_obj: + lorry_info['urls'] = lorry_obj['urls'] lorry_info['interval_nice'] = renderer.format_secs_nicely( lorry_info['interval']) |