miklo
/
spejstore-new
forked from wiktor/spejstore-new
1
0
Fork 0
Code Pull Requests Activity

labels via api + remove redundant nav item

This commit is contained in:
radex 2020-05-21 00:35:02 +02:00 committed by Piotr Dobrowolski
parent 1f5a053a19
commit 3de626d5c5
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
storage/serializers.py
View File

@ -10,7 +10,7 @@ class ItemSerializer(HStoreSerializer):
taken_by = serializers.SlugRelatedField(queryset=User.objects, slug_field='username') taken_by = serializers.SlugRelatedField(queryset=User.objects, slug_field='username')
class Meta: class Meta:
model = Item model = Item
fields = ('uuid', 'short_id', 'name', 'description', 'props', 'state', 'parent', 'owner', 'taken_by', 'taken_on', 'taken_until', 'categories') fields = ('uuid', 'short_id', 'name', 'description', 'props', 'state', 'parent', 'labels', 'owner', 'taken_by', 'taken_on', 'taken_until', 'categories')
class LabelSerializer(serializers.ModelSerializer): class LabelSerializer(serializers.ModelSerializer):
item = ItemSerializer(required=False) item = ItemSerializer(required=False)

1
templates/base.html
View File

@ -25,7 +25,6 @@
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li><a href="/item/">All things</a></li>
<li><a href="/admin/storage/item/add/">Add thing</a></li> <li><a href="/admin/storage/item/add/">Add thing</a></li>
<li><a href="https://wiki.hackerspace.pl/members:services:inventory">How to use</a></li> <li><a href="https://wiki.hackerspace.pl/members:services:inventory">How to use</a></li>
</ul> </ul>