Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

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