inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-04-29 20:16:44 +00:00
Code

Merge pull request #16 from SchrodingersGat/master

Browse Source 
Added gitattributes file
This commit is contained in:
Oliver 2017-03-30 08:38:24 +11:00 committed by GitHub
commit ef54870f7c
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitattributes vendored Normal file
View File

@ -0,0 +1,6 @@
* text=auto
*.py text
*.md text
*.html text
*.txt text

9
InvenTree/part/serializers.py
View File

@ -12,9 +12,9 @@ class ParameterSerializer(serializers.ModelSerializer):
class PartSerializer(serializers.ModelSerializer): class PartSerializer(serializers.ModelSerializer):
params = ParameterSerializer(source='parameters', many=True) params = ParameterSerializer(source='parameters', many=True)
class Meta: class Meta:
model = Part model = Part
fields = ('pk', fields = ('pk',
@ -24,12 +24,13 @@ class PartSerializer(serializers.ModelSerializer):
'category', 'category',
'stock', 'stock',
'params') 'params')
class PartCategorySerializer(serializers.ModelSerializer): class PartCategorySerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = PartCategory model = PartCategory
fields = ('pk', fields = ('pk',
'name', 'name',
'description', 'description',
'parent',
'path') 'path')