Merge pull request #1544 from ae-utbm/product-edit-warning

Hide product edit warning when it should
This commit is contained in:
thomas girod authored and GitHub committed 2026-11-08 13:27:42 +01:00
commit d84c3fb98b
3 files changed
+15 -10

No files matched your search

+2 -2
View File
@@ -22,7 +22,7 @@ from ninja_extra.pagination import PageNumberPaginationExtra
from ninja_extra.schemas import PaginatedResponseSchema from ninja_extra.schemas import PaginatedResponseSchema
from api.auth import ApiKeyAuth from api.auth import ApiKeyAuth
from api.permissions import CanAccessLookup, CanView, IsInGroup, IsRoot from api.permissions import CanAccessLookup, CanView, HasPerm, IsInGroup, IsRoot
from counter.models import Counter, Product, ProductType from counter.models import Counter, Product, ProductType
from counter.schemas import ( from counter.schemas import (
CounterFilterSchema, CounterFilterSchema,
@@ -93,7 +93,7 @@ class ProductController(ControllerBase):
@route.get( @route.get(
"/search/detailed", "/search/detailed",
response=PaginatedResponseSchema[ProductSchema], response=PaginatedResponseSchema[ProductSchema],
permissions=[IsCounterAdmin], permissions=[HasPerm("counter.view_product")],
url_name="search_products_detailed", url_name="search_products_detailed",
) )
@paginate(PageNumberPaginationExtra, page_size=50) @paginate(PageNumberPaginationExtra, page_size=50)
+10 -8
View File
@@ -83,15 +83,17 @@
{% endmacro %} {% endmacro %}
{% block content %} {% block content %}
<div class="alert alert-yellow"> {% if not user.has_perm("counter.change_product") %}
<div class="alert-main"> <div class="alert alert-yellow">
{%- trans trimmed -%} <div class="alert-main">
You can see product details. {%- trans trimmed -%}
However, you cannot edit it, thus you won't be able You can see product details.
to submit this form. However, you cannot edit it, thus you won't be able
{%- endtrans -%} to submit this form.
{%- endtrans -%}
</div>
</div> </div>
</div> {% endif %}
{% if object %} {% if object %}
<h2>{{ object }}</h2> <h2>{{ object }}</h2>
<p><i>{% trans %}Creation date{% endtrans %} : {{ object.created_at|date }}</i></p> <p><i>{% trans %}Creation date{% endtrans %} : {{ object.created_at|date }}</i></p>
+3
View File
@@ -181,6 +181,9 @@ class ProductEditView(CounterAdminTabsMixin, PermissionRequiredMixin, UpdateView
permission_required = "counter.change_product" permission_required = "counter.change_product"
def has_permission(self): def has_permission(self):
# If users can see products but not edit them,
# still show them this form, as it is the place where all infos are,
# but forbid to save it.
return self.request.user.has_perm("counter.change_product") or ( return self.request.user.has_perm("counter.change_product") or (
self.request.method == "GET" self.request.method == "GET"
and self.request.user.has_perm("counter.view_product") and self.request.user.has_perm("counter.view_product")