@@ -190,6 +190,18 @@ $(document).ready(function () {
{% endif %}
moment.locale('{{ request.LANGUAGE_CODE }}');
+
+ // Account notifications
+ {% if messages %}
+ {% for message in messages %}
+ showMessage(
+ '{{ message }}',
+ {
+ style: 'info',
+ }
+ );
+ {% endfor %}
+ {% endif %}
});
diff --git a/InvenTree/templates/js/translated/build.js b/InvenTree/templates/js/translated/build.js
index 499fde9bec..bcbbfcc6d1 100644
--- a/InvenTree/templates/js/translated/build.js
+++ b/InvenTree/templates/js/translated/build.js
@@ -43,11 +43,18 @@ function buildFormFields() {
}
},
sales_order: {
+ icon: 'fa-truck',
},
batch: {},
- target_date: {},
- take_from: {},
- destination: {},
+ target_date: {
+ icon: 'fa-calendar-alt',
+ },
+ take_from: {
+ icon: 'fa-sitemap',
+ },
+ destination: {
+ icon: 'fa-sitemap',
+ },
link: {
icon: 'fa-link',
},
diff --git a/InvenTree/templates/js/translated/forms.js b/InvenTree/templates/js/translated/forms.js
index a86b64d0e2..18ba08d512 100644
--- a/InvenTree/templates/js/translated/forms.js
+++ b/InvenTree/templates/js/translated/forms.js
@@ -19,7 +19,6 @@
renderStockLocation,
renderSupplierPart,
renderUser,
- showAlertDialog,
showAlertOrCache,
showApiError,
*/
@@ -347,10 +346,12 @@ function constructForm(url, options) {
constructCreateForm(OPTIONS.actions.POST, options);
} else {
// User does not have permission to POST to the endpoint
- showAlertDialog(
- '{% trans "Action Prohibited" %}',
- '{% trans "Create operation not allowed" %}'
- );
+ showMessage('{% trans "Action Prohibited" %}', {
+ style: 'danger',
+ details: '{% trans "Create operation not allowed" %}',
+ icon: 'fas fa-user-times',
+ });
+
console.log(`'POST action unavailable at ${url}`);
}
break;
@@ -360,10 +361,12 @@ function constructForm(url, options) {
constructChangeForm(OPTIONS.actions.PUT, options);
} else {
// User does not have permission to PUT/PATCH to the endpoint
- showAlertDialog(
- '{% trans "Action Prohibited" %}',
- '{% trans "Update operation not allowed" %}'
- );
+ showMessage('{% trans "Action Prohibited" %}', {
+ style: 'danger',
+ details: '{% trans "Update operation not allowed" %}',
+ icon: 'fas fa-user-times',
+ });
+
console.log(`${options.method} action unavailable at ${url}`);
}
break;
@@ -372,10 +375,12 @@ function constructForm(url, options) {
constructDeleteForm(OPTIONS.actions.DELETE, options);
} else {
// User does not have permission to DELETE to the endpoint
- showAlertDialog(
- '{% trans "Action Prohibited" %}',
- '{% trans "Delete operation not allowed" %}'
- );
+ showMessage('{% trans "Action Prohibited" %}', {
+ style: 'danger',
+ details: '{% trans "Delete operation not allowed" %}',
+ icon: 'fas fa-user-times',
+ });
+
console.log(`DELETE action unavailable at ${url}`);
}
break;
@@ -384,10 +389,12 @@ function constructForm(url, options) {
// TODO?
} else {
// User does not have permission to GET to the endpoint
- showAlertDialog(
- '{% trans "Action Prohibited" %}',
- '{% trans "View operation not allowed" %}'
- );
+ showMessage('{% trans "Action Prohibited" %}', {
+ style: 'danger',
+ details: '{% trans "View operation not allowed" %}',
+ icon: 'fas fa-user-times',
+ });
+
console.log(`GET action unavailable at ${url}`);
}
break;
diff --git a/InvenTree/templates/navbar.html b/InvenTree/templates/navbar.html
index c63031e3cb..cd2a2a0a56 100644
--- a/InvenTree/templates/navbar.html
+++ b/InvenTree/templates/navbar.html
@@ -12,9 +12,6 @@
-
{% include "search_form.html" %}
-
diff --git a/InvenTree/templates/qr_code.html b/InvenTree/templates/qr_code.html
index 8964ef02be..a39847629d 100644
--- a/InvenTree/templates/qr_code.html
+++ b/InvenTree/templates/qr_code.html
@@ -3,7 +3,7 @@
{% if qr_data %}
-
+
{% else %}
diff --git a/InvenTree/users/api.py b/InvenTree/users/api.py
index 240d6aabc0..222f284add 100644
--- a/InvenTree/users/api.py
+++ b/InvenTree/users/api.py
@@ -7,15 +7,16 @@ from django.core.exceptions import ObjectDoesNotExist
from django.conf.urls import url, include
-from rest_framework import generics, permissions
+from django_filters.rest_framework import DjangoFilterBackend
+
+from rest_framework import filters, generics, permissions
from rest_framework.views import APIView
from rest_framework.authtoken.models import Token
from rest_framework.response import Response
from rest_framework import status
-from .serializers import UserSerializer, OwnerSerializer
-
-from .models import RuleSet, Owner, check_user_role
+from users.models import RuleSet, Owner, check_user_role
+from users.serializers import UserSerializer, OwnerSerializer
class OwnerList(generics.ListAPIView):
@@ -26,6 +27,37 @@ class OwnerList(generics.ListAPIView):
queryset = Owner.objects.all()
serializer_class = OwnerSerializer
+ def filter_queryset(self, queryset):
+ """
+ Implement text search for the "owner" model.
+
+ Note that an "owner" can be either a group, or a user,
+ so we cannot do a direct text search.
+
+ A "hack" here is to post-process the queryset and simply
+ remove any values which do not match.
+
+ It is not necessarily "efficient" to do it this way,
+ but until we determine a better way, this is what we have...
+ """
+
+ search_term = str(self.request.query_params.get('search', '')).lower()
+
+ queryset = super().filter_queryset(queryset)
+
+ if not search_term:
+ return queryset
+
+ results = []
+
+ # Extract search term f
+
+ for result in queryset.all():
+ if search_term in result.name().lower():
+ results.append(result)
+
+ return results
+
class OwnerDetail(generics.RetrieveAPIView):
"""
@@ -96,6 +128,17 @@ class UserList(generics.ListAPIView):
serializer_class = UserSerializer
permission_classes = (permissions.IsAuthenticated,)
+ filter_backends = [
+ DjangoFilterBackend,
+ filters.SearchFilter,
+ ]
+
+ search_fields = [
+ 'first_name',
+ 'last_name',
+ 'username',
+ ]
+
class GetAuthToken(APIView):
""" Return authentication token for an authenticated user. """