mirror of
https://github.com/inventree/InvenTree
synced 2024-08-30 18:33:04 +00:00
Merge remote-tracking branch 'inventree/master' into locate-mixin
This commit is contained in:
commit
b7cd30b314
@ -4,11 +4,15 @@ InvenTree API version information
|
|||||||
|
|
||||||
|
|
||||||
# InvenTree API version
|
# InvenTree API version
|
||||||
INVENTREE_API_VERSION = 45
|
INVENTREE_API_VERSION = 46
|
||||||
|
|
||||||
"""
|
"""
|
||||||
Increment this API version number whenever there is a significant change to the API that any clients need to know about
|
Increment this API version number whenever there is a significant change to the API that any clients need to know about
|
||||||
|
|
||||||
|
v46 -> 2022-05-09
|
||||||
|
- Fixes read permissions on settings API
|
||||||
|
- Allows non-staff users to read global settings via the API
|
||||||
|
|
||||||
v45 -> 2022-05-08 : https://github.com/inventree/InvenTree/pull/2944
|
v45 -> 2022-05-08 : https://github.com/inventree/InvenTree/pull/2944
|
||||||
- Settings are now accessed via the API using their unique key, not their PK
|
- Settings are now accessed via the API using their unique key, not their PK
|
||||||
- This allows the settings to be accessed without prior knowledge of the PK
|
- This allows the settings to be accessed without prior knowledge of the PK
|
||||||
|
@ -146,7 +146,12 @@ class GlobalSettingsPermissions(permissions.BasePermission):
|
|||||||
try:
|
try:
|
||||||
user = request.user
|
user = request.user
|
||||||
|
|
||||||
return user.is_staff
|
if request.method in ['GET', 'HEAD', 'OPTIONS']:
|
||||||
|
return True
|
||||||
|
else:
|
||||||
|
# Any other methods require staff access permissions
|
||||||
|
return user.is_staff
|
||||||
|
|
||||||
except AttributeError: # pragma: no cover
|
except AttributeError: # pragma: no cover
|
||||||
return False
|
return False
|
||||||
|
|
||||||
@ -175,6 +180,7 @@ class GlobalSettingsDetail(generics.RetrieveUpdateAPIView):
|
|||||||
return common.models.InvenTreeSetting.get_setting_object(key)
|
return common.models.InvenTreeSetting.get_setting_object(key)
|
||||||
|
|
||||||
permission_classes = [
|
permission_classes = [
|
||||||
|
permissions.IsAuthenticated,
|
||||||
GlobalSettingsPermissions,
|
GlobalSettingsPermissions,
|
||||||
]
|
]
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user