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

Forms actions fix (#6493)

Browse Source 
* Handle case where OPTIONS.actions is not present

* Specify stock.change permission

* Hide table button based on user permission

* Fix for permission check class
This commit is contained in:
Oliver 2024-02-16 08:47:05 +11:00 committed by GitHub
parent 38fac47e39
commit 21f209f7cc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
InvenTree/InvenTree/permissions.py
View File

@ -69,6 +69,10 @@ class RolePermission(permissions.BasePermission):
# The required role may be defined for the view class
if role := getattr(view, 'role_required', None):
# If the role is specified as "role.permission", split it
if '.' in role:
role, permission = role.split('.')
return users.models.check_user_role(user, role, permission)
try:

2
InvenTree/stock/api.py
View File

@ -123,6 +123,8 @@ class StockDetail(RetrieveUpdateDestroyAPI):
class StockItemContextMixin:
"""Mixin class for adding StockItem object to serializer context."""
role_required = 'stock.change'
queryset = StockItem.objects.none()
def get_serializer_context(self):

1
InvenTree/stock/templates/stock/item.html
View File

@ -196,6 +196,7 @@
stock_item: {{ item.pk }},
part: {{ item.part.pk }},
quantity: {{ item.quantity|unlocalize }},
can_edit: {% js_bool roles.stock.change %},
}
);

6
InvenTree/templates/js/translated/forms.js
View File

@ -346,7 +346,11 @@ function constructForm(url, options={}) {
getApiEndpointOptions(url, function(OPTIONS) {
// Copy across entire actions struct
options.actions = OPTIONS.actions.POST || OPTIONS.actions.PUT || OPTIONS.actions.PATCH || OPTIONS.actions.DELETE || {};
if (OPTIONS && OPTIONS.actions) {
options.actions = OPTIONS.actions.POST || OPTIONS.actions.PUT || OPTIONS.actions.PATCH || OPTIONS.actions.DELETE || {};
} else {
options.actions = {};
}
// Extract any custom 'context' information from the OPTIONS data
options.context = OPTIONS.context || {};

5
InvenTree/templates/js/translated/stock.js
View File

@ -3101,11 +3101,14 @@ function loadInstalledInTable(table, options) {
field: 'buttons',
title: '',
switchable: false,
visible: options.can_edit,
formatter: function(value, row) {
let pk = row.pk;
let html = '';
html += makeIconButton('fa-unlink', 'button-uninstall', pk, '{% trans "Uninstall Stock Item" %}');
if (options.can_edit) {
html += makeIconButton('fa-unlink', 'button-uninstall', pk, '{% trans "Uninstall Stock Item" %}');
}
return wrapButtons(html);
}