mirror
/
PyInventory
kopia lustrzana https://github.com/jedie/PyInventory
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Merge pull request #136 from jedie/dev1 

Change item lust: move "producer" to first
pull/138/head
Jens Diemer 2023-07-21 05:51:19 +02:00 zatwierdzone przez GitHub
rodzic f6e4358c33 804951b0fb
commit c4cc3d86ca
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
2 zmienionych plików z 63 dodań i 63 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
src/inventory/admin/item.py
Wyświetl plik

@ -91,7 +91,7 @@ class ItemModelAdmin(TagulousModelAdminFix, ImportExportMixin, SortableAdminMixi
return 0 return 0
date_hierarchy = 'create_dt' date_hierarchy = 'create_dt'
list_display = ('item', 'kind', 'producer', 'location', 'received_date', 'update_dt') list_display = ('producer', 'item', 'kind', 'location', 'received_date', 'update_dt')
ordering = ('path_str',) ordering = ('path_str',)
list_display_links = () list_display_links = ()
list_filter = (LimitTreeDepthListFilter, 'kind', 'location', 'producer', 'tags') list_filter = (LimitTreeDepthListFilter, 'kind', 'location', 'producer', 'tags')

124
src/inventory_project/tests/test_admin_item_auto_group_items_1.snapshot.html
Wyświetl plik

@ -96,9 +96,18 @@
<div class="clear"> <div class="clear">
</div> </div>
</th> </th>
<th class="column-_tagulous_display_producer" scope="col">
<div class="text">
<span>
Producer
</span>
</div>
<div class="clear">
</div>
</th>
<th class="sortable column-item" scope="col"> <th class="sortable column-item" scope="col">
<div class="text"> <div class="text">
<a href="?o=2.1"> <a href="?o=3.1">
Item Item
</a> </a>
</div> </div>
@ -114,15 +123,6 @@
<div class="clear"> <div class="clear">
</div> </div>
</th> </th>
<th class="column-_tagulous_display_producer" scope="col">
<div class="text">
<span>
Producer
</span>
</div>
<div class="clear">
</div>
</th>
<th class="sortable column-location" scope="col"> <th class="sortable column-location" scope="col">
<div class="text"> <div class="text">
<a href="?o=5.1"> <a href="?o=5.1">
@ -161,18 +161,18 @@
<div class="drag handle" order="mainitem1" pk="00000000-0001-0000-0000-000000000000"> <div class="drag handle" order="mainitem1" pk="00000000-0001-0000-0000-000000000000">
</div> </div>
</td> </td>
<th class="field-item"> <th class="field-_tagulous_display_producer">
<a href="/admin/inventory/itemmodel/00000000-0001-0000-0000-000000000000/change/"> <a href="/admin/inventory/itemmodel/00000000-0001-0000-0000-000000000000/change/">
<a href="/admin/inventory/itemmodel/00000000-0001-0000-0000-000000000000/change/">
<strong>
main item 1
</strong>
</a>
</a> </a>
</th> </th>
<td class="field-_tagulous_display_kind"> <td class="field-item">
<a href="/admin/inventory/itemmodel/00000000-0001-0000-0000-000000000000/change/">
<strong>
main item 1
</strong>
</a>
</td> </td>
<td class="field-_tagulous_display_producer"> <td class="field-_tagulous_display_kind">
</td> </td>
<td class="field-location nowrap"> <td class="field-location nowrap">
- -
@ -192,19 +192,19 @@
<div class="drag handle" order="mainitem1 0 subitem11" pk="00000000-0001-0001-0000-000000000000"> <div class="drag handle" order="mainitem1 0 subitem11" pk="00000000-0001-0001-0000-000000000000">
</div> </div>
</td> </td>
<th class="field-item"> <th class="field-_tagulous_display_producer">
<a href="/admin/inventory/itemmodel/00000000-0001-0001-0000-000000000000/change/"> <a href="/admin/inventory/itemmodel/00000000-0001-0001-0000-000000000000/change/">
<a href="/admin/inventory/itemmodel/00000000-0001-0001-0000-000000000000/change/">
main item 1 ›
<strong>
sub item 1.1
</strong>
</a>
</a> </a>
</th> </th>
<td class="field-_tagulous_display_kind"> <td class="field-item">
<a href="/admin/inventory/itemmodel/00000000-0001-0001-0000-000000000000/change/">
main item 1 ›
<strong>
sub item 1.1
</strong>
</a>
</td> </td>
<td class="field-_tagulous_display_producer"> <td class="field-_tagulous_display_kind">
</td> </td>
<td class="field-location nowrap"> <td class="field-location nowrap">
- -
@ -224,19 +224,19 @@
<div class="drag handle" order="mainitem1 0 subitem12" pk="00000000-0001-0002-0000-000000000000"> <div class="drag handle" order="mainitem1 0 subitem12" pk="00000000-0001-0002-0000-000000000000">
</div> </div>
</td> </td>
<th class="field-item"> <th class="field-_tagulous_display_producer">
<a href="/admin/inventory/itemmodel/00000000-0001-0002-0000-000000000000/change/"> <a href="/admin/inventory/itemmodel/00000000-0001-0002-0000-000000000000/change/">
<a href="/admin/inventory/itemmodel/00000000-0001-0002-0000-000000000000/change/">
main item 1 ›
<strong>
sub item 1.2
</strong>
</a>
</a> </a>
</th> </th>
<td class="field-_tagulous_display_kind"> <td class="field-item">
<a href="/admin/inventory/itemmodel/00000000-0001-0002-0000-000000000000/change/">
main item 1 ›
<strong>
sub item 1.2
</strong>
</a>
</td> </td>
<td class="field-_tagulous_display_producer"> <td class="field-_tagulous_display_kind">
</td> </td>
<td class="field-location nowrap"> <td class="field-location nowrap">
- -
@ -256,18 +256,18 @@
<div class="drag handle" order="mainitem2" pk="00000000-0002-0000-0000-000000000000"> <div class="drag handle" order="mainitem2" pk="00000000-0002-0000-0000-000000000000">
</div> </div>
</td> </td>
<th class="field-item"> <th class="field-_tagulous_display_producer">
<a href="/admin/inventory/itemmodel/00000000-0002-0000-0000-000000000000/change/"> <a href="/admin/inventory/itemmodel/00000000-0002-0000-0000-000000000000/change/">
<a href="/admin/inventory/itemmodel/00000000-0002-0000-0000-000000000000/change/">
<strong>
main item 2
</strong>
</a>
</a> </a>
</th> </th>
<td class="field-_tagulous_display_kind"> <td class="field-item">
<a href="/admin/inventory/itemmodel/00000000-0002-0000-0000-000000000000/change/">
<strong>
main item 2
</strong>
</a>
</td> </td>
<td class="field-_tagulous_display_producer"> <td class="field-_tagulous_display_kind">
</td> </td>
<td class="field-location nowrap"> <td class="field-location nowrap">
- -
@ -287,19 +287,19 @@
<div class="drag handle" order="mainitem2 0 subitem21" pk="00000000-0002-0001-0000-000000000000"> <div class="drag handle" order="mainitem2 0 subitem21" pk="00000000-0002-0001-0000-000000000000">
</div> </div>
</td> </td>
<th class="field-item"> <th class="field-_tagulous_display_producer">
<a href="/admin/inventory/itemmodel/00000000-0002-0001-0000-000000000000/change/"> <a href="/admin/inventory/itemmodel/00000000-0002-0001-0000-000000000000/change/">
<a href="/admin/inventory/itemmodel/00000000-0002-0001-0000-000000000000/change/">
main item 2 ›
<strong>
sub item 2.1
</strong>
</a>
</a> </a>
</th> </th>
<td class="field-_tagulous_display_kind"> <td class="field-item">
<a href="/admin/inventory/itemmodel/00000000-0002-0001-0000-000000000000/change/">
main item 2 ›
<strong>
sub item 2.1
</strong>
</a>
</td> </td>
<td class="field-_tagulous_display_producer"> <td class="field-_tagulous_display_kind">
</td> </td>
<td class="field-location nowrap"> <td class="field-location nowrap">
- -
@ -319,19 +319,19 @@
<div class="drag handle" order="mainitem2 0 subitem22" pk="00000000-0002-0002-0000-000000000000"> <div class="drag handle" order="mainitem2 0 subitem22" pk="00000000-0002-0002-0000-000000000000">
</div> </div>
</td> </td>
<th class="field-item"> <th class="field-_tagulous_display_producer">
<a href="/admin/inventory/itemmodel/00000000-0002-0002-0000-000000000000/change/"> <a href="/admin/inventory/itemmodel/00000000-0002-0002-0000-000000000000/change/">
<a href="/admin/inventory/itemmodel/00000000-0002-0002-0000-000000000000/change/">
main item 2 ›
<strong>
sub item 2.2
</strong>
</a>
</a> </a>
</th> </th>
<td class="field-_tagulous_display_kind"> <td class="field-item">
<a href="/admin/inventory/itemmodel/00000000-0002-0002-0000-000000000000/change/">
main item 2 ›
<strong>
sub item 2.2
</strong>
</a>
</td> </td>
<td class="field-_tagulous_display_producer"> <td class="field-_tagulous_display_kind">
</td> </td>
<td class="field-location nowrap"> <td class="field-location nowrap">
- -