inventree/InvenTree
2
0
Fork 0
mirror of https://github.com/inventree/InvenTree.git synced 2025-12-24 21:23:26 +00:00
Code Activity

Merge branch 'inventree:master' into webhooks

Browse Source
This commit is contained in:
Matthias Mair
2021-11-23 18:27:09 +01:00
committed by GitHub
parent 260c51f6fc e53e3b4a51
commit 565fad30d7
113 changed files with 57442 additions and 55114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
InvenTree/common/api.py
View File

@@ -161,7 +161,7 @@ class GlobalSettingsDetail(generics.RetrieveUpdateAPIView):
permission_classes = [
GlobalSettingsPermissions,
]
class UserSettingsList(SettingsList):
"""
@@ -212,7 +212,7 @@ class UserSettingsDetail(generics.RetrieveUpdateAPIView):
queryset = common.models.InvenTreeUserSetting.objects.all()
serializer_class = common.serializers.UserSettingsSerializer
permission_classes = [
UserSettingsPermissions,
]