arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-19 14:32:16 +00:00
Code Issues Projects Releases Wiki Activity

Added dependency django-polymorphic

Browse Source 
Model change to take advantage of said polymorphism
Implemented asset search
This commit is contained in:
Matthew Smith
2019-10-02 21:12:24 +01:00
parent 7aba164a46
commit 207bf7bd7a
7 changed files with 118 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
assets/views.py
View File

@@ -13,27 +13,24 @@ from dateutil import parser
import simplejson as json
from assets import models, forms
class Login(auth_views.LoginView):
template_name = 'registration/login.html'
class Logout(auth_views.LogoutView):
template_name = 'registration/logout.html'
class PasswordChange(auth_views.PasswordChangeView):
template_name = 'registration/password_change.html'
def get_success_url(self):
return reverse_lazy('profile_detail', kwargs={'pk': self.request.user.id})
class AssetList(LoginRequiredMixin, generic.ListView):
model = models.Asset
template_name = 'asset_list.html'
paginate_by = 40
ordering = ['-pk']
def get_queryset(self):
q = self.request.GET.get('q', "")
if len(q) >= 3:
return self.model.objects.filter(Q(asset_id__icontains=q) | Q(description__icontains=q) | Q(comments__icontains=q))
else:
return self.model.objects.all()
def get_context_data(self, **kwargs):
q = self.request.GET.get('q', "")
context = super(AssetList, self).get_context_data(**kwargs)
context["searchName"] = q
return context;
class AssetDetail(LoginRequiredMixin, generic.DetailView):
model = models.Asset
@@ -45,7 +42,6 @@ class AssetDetail(LoginRequiredMixin, generic.DetailView):
# template_name = 'asset_update.html'
# # success_url = reverse_lazy('asset_list')
class AssetEdit(LoginRequiredMixin, generic.TemplateView):
template_name = 'asset_update.html'
@@ -68,7 +64,6 @@ class AssetEdit(LoginRequiredMixin, generic.TemplateView):
return context
@login_required()
def asset_update(request):
context = dict()
@@ -117,26 +112,6 @@ def asset_delete(request):
return HttpResponse(json.dumps(context), content_type='application/json')
@login_required()
def asset_filter(request):
context = dict()
if request.method == 'POST' and request.is_ajax():
defaults = QueryDict(request.POST['form'].encode('ASCII')).dict()
defaults.pop('csrfmiddlewaretoken')
context['object_list'] = models.Asset.objects.filter(
Q(pk__icontains=defaults.get('asset_id')) |
Q(asset_id__icontains=defaults.get('asset_id'))
)
if request.POST.get('sender', None) == 'asset_update':
return render(request, template_name='asset_update_search_results.html', context=context)
else:
return render(request, template_name='asset_list_table_body.html', context=context)
class SupplierList(generic.ListView):
model = models.Supplier
template_name = 'supplier_list.html'