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

Assets now conforms to pep8

Browse Source
This commit is contained in:
Matthew Smith
2019-10-14 14:07:06 +01:00
parent 743d290405
commit 85a20dac26
8 changed files with 45 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
assets/views.py
View File

@@ -13,14 +13,15 @@ from dateutil import parser
import simplejson as json
from assets import models, forms
class AssetList(LoginRequiredMixin, generic.ListView):
model = models.Asset
template_name = 'asset_list.html'
paginate_by = 40
ordering = ['-pk']
def get_queryset(self):
#TODO Feedback to user when search fails
# TODO Feedback to user when search fails
query = self.request.GET.get('query', "")
if len(query) == 0:
queryset = self.model.objects.all()
@@ -28,7 +29,7 @@ class AssetList(LoginRequiredMixin, generic.ListView):
queryset = self.model.objects.filter(Q(asset_id__exact=query) | Q(description__icontains=query))
else:
queryset = self.model.objects.filter(Q(asset_id__exact=query))
cat = self.request.GET.get('cat', "")
status = self.request.GET.get('status', "")
if cat != "":
@@ -37,7 +38,7 @@ class AssetList(LoginRequiredMixin, generic.ListView):
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', "")
@@ -49,19 +50,22 @@ class AssetList(LoginRequiredMixin, generic.ListView):
context["status_select"] = self.request.GET.get('status', "")
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)})
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'
class AssetEdit(LoginRequiredMixin, generic.UpdateView):
template_name = 'asset_update.html'
model = models.Asset
@@ -75,7 +79,8 @@ class AssetEdit(LoginRequiredMixin, generic.UpdateView):
return context
def get_success_url(self):
return reverse("asset_detail", kwargs={"pk":self.object.id})
return reverse("asset_detail", kwargs={"pk": self.object.id})
class AssetCreate(LoginRequiredMixin, generic.CreateView):
template_name = 'asset_create.html'
@@ -84,14 +89,15 @@ class AssetCreate(LoginRequiredMixin, generic.CreateView):
def get_context_data(self, **kwargs):
context = super(AssetCreate, self).get_context_data(**kwargs)
context["create"] = True
context["connectors"] = models.Connector.objects.all()
return context
def get_success_url(self):
return reverse("asset_detail", kwargs={"pk":self.object.id})
return reverse("asset_detail", kwargs={"pk": self.object.id})
class DuplicateMixin:
def get(self, request, *args, **kwargs):
@@ -99,6 +105,7 @@ class DuplicateMixin:
self.object.pk = None
return self.render_to_response(self.get_context_data())
class AssetDuplicate(DuplicateMixin, AssetCreate):
model = models.Asset
@@ -110,6 +117,7 @@ class AssetDuplicate(DuplicateMixin, AssetCreate):
context["previous_asset_pk"] = self.kwargs.get(self.pk_url_kwarg)
return context
@login_required()
def asset_delete(request):
context = dict()
@@ -121,6 +129,7 @@ def asset_delete(request):
return HttpResponse(json.dumps(context), content_type='application/json')
class SupplierList(generic.ListView):
model = models.Supplier
template_name = 'supplier_list.html'