diff --git a/ram/bookshelf/admin.py b/ram/bookshelf/admin.py
index c44a239..f67a8cd 100644
--- a/ram/bookshelf/admin.py
+++ b/ram/bookshelf/admin.py
@@ -121,6 +121,7 @@ class CatalogAdmin(SortableAdminBase, admin.ModelAdmin):
BookDocInline,
)
list_display = (
+ "__str__",
"manufacturer",
"years",
"get_scales",
diff --git a/ram/portal/templates/bookshelf/book.html b/ram/portal/templates/bookshelf/book.html
index 3bf938d..8ff4c31 100644
--- a/ram/portal/templates/bookshelf/book.html
+++ b/ram/portal/templates/bookshelf/book.html
@@ -46,10 +46,12 @@
@@ -131,6 +133,24 @@
{% endif %}
+
+
+
+
+ Documents |
+
+
+
+ {% for d in documents.all %}
+
+ {{ d.description }} |
+ {{ d.filename }} |
+ {{ d.file.size | filesizeformat }} |
+
+ {% endfor %}
+
+
+
{{ book.notes | safe }}
diff --git a/ram/portal/views.py b/ram/portal/views.py
index d678379..90594c1 100644
--- a/ram/portal/views.py
+++ b/ram/portal/views.py
@@ -549,14 +549,16 @@ class GetBookCatalog(View):
except ObjectDoesNotExist:
raise Http404
- book_properties = book.property.get_public(request.user)
+ properties = book.property.get_public(request.user)
+ documents = book.document.get_public(request.user)
return render(
request,
"bookshelf/book.html",
{
"title": book,
- "book_properties": book_properties,
"book": book,
+ "documents": documents,
+ "properties": properties,
"type": selector
},
)
diff --git a/ram/ram/__init__.py b/ram/ram/__init__.py
index f8bd437..07f10a7 100644
--- a/ram/ram/__init__.py
+++ b/ram/ram/__init__.py
@@ -1,4 +1,4 @@
from ram.utils import git_suffix
-__version__ = "0.14.0"
+__version__ = "0.14.1"
__version__ += git_suffix(__file__)