{% if edit or duplicate %}
-
-
-
-
-
-
-
-
-
-
- {% else %}
+ {% include 'partials/asset_picker.html' %}
+ {% else%}
- Parent
-
diff --git a/assets/templates/partials/asset_list_table_body.html b/assets/templates/partials/asset_list_table_body.html
index 4972b993..db4a62a9 100644
--- a/assets/templates/partials/asset_list_table_body.html
+++ b/assets/templates/partials/asset_list_table_body.html
@@ -1,7 +1,6 @@
{% for item in object_list %}
{#
- {{ item.asset_id }} - {{ item.description }}
#}
-
-
+ {% if object.parent%}
+
+ {% endif %}
+
+
+{% load static %}
+{% block css %}
+
+
+{% endblock %}
+
+{% block preload_js %}
+
+
+{% endblock %}
+
+{% block js %}
+
+{% endblock js %}
\ No newline at end of file
diff --git a/assets/urls.py b/assets/urls.py
index 5970d64b..09c12047 100644
--- a/assets/urls.py
+++ b/assets/urls.py
@@ -15,6 +15,8 @@ urlpatterns = [
path('asset//duplicate/', views.AssetDuplicate.as_view(), name='asset_duplicate'),
path('asset/delete/', views.asset_delete, name='ajax_asset_delete'),
+ path('asset/search/', views.AssetSearch.as_view(), name='asset_search_json'),
+
path('supplier/list', views.SupplierList.as_view(), name='supplier_list'),
path('supplier/', views.SupplierDetail.as_view(), name='supplier_detail'),
path('supplier/create', views.SupplierCreate.as_view(), name='supplier_create'),
diff --git a/assets/views.py b/assets/views.py
index 064ccfc1..02e51892 100644
--- a/assets/views.py
+++ b/assets/views.py
@@ -1,7 +1,7 @@
from django.shortcuts import render, get_object_or_404
from django.contrib.auth.decorators import login_required
from django.contrib.auth.mixins import LoginRequiredMixin
-from django.http import HttpResponse, QueryDict
+from django.http import HttpResponse, QueryDict, JsonResponse
from django.core import serializers
from django.views import generic
from django.contrib.auth import views as auth_views
@@ -22,27 +22,39 @@ class AssetList(LoginRequiredMixin, generic.ListView):
def get_queryset(self):
#TODO Feedback to user when search fails
query = self.request.GET.get('query', "")
+ queryset = self.model.objects.all()
if len(query) >= 3:
- return self.model.objects.filter(Q(asset_id__exact=query) | Q(description__icontains=query))
- elif query != "":
- return self.model.objects.filter(Q(asset_id__exact=query))
- else:
- cat = self.request.GET.get('cat', "")
- status = self.request.GET.get('status', "")
- if cat != "None":
- return self.model.objects.filter(category__name__exact=cat)
- elif status != "None":
- return self.model.objects.filter(status__name__exact=status)
- else:
- return self.model.objects.all()
+ queryset = self.model.objects.filter(Q(asset_id__exact=query) | Q(description__icontains=query))
+
+ cat = self.request.GET.get('cat', "")
+ status = self.request.GET.get('status', "")
+ if cat != "":
+ queryset = queryset.filter(category__name__exact=cat)
+ elif status != "":
+ queryset = queryset.filter(status__name__exact=status)
+
+ return queryset
def get_context_data(self, **kwargs):
context = super(AssetList, self).get_context_data(**kwargs)
context["search_name"] = self.request.GET.get('query', "")
+
context["categories"] = models.AssetCategory.objects.all()
+ context["category_select"] = self.request.GET.get('cat', "")
+
context["statuses"] = models.AssetStatus.objects.all()
+ context["status_select"] = self.request.GET.get('stats', "")
return context;
+class AssetSearch(AssetList):
+ def render_to_response(self, context, **response_kwargs):
+ result = []
+
+ for asset in context["object_list"]:
+ result.append({"id":asset.pk, "label":(asset.asset_id + " | " + asset.description)})
+
+ return JsonResponse(result, safe=False)
+
class AssetDetail(LoginRequiredMixin, generic.DetailView):
model = models.Asset
template_name = 'asset_update.html'