mirror of
https://github.com/daniviga/django-ram.git
synced 2025-08-07 06:37:50 +02:00
Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
7eddd1b52b | |||
11515d79ef | |||
f2b817103f |
@@ -115,7 +115,7 @@
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
{% if book_properties %}
|
||||
{% if properties %}
|
||||
<table class="table table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
@@ -123,7 +123,7 @@
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody class="table-group-divider">
|
||||
{% for p in book_properties %}
|
||||
{% for p in properties %}
|
||||
<tr>
|
||||
<th class="w-33" scope="row">{{ p.property }}</th>
|
||||
<td>{{ p.value }}</td>
|
||||
|
@@ -259,7 +259,7 @@ class GetManufacturerItem(View):
|
||||
manufacturer,
|
||||
# all returned records must have the same `item_number``;
|
||||
# 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:
|
||||
roster = (
|
||||
@@ -344,6 +344,13 @@ class GetObjectsFiltered(View):
|
||||
)
|
||||
for item in books:
|
||||
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:
|
||||
pass
|
||||
|
||||
|
@@ -1,4 +1,4 @@
|
||||
from ram.utils import git_suffix
|
||||
|
||||
__version__ = "0.14.2"
|
||||
__version__ = "0.14.3"
|
||||
__version__ += git_suffix(__file__)
|
||||
|
Reference in New Issue
Block a user