3 Commits

3 changed files with 11 additions and 4 deletions

View File

@@ -115,7 +115,7 @@
</tr> </tr>
</tbody> </tbody>
</table> </table>
{% if book_properties %} {% if properties %}
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
@@ -123,7 +123,7 @@
</tr> </tr>
</thead> </thead>
<tbody class="table-group-divider"> <tbody class="table-group-divider">
{% for p in book_properties %} {% for p in properties %}
<tr> <tr>
<th class="w-33" scope="row">{{ p.property }}</th> <th class="w-33" scope="row">{{ p.property }}</th>
<td>{{ p.value }}</td> <td>{{ p.value }}</td>

View File

@@ -259,7 +259,7 @@ class GetManufacturerItem(View):
manufacturer, manufacturer,
# all returned records must have the same `item_number``; # all returned records must have the same `item_number``;
# just pick it up the first result, otherwise `search` # just pick it up the first result, otherwise `search`
roster.first.item_number if roster else search, roster[0].item_number if roster else search,
) )
else: else:
roster = ( roster = (
@@ -344,6 +344,13 @@ class GetObjectsFiltered(View):
) )
for item in books: for item in books:
data.append({"type": "book", "item": item}) data.append({"type": "book", "item": item})
catalogs = (
Catalog.objects.get_published(request.user)
.filter(query_2nd)
.distinct()
)
for item in catalogs:
data.append({"type": "catalog", "item": item})
except NameError: except NameError:
pass pass

View File

@@ -1,4 +1,4 @@
from ram.utils import git_suffix from ram.utils import git_suffix
__version__ = "0.14.2" __version__ = "0.14.3"
__version__ += git_suffix(__file__) __version__ += git_suffix(__file__)