From 3c4cdeb4fb2a196e4054b4e06aafcc264e22d259 Mon Sep 17 00:00:00 2001
From: Damien De Paoli <ddp@depaoli.id.au>
Date: Sat, 9 Jan 2021 15:10:45 +1100
Subject: [PATCH] fixed BUG-15: book nums missing for parent books in series

---
 BUGs                            | 3 +--
 templates/books_for_series.html | 9 +++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/BUGs b/BUGs
index 3ede3df..0ba58f8 100644
--- a/BUGs
+++ b/BUGs
@@ -1,5 +1,4 @@
-#### BUGS (next-15)
-BUG-15:		http://mara.ddp.net:5000/series/36 -- book num's not showing (b/c books are parent books? in a different series)
+#### BUGS (next-16)
 
 ### DB/back-end
 BUG-2:		series does not deal with calcd_rating... 
diff --git a/templates/books_for_series.html b/templates/books_for_series.html
index 12905fb..ab1ba49 100644
--- a/templates/books_for_series.html
+++ b/templates/books_for_series.html
@@ -39,10 +39,11 @@
 				<td data-sort="{{series.id}}{{"{:02d}0".format( num )}}">
 			{% endif %}
 			{% for s in book.series %}
-				{% if not book.child_ref|length %}
-					{{ SeriesBookNum( s.id, book.id ) }} of <a href="/series/{{s.id}}">{{s.title}}</a><br>
+				{% set num = SeriesBookNum( s.id, book.id ) %}
+				{% if num != None %}
+					{{num}} of <a href="/series/{{s.id}}">{{s.title}}</a><br>
 				{% endif %}
-				{% if SeriesBookNum( series.id, book.id ) == 1 %}
+				{% if SeriesBookNum( s.id, book.id ) == 1 %}
 					<script>
 						{% if book.parent|length %}
 							$('#up-{{book.parent[0].id}}').prop("disabled", true)
@@ -51,7 +52,7 @@
 						{% endif %}
 					</script>
 				{% endif %}
-				{% if SeriesBookNum( series.id, book.id ) == series.num_books %} 
+				{% if SeriesBookNum( s.id, book.id ) == s.num_books %} 
 					<script>
 						{% if book.parent|length %}
 							$('#down-{{book.parent[0].id}}').prop("disabled", true)